51 files changed, 162518 insertions, 130402 deletions

diff --git a/ChangeLog b/ChangeLog
index cf4c2dc55d..340b984562 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2004-05-19  JP Rosevear  <jpr@novell.com>
+
+	* configure.in: bump version
+
 2004-05-12  Not Zed  <NotZed@Ximian.com>
 
 	* configure.in: add some stuff for statfs.
diff --git a/configure.in b/configure.in
index 1592313039..5cbd8e9763 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.7, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
+AC_INIT(evolution, 1.5.8, http://bugzilla.ximian.com/enter_bug.cgi?product=Evolution)
 AC_CONFIG_SRCDIR(README)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
@@ -1008,9 +1008,9 @@ AC_DEFUN(EVO_SET_COMPILE_FLAGS, [
 
 dnl --- Required version numbers
 
-GAL_REQUIRED=2.1.8
-GTKHTML_REQUIRED=3.1.13
-EDS_REQUIRED=0.0.92.1
+GAL_REQUIRED=2.1.9
+GTKHTML_REQUIRED=3.1.14
+EDS_REQUIRED=0.0.93
 BONOBOUI_REQUIRED=2.4.2
 
 AC_SUBST(GAL_REQUIRED)
diff --git a/po/am.po b/po/am.po
index 3c194c4df8..7a4b2028b5 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "አድራሻ"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -44,14 +52,6 @@ msgstr ""
 msgid " card"
 msgstr " እና "
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -66,63 +66,19 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "አውቶማቲክ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
@@ -169,42 +125,46 @@ msgstr "ወር"
 msgid "Create a new contacts group"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "በመጫን ላይ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -212,8 +172,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -221,7 +181,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "የግል"
@@ -270,19 +230,41 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr ""
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "አድራሻ"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: 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
+#: 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
+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
+#: 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 ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -303,6 +285,60 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "አውቶማቲክ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "ወር"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr ""
@@ -324,6 +360,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -396,7 +433,7 @@ msgstr "ወር"
 msgid "Address Book Properties"
 msgstr "አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "ሁል ጊዜ"
@@ -411,111 +448,101 @@ msgid "Basic"
 msgstr "ቀላል"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "ቀለሞች (_O)"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "አጠቃላይ"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "በፍጹም"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "አንድ"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "ቀለም ምረጡ"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "&ፈልግ"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -526,7 +553,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -535,19 +562,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -555,7 +582,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -565,34 +592,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -600,127 +627,134 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "ሰዓት"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "ወር"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "ስም"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "የ_ፖርት ቍጥር፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "ቅድሚያ"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_የሰርቨር ስም፦"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "ደቂቃዎች"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:208
-msgid "Remove All"
-msgstr "ሁሉንም አስወግድ"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "ሁሉንም አስወግድ"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr ""
@@ -743,21 +777,14 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "ምንጭ"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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
@@ -831,139 +858,139 @@ msgid "<b>Work</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "አድራሻ"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "አድራሻ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "የልደት በዓል፦"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "ቀን መቁጠሪያ፦ (_A)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "ከተማ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "የሼሉን ትእዛዝ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "አገር"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "ቀን፦"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "ሙሉ ስም... (_N)"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "መጀመሪያ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "መልዕክቶች"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "ኢሜያል አድራሻ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "መቆጣጠሪያ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "ቅጽል ስም"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_ማስታወሻዎች፦"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "ሌላ"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "PO Box:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -990,9 +1017,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "መሥራት"
@@ -1024,23 +1051,35 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr ""
 
@@ -2018,97 +2057,113 @@ msgstr "ዛምቢያ"
 msgid "Zimbabwe"
 msgstr "ዚምቧቤ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-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-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "ስልክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "የውይይት መድረክ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "ምንጭ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "ኒጀር"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 ""
 
+#: 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:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2129,18 +2184,6 @@ msgstr "ሙሉ ስም"
 msgid "E-_mail:"
 msgstr "ኢሜይል፦"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "አድራሻ"
@@ -2292,8 +2335,8 @@ msgstr ""
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr ""
 
@@ -2350,6 +2393,420 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "የፋይል ስም"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "ኢሜይል"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "መግለጫ የለም"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "የውይይት መድረክ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "የቤት ስልክ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "መሥራት"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "የግል"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "ማስታወሻ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "አርእስት"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "ኢሜይል"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "የቤት ፋክስ"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "አድራሻ"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+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
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "አልተገኘም"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "ዝርዝር"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+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
+#. * 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 "ኢሜይል"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "ኢሜይል"
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: 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
+#, 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
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr ""
@@ -2364,8 +2821,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr ""
 
@@ -2420,10 +2877,11 @@ msgstr "አድራሻ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "በሌላ ስም አስቀምጥ..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
@@ -2490,7 +2948,7 @@ msgid "Cut"
 msgstr "ቁረጥ"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2501,18 +2959,8 @@ msgstr "ቅጂ"
 msgid "Paste"
 msgstr "ለጥፍ"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "አጥፉ"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "የአሁኑ ዕይታ"
 
@@ -2525,7 +2973,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
@@ -2566,21 +3014,6 @@ msgstr "ምድቦች"
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "ኢሜይል"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "የቤተሰብ ስም"
@@ -2620,29 +3053,14 @@ msgstr "ጆርዳን"
 msgid "Manager"
 msgstr "መቆጣጠሪያ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "ቅጽል ስም"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "ማስታወሻ"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "ቢሮ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2696,21 +3114,29 @@ msgstr "ያልተሰየመ"
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "ስፋት"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "እርዝማኔ"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "መጻፊያ ሳጥን"
@@ -2727,10 +3153,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2751,393 +3173,8 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "የፋይል ስም"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "ኢሜይል"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "መግለጫ የለም"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "የውይይት መድረክ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "የቤት ስልክ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "መሥራት"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "የግል"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "አርእስት"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "የቤት ፋክስ"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "አድራሻ"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-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:57
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "አልተገኘም"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-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:114
-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 ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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:140
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "በላዩ ላይ ይጻፍ"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "ዝርዝር"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-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
-#. * 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:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: 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
-#, 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
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3182,11 +3219,6 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 msgid "Print contacts"
 msgstr ""
@@ -3196,6 +3228,11 @@ msgstr ""
 msgid "Print contact"
 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"
 msgstr ""
@@ -3380,17 +3417,6 @@ msgstr ""
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr ""
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3446,6 +3472,17 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr ""
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3458,11 +3495,12 @@ msgstr ""
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
@@ -3495,118 +3533,53 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "ቀን መቁጠሪያ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "ዝጋ"
+msgid "Snooze _time (minutes):"
+msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+msgid "_Edit appointment"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3615,12 +3588,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3628,7 +3601,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3639,19 +3612,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: 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:139
 msgid "Could not initialize Bonobo"
 msgstr "bonobo ማስጀመር አልቻልኩም!"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr ""
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3760,182 +3733,177 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
+msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "ቦታ፦"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "ቀን መቁጠሪያ"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "ቀን"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "ምርጫዎች..."
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
+msgstr ""
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: 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:1234
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "New meeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "ስብሰባ"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "ኒው ካሌዶኒያ"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "ቀን መቁጠሪያ፦ (_A)"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "አዲስ ዶሴ ፍጠር"
@@ -3966,34 +3934,42 @@ msgstr "የሳመንት ዕይታ"
 msgid "Month View"
 msgstr "የወር ዕይታ"
 
-#: calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:419
-msgid "Method not supported when opening the calendar"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
-msgid "Permission denied to open the calendar"
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "ቦታ፦"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
+#: calendar/gui/comp-editor-factory.c:409
+msgid "Error while opening the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:420
+msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
+#: calendar/gui/comp-editor-factory.c:426
+msgid "Permission denied to open the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
+#: calendar/gui/comp-editor-factory.c:474
+#, c-format
+msgid "open_client(): %s"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.c:466
@@ -4064,7 +4040,7 @@ msgstr ""
 msgid "hours"
 msgstr "ሰዓትን"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4084,14 +4060,14 @@ msgstr "ቀላል"
 msgid "Date/Time:"
 msgstr "ቀን/ሰዓት፦"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr ""
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "ድምፅ አጫውት"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4107,6 +4083,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
 msgid "Summary:"
 msgstr "ማጠቃለያ፦"
@@ -4145,10 +4122,108 @@ msgstr "ደቂቃ(ዎች)"
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "ቀለሞች (_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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "ኒው ካሌዶኒያ"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "ዓይነት፦"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "url"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "ያስችላል"
 
@@ -4163,19 +4238,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "አስቻለ"
 
@@ -4200,164 +4275,176 @@ msgid "60 minutes"
 msgstr "60 ደቂቃ"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>ሁኔታ፦</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>ሁኔታ፦</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 "<b>ሁኔታ፦</b>"
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "አሳይ"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "አስቻለ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+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:563
 msgid "Friday"
 msgstr "ዓርብ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "ሰዓቶች"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "ደቂቃዎች"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "ሰኞ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_እሑድ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "ቅዳሜ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "እሑድ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_ሐሙስ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "የፋይል ስም"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "ሐሙስ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "ሰዓት"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "የሰዓት ክልል"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "ማክሰኞ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "ረቡዕ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 ሰዓት"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "ጨምር"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "አሳይ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4367,143 +4454,46 @@ msgstr "አሳይ"
 msgid "_Edit"
 msgstr "አስተካክል"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "አጠቃላይ"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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:5
-#, fuzzy
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "ኒው ካሌዶኒያ"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "ዓይነት፦"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "url"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "ሳመንታት"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4578,79 +4568,79 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "ወደ"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "ወደ"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4773,27 +4763,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "ስብሰባ"
 
@@ -4805,7 +4795,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4895,10 +4885,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4917,15 +4907,15 @@ msgstr ""
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5205,27 +5195,20 @@ msgstr ""
 msgid "Save Event"
 msgstr "የቀን መቁጠሪያ ኩነቶች"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "ዶሴ ምረጡ"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr ""
+msgid "Select destination"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "ቀን መቁጠሪያ"
+msgid "_Destination"
+msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
-msgstr "አድራሻ"
+msgid "Task List"
+msgstr "የፋይል ስም"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5253,38 +5236,44 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "ከፍ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "ዝቅ ያለ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "የተለመደ"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 ""
 
@@ -5322,11 +5311,11 @@ msgstr "ገጽ"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5335,8 +5324,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr "ሚስጢራዊ"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "መግለጫ"
@@ -5488,99 +5478,56 @@ msgstr "%s በ %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "ሚስጢራዊ"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "ያልተሰየመ"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
-msgid "End Date"
-msgstr "ቀን"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "ማጠቃለያ"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "ነፃ"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
+msgid "Start Date:"
+msgstr "ቀን፦"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "n"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "ቀን፦"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "s"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "ሁኔታ፦"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "ምሥራቅ"
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "ቅድሚያ"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "ምዕራብ"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "ገጽ"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: 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-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "አይ"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "ያልታወቀ"
-
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
+#: 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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5626,17 +5573,26 @@ msgstr ""
 msgid "100%"
 msgstr "100"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "ክፈት"
 
@@ -5645,41 +5601,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "ለጥፍ"
 
@@ -5737,78 +5694,155 @@ msgstr "ቅድሚያ"
 msgid "Start date"
 msgstr "ቀን፦"
 
+#: 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:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "ዶሴ ምረጡ"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "አጥፉ..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "ወደ ዶሴን ሂዱ..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "ምርጫዎች"
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "ቀን"
+
+#: 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: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-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:168 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
+msgid "No"
+msgstr "አይ"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "n"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "s"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+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 ""
+
 #. 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
@@ -5829,36 +5863,36 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-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 "ጠዋት"
+
+#. 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 "ከሳዓት"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "ጠዋት"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "ከሳዓት"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5965,10 +5999,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>ምንም</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "ሁኔታ፦"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5998,7 +6028,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "እሺ"
 
@@ -6211,59 +6241,55 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6380,28 +6406,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6462,81 +6466,160 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "ሚስጢራዊ ቃል አስገቡ"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "በመጫን ላይ..."
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "አትም"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr ""
+
+#: 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 "ኤፕረል"
@@ -6674,6 +6757,25 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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ን መክፈት አልቻለም፦ %s፦ %s"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1ኛ"
@@ -6893,7 +6995,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "የቅድመ ህትመት ዕይታ"
 
@@ -6905,67 +7007,77 @@ msgstr ""
 msgid "Print Setup"
 msgstr "የህትመት ቅንጅት"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d ተመርጠዋል"
+msgstr[1] "%d ተመርጠዋል"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "በመጫን ላይ..."
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 #, fuzzy
 msgid "_Task"
 msgstr "የማይፈለግ"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "አድራሻ"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6973,11 +7085,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr ""
 
@@ -8617,7 +8729,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8710,29 +8822,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8764,7 +8853,46 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8772,42 +8900,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8815,103 +8943,103 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1246 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'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9146,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9341,8 +9469,11 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+#, fuzzy
+msgid "Cannot add encryption certificate"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9359,7 +9490,7 @@ msgstr ""
 msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr ""
 
@@ -9422,94 +9553,94 @@ msgstr ""
 msgid "Cannot set message digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr ""
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9528,16 +9659,28 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "የማይፈለግ"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9659,7 +9802,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9668,11 +9811,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9689,7 +9832,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9699,28 +9842,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9732,17 +9875,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9751,11 +9894,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9770,10 +9908,12 @@ 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 ""
@@ -9805,6 +9945,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9824,26 +9965,347 @@ msgstr ""
 msgid "Checklist"
 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:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%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
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: 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 ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%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'ን ማስፈጠር አልተቻለም፦\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'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%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'ን ማስፈጠር አልተቻለም፦\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'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: 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'ን ማስፈጠር አልተቻለም፦\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
+msgid "IMAPv4rev1"
 msgstr ""
 
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 ""
+
+#: 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:815
+#: 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/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: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/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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 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 "ሚስጢራዊ ቃል አስገቡ"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9886,21 +10348,21 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -9914,25 +10376,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9972,23 +10434,6 @@ msgstr ""
 msgid "Command:"
 msgstr "የሼሉን ትእዛዝ"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "ዶሴዎች"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10009,85 +10454,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10095,25 +10498,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10123,7 +10519,7 @@ msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10222,58 +10618,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10346,7 +10742,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10682,7 +11078,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10691,8 +11087,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10701,48 +11097,48 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -10854,8 +11250,11 @@ msgid "Could not get group: %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
@@ -10907,8 +11306,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11338,7 +11737,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
@@ -11383,6 +11782,89 @@ msgstr "የmime ዓይነት"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+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፦ %s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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.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 ""
@@ -11461,194 +11943,130 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
 msgstr ""
 
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "ምስሉን በሌላ ስም አስቀምጥ"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "ፋይል ክፈት"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "አስወግድ"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "አስወግድ"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "አስወግድ"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "አስወግድ"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
-#, fuzzy
-msgid "Unfinished messages found"
-msgstr "ምስሉን በሌላ ስም አስቀምጥ"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11766,7 +12184,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -11943,73 +12362,89 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "አጣራዎች"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "ዶሴን አስወግድ"
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-#, fuzzy
-msgid "No sources selected."
-msgstr "ተመርጠዋል"
-
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "ተመርጠዋል"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12022,66 +12457,11 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr "<b>ሁኔታ፦</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "ዶሴ ምረጡ"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "አስፈላጊ"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "ፈተና"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "የፋይል ስም"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "ያልተሰየመ"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>ሁኔታ፦</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12166,6 +12546,74 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>ሁኔታ፦</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "ደቂቃዎች"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12296,7 +12744,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "ጁን"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "መለያ"
@@ -12336,7 +12784,7 @@ msgstr "ከፕሮግራሙ ውጣ"
 msgid "Play Sound"
 msgstr "ድምፅ አጫውት"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "አንብብ"
 
@@ -12406,9 +12854,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "ጉዳዩ"
@@ -12471,101 +12919,59 @@ msgstr ""
 msgid "Virtual _Folders"
 msgstr "ዶሴ (_F)"
 
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "ፖስታ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "ጨምር"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "የነበረው"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "ቋንቋ"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12603,542 +13009,567 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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
 #, fuzzy
 msgid "Folder _name:"
 msgstr "የዶሴ ስም፦"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "በመጫን ላይ..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "ዶሴን አስወግድ"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "ዶሴ"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "መልዕክቶች"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "መንቀሳቅስ"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "ተወው"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "ዶሴ ምረጡ"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "ቅጂ"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "ዶሴን እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "ተመልከት (_V)"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "መንቀሳቅስ"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "እንደገና ሰይም"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "ፖስታ"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "አትም"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "ወደፊት፦"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "አታጥፋ"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "አጣራዎች"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "የዶሴ ስም፦"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "የነበረው"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "አያያዝ ቦታ ቅጂ"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-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-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: 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-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-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-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-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-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr ""
+#: 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-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-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-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "ያልታወቀ ስህተት፦ %s"
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "ያልተሰየመ"
 
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1002
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1013
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
-#, fuzzy
-msgid "_Hide"
-msgstr "ደብቅ"
-
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "ከ"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr ""
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "ወደ"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: 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:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "ቀን"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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 ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:653
+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."
 msgstr ""
 
-#: mail/em-format.c:1347
+#: 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 ""
+
+#: 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 ""
+
+#: mail/em-format-html-display.c:757
+msgid "_View Certificate"
+msgstr ""
+
+#: mail/em-format-html-display.c:772
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: mail/em-format-html-display.c:1007
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr ""
+
+#: mail/em-format-html-display.c:1018
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "ያልታወቀ ስህተት፦ %s"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr ""
+
+#: mail/em-format-html-display.c:1089
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "ያልታወቀ ስህተት፦ %s"
+msgid "_Hide"
+msgstr "ደብቅ"
+
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "በየ ዓመት"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "በየሳመንት"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "በየወር"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13146,31 +13577,59 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to create new folder `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#: mail/em-migrate.c:1715
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1919
+#, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr ""
 "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
 "%s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13181,93 +13640,79 @@ msgstr "በሌላ ስም አስቀምጥ..."
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "በአዲስ መስኮት ውስጥ ክፈት"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 "ዶሴ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "አጣራዎች"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "መልዕክት"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "በሌላ ስም አስቀምጥ..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "አድራሻ"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "መልዕክቶች"
@@ -13285,11 +13730,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13388,157 +13833,157 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13586,7 +14031,7 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13725,49 +14170,78 @@ msgstr ""
 msgid "spamd port"
 msgstr "ከውጭ አስገባ"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: 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:96
+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 ""
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13797,19 +14271,47 @@ msgid "Select folder to import into"
 msgstr "ዶሴ ምረጡ"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "ከውጭ አስገባ"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "ከውጭ አስገባ"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -13819,7 +14321,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13834,7 +14336,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13842,7 +14344,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13851,23 +14353,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "ምርጫዎች"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13897,166 +14399,178 @@ msgid "Pine"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "እንግዳ ተቀባይ"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "የተጠቃሚ ስም"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "መተላለፊያ"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d ተመርጠዋል"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d አዲስ"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d ቀን"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d ተልኳል"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d ተልኳል"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d አጠቃላይ"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d ተመርጠዋል"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 #, fuzzy
 msgid "New Mail Message"
 msgstr "%s - መልዕክት"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 #, fuzzy
 msgid "_Mail Message"
 msgstr "መልዕክቶች"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_አዲስ ዶሴ (_N)"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "ዶሴ (_F)"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: 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:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "ሴኔጋል"
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14065,14 +14579,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14365,7 +14871,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14671,400 +15177,517 @@ msgstr "ቀለም"
 msgid "description"
 msgstr "መግለጫ"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "የማይሰራ"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:4
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+#. 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-errors.xml.in.h:5
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"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-errors.xml.in.h:6
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:7
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#. 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"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:8
+#: 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: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 ""
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
+#. 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 ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:16
-#, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+#. 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?"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:17
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
+msgid "Use _Default"
+msgstr "የነበረው"
 
-#: mail/mail-errors.xml.in.h:18
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:19
-#, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+#. 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 ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
-
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+msgid "_Empty Trash"
+msgstr "የማይፈለግ ማድረጊያውን ባዶ አድርግ (_T)"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
+#. 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 ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
+#. 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 ""
-"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "\"%s\"ን አጥፉ"
+#. 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-errors.xml.in.h:33
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Delete account?"
-msgstr "ሁሉንም ሰርዝ (_D)"
+msgid "Enter password."
+msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Enter password."
-msgstr "ሚስጢራዊ ቃል አስገቡ"
+msgid "Cannot save to file \"{0}\"."
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. 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/mail-errors.xml.in.h:41
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "የማይሰራ"
+msgid "Delete \"{0}\"?"
+msgstr "\"%s\"ን አጥፉ"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 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."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. 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-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
+#. 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 "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
 msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "ሁሉንም ሰርዝ (_D)"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. 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-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "Use _Default"
-msgstr "የነበረው"
+msgid "Could not save signature file."
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "የማይፈለግ ማድረጊያውን ባዶ አድርግ (_T)"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr ""
+"ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "ላክ"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-folder-cache.c:786
+#: 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:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -15073,170 +15696,170 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
 msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "ምስሉን በሌላ ስም አስቀምጥ"
 msgstr[1] "ምስሉን በሌላ ስም አስቀምጥ"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15302,24 +15925,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "ሚስጢራዊ ቃል አስገቡ"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "ይህንን ሚስጢራዊ ቃል አስታውሱ (_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15361,89 +15984,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "አዲስ ዶሴ ፍጠር"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "አዲስ ዶሴ ፍጠር"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "ዝቅተኛ"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "ዛሬ %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "ትናንት %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15475,43 +16103,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15556,125 +16184,90 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr ""
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
 msgstr "80"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
-msgid "Default shortcut group"
-msgstr "አዲስ ዶሴ ፍጠር"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+#, fuzzy
+msgid "mail"
+msgstr "ኢሜይል"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr ""
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
-msgstr ""
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "ያልታወቀ ስህተት"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-#, fuzzy
-msgid "mail"
-msgstr "ኢሜይል"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
-msgstr ""
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "አጠቃላይ ስህተት"
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
@@ -15801,11 +16394,11 @@ msgstr ""
 msgid "_Import"
 msgstr "ከውጭ አስገባ"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15842,11 +16435,28 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -15860,14 +16470,15 @@ msgid "Bug buddy could not be run."
 msgstr ""
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
-msgstr ""
+#, fuzzy
+msgid "About Evolution"
+msgstr "አውቶማቲክ"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
@@ -15875,44 +16486,6 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "አጠቃላይ ስህተት"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15978,6 +16551,47 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "ቀን መቁጠሪያ፦ (_A)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "ወር"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "ፖስታ፦ (_M)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "የማይፈለግ"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "የዶሴ ዓይነት፦"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "ዶሴን እንደገና ሰይም"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "የመድረክ ስም"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "የዶሴ ስም፦ (_F)"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "ተጠቃሚ፦ (_U)"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -16011,6 +16625,18 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr ""
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16072,13 +16698,13 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16092,67 +16718,121 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+msgid "Continue"
+msgstr ""
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr ""
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr ""
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr ""
 
@@ -16383,11 +17063,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -16588,6 +17263,11 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16627,12 +17307,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16696,7 +17376,7 @@ msgid "Select all contacts"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16727,8 +17407,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "ትግባሮች (_A)"
@@ -16746,8 +17426,9 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "በሌላ ስም አስቀምጥ"
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -16875,10 +17556,20 @@ msgstr "የአሁኑን ፋይል አስቀምጥ"
 msgid "Week"
 msgstr "ሳመንት"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr ""
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 "ዝጋ"
+
 #: 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
@@ -17202,6 +17893,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "ዝጋ (_C)"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17444,7 +18145,7 @@ msgid "Open the selected message in a new window"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17559,58 +18260,46 @@ msgstr ""
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "ሂድ ወደ (_G)"
 
-#: ui/evolution-mail-message.xml.h:115
-msgid "_Inline"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:116
-msgid "_Larger"
+msgid "_Inline"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:117
-msgid "_Message Display"
+msgid "_Larger"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "መሣሪያዎች (_T)"
@@ -17619,16 +18308,6 @@ msgstr "መሣሪያዎች (_T)"
 msgid "_Undelete"
 msgstr "አታጥፋ (_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "ዝጋ (_C)"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -18021,6 +18700,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "ላክ / ተቀበል (_S)"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "አሁኑኑ"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -18092,10 +18776,6 @@ msgstr "ቀን፦"
 msgid "With _Status"
 msgstr "ሁኔታ"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18252,6 +18932,33 @@ msgstr "ሌላ..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "አድራሻ"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+msgid "Evolution Warning"
+msgstr ""
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "የኩነቶች መረጃ"
+
+#: widgets/misc/e-error.c:120
+msgid "Evolution Query"
+msgstr ""
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18366,6 +19073,28 @@ msgstr "ጽሑፍ"
 msgid "Find _Now"
 msgstr "ፈልግ"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "ፋይል sን መክፈት አልቻለም፦ %s፦ %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18377,9 +19106,41 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
-#~ msgid "New Address Book"
+#~ msgid "Address 2:"
 #~ msgstr "አድራሻ"
 
+#~ msgid "Time"
+#~ msgstr "ሰዓት"
+
+#~ msgid "_General"
+#~ msgstr "አጠቃላይ"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "ዶሴ ምረጡ"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "ቀን መቁጠሪያ"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "አድራሻ"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "የዶሴ ስም፦"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr ""
+#~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
+#~ "%s"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "አዲስ ዶሴ ፍጠር"
+
 #, fuzzy
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "ቀን መቁጠሪያ"
@@ -18407,9 +19168,6 @@ msgstr ""
 #~ msgid "File a_s:"
 #~ msgstr "የፋይል ስም"
 
-#~ msgid "_Add"
-#~ msgstr "ጨምር"
-
 #, fuzzy
 #~ msgid "_Categories..."
 #~ msgstr "ምድብ... (_T)"
@@ -18434,18 +19192,6 @@ msgstr ""
 #~ msgstr "ቀን መቁጠሪያ"
 
 #, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "ቀን፦"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "ቀን፦"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "ቅድሚያ"
-
-#, fuzzy
 #~ msgid "Could not delete folder: %s"
 #~ msgstr ""
 #~ "ዶሴ `%s'ን ማስፈጠር አልተቻለም፦\n"
@@ -18468,10 +19214,6 @@ msgstr ""
 #~ msgstr "አዲስ ዶሴ ፍጠር"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "ሚስጢራዊ ቃል አስገቡ"
-
-#, fuzzy
 #~ msgid "_Task List"
 #~ msgstr "የፋይል ስም"
 
@@ -18482,22 +19224,6 @@ msgstr ""
 #~ msgid "in \"%s\" ..."
 #~ msgstr "በ\"%s\" ውስጥ ..."
 
-#~ msgid "C_alendar:"
-#~ msgstr "ቀን መቁጠሪያ፦ (_A)"
-
-#~ msgid "_Mail:"
-#~ msgstr "ፖስታ፦ (_M)"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "የዶሴ ዓይነት፦"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "የዶሴ ስም፦ (_F)"
-
-#~ msgid "_User:"
-#~ msgstr "ተጠቃሚ፦ (_U)"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "አዲስ ዶሴ ፍጠር"
@@ -18717,10 +19443,6 @@ msgstr ""
 #~ msgstr "ዩጎዝላቪያ"
 
 #, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>ሁኔታ፦</b>"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>ሁኔታ፦</b>"
 
@@ -18841,9 +19563,6 @@ msgstr ""
 #~ msgid "%x"
 #~ msgstr "%x"
 
-#~ msgid "_Save as..."
-#~ msgstr "በሌላ ስም አስቀምጥ"
-
 #~ msgid "Print..."
 #~ msgstr "አትም"
 
@@ -18961,9 +19680,6 @@ msgstr ""
 #~ msgid "Font Preferences"
 #~ msgstr "የፊደል ቅርጽ ምርጫዎች"
 
-#~ msgid "_Mail"
-#~ msgstr "ፖስታ"
-
 #~ msgid "Add"
 #~ msgstr "ጨምር"
 
diff --git a/po/az.po b/po/az.po
index 9838b08231..33093c324c 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -24,6 +24,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Ünvan Kitabçası"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Əlaqələr: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Alarm"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -48,16 +58,6 @@ msgstr "kartlar"
 msgid " card"
 msgstr "kartlar"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Əlaqələr: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution Alarm"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Ön Qurğulu Sync Ünvanı:"
@@ -72,63 +72,20 @@ msgstr "Ünvan kitabçası yüklənə bilmədi"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot-un Ünvan tə'minatı bloku oxuna bilmədi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Avtomatik Tamamlama"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Vəsiqələr"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Avtomatik tamamlamanı buradan quraşdırın"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Əlaqələr"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Ünvan Kitabçası"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Ünvan Kitabçası ünvan pop-up-ı"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Ünvan Kitabçası ünvan nümayişçisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Ünvan Kitabçası kart nümayişçisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Ünvan Kitabçası tərkib hissəsi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Ünvan Kitabçası qovluq nümayişçisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Vəsiqə İdarəsi"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP vericisinə anonim olaraq yetişmə"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Tanıdılma bacarılmadı.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "S/Mime vəsiqələrinizi buradan idarə edin"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s %s üçün şifrə daxil edin (istifadəçi %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -169,41 +126,45 @@ msgstr "Ə_laqələr:"
 msgid "Create a new contacts group"
 msgstr "Yeni qısa yol qrupu yarat"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Daşınır..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' daşınır:"
@@ -211,8 +172,8 @@ msgstr "`%s' daşınır:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Bu Kompüterdə"
 
@@ -220,7 +181,7 @@ msgstr "Bu Kompüterdə"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Şəxsi"
@@ -286,20 +247,42 @@ msgstr ""
 "\n"
 "Xahiş edirik Evolution qovluqlarınızı daşırkən gözləyin..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP vericisinə anonim olaraq yetişmə"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Tanıdılma bacarılmadı.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Yeni Ünvan Kitabçası"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s %s üçün şifrə daxil edin (istifadəçi %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -321,6 +304,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adları seç dialoqunda ən son işlədilən qovluğun URI-si"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Avtomatik Tamamlama"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Əlaqələr"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Vəsiqələr"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Avtomatik tamamlamanı buradan quraşdırın"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Ünvan Kitabçası"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Ünvan Kitabçası ünvan pop-up-ı"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Ünvan Kitabçası ünvan nümayişçisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Ünvan Kitabçası kart nümayişçisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Ünvan Kitabçası tərkib hissəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Vəsiqə İdarəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutionun qovluq qurğularını quraşdırma idarəsi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -342,6 +380,7 @@ msgstr "  Dəstəklənən Bazaları _Göstər "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -414,7 +453,7 @@ msgstr "Ə_laqələr:"
 msgid "Address Book Properties"
 msgstr "Ünvan Kitabçası Xassələri"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Həmişə"
@@ -429,114 +468,104 @@ msgid "Basic"
 msgstr "Əsas"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Rənglər"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Bağlanır"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Ayırılan _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Ayırılan _adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Dəstəklənən Axtarış Bazaları"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ümumi"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Qətiyyən"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Bir"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Rəng seç"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: 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:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Axtarışın əhatə _sahəsi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Axtarılır"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -547,7 +576,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -556,19 +585,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Alt"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Dəstəklənən Axtarış Bazaları"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -576,7 +605,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -586,34 +615,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -621,128 +650,135 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Vaxt formatı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Ayırılan ad (DN) işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Epoçt ünvanı işlədilir"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Mümkünsə Həmişə"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Ə_laqələr:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Endirmə məhdudiyyəti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Epoçt ünvanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Giriş yöntəmi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ad:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Qapı nömrəsi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Ü_stünlük:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Axtarış bazası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Verici adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Verici:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Vaxt Dolması (dəqiqə):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_E'tibarlı bağlantı (SSL) işlət:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kartlar"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "bağlanma-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "ümumi-səkməsi"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "dəqiqə"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "axtarış-səkməsi"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Ünvan Kitabçası siçim ara üzü"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Hamısını Sil"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Sil"
 
+#: 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 "Ad"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Hamısını Sil"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Əlaqə Siyahısını Göstər"
@@ -765,22 +801,15 @@ msgstr "Əlaqələrə Əlavə Et"
 msgid "Unnamed Contact"
 msgstr "Adsız Əlaqə"
 
-#: 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
-msgid "Name"
-msgstr "Ad"
-
 #: 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
 msgid "Source"
 msgstr "Mənbə"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Ünvan Kitabçası siçim ara üzü"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -847,142 +876,142 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Ünvan _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Ünvan :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_İl dönümü:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Yardımçı"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Ad günü:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bloq"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Təqvim:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Şə_hər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Qabığ Əmri"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Əlaqə Editoru"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Öl_kə:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Bölmə:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "Sə_rbəst/Məşğul URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Tam Ad..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-Poçt Ünvanını Birləşdir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "İdarəçi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Ləqəb:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Qeydlər:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Başqa"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Poçt Qutusu:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1010,9 +1039,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "İş"
@@ -1045,23 +1074,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Bu əlaqələri həqiqətən\n"
+"də silmək istəyirsiniz?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Bu əlaqəni həqiqətən\n"
+"də silmək istəyirsiniz?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Dəyişdirilə bilən"
 
@@ -2033,92 +2078,110 @@ msgstr "Zambiya"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Xidmət"
-
-#: 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
-msgid "Location"
-msgstr "Mövqe"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "İstifadəçi adı"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Qrup"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Mənbə Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Hədəf Kitab"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Yeni Əlaqə Mi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Yazıla Bilən Sahələr"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Dəyişdirilib"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Bu üzv bu kateqoriyalara aitdir:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Aıağıdakı bağlantılar hazırda fəaldı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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Xidmət"
+
+#: 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
+msgid "Location"
+msgstr "Mövqe"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "İstifadəçi adı"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Cəld Əlaqə Əlavəsi"
@@ -2136,22 +2199,6 @@ msgstr "_Tam Ad:"
 msgid "E-_mail:"
 msgstr "E-_poçt:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Bu əlaqələri həqiqətən\n"
-"də silmək istəyirsiniz?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Bu əlaqəni həqiqətən\n"
-"də silmək istəyirsiniz?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Ünvan _2:"
@@ -2300,8 +2347,8 @@ msgstr "əlaqə-siyahısı-editoru"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kitab"
 
@@ -2362,6 +2409,433 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Ətraflı Axtarış"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Üzvləri Sırala"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Epoçt"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Quruluş"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "İzahat"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Qrup"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#, 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
+#, fuzzy
+msgid "Phone"
+msgstr "Maşın Telefonu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "İş"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Bloq"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Əl Telefonu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Şəxsi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Qeyd"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Məslək"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Epoçt"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Ev səhifəsi"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+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
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Nüsxə xətdə deyil"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Qadağandır"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+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
+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
+msgid "Protocol not supported"
+msgstr "Protokol dəstəklənmir"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Ləğv Edildi"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Tanıtma Bacarılmadı"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Tanıtma Məcburidir"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Belə ismarış yoxdur"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Başqa xəta"
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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:168
+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:174
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Əlaqə əlavə etmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Siyahı təkmilləşdirmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Əlavə təkmilləşdirmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Əlaqə silmə xətası"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"%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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s onsuz da mövcuddur.\n"
+"Üstünə yazmaq istəyirsiniz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "siyahı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Əlaqəni daşı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Əlaqəni köçür"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Əlaqələri daşı"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Əlaqələri köçür"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Əlaqələri Ünvan Kitabçasından Seç"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Çoxlu VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s üçün VCard"
+
+#.
+#. * 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 "(heç biri)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "İlk Epoçt"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Epoçt 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Epoçt 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Gedişat Seç"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni \"%s\" əlaqəsi yarat"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Ünvan Kitabçası Sorğulanır..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Əlaqə Mə'lumatını Dəyişdir"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "E-Poçt Ünvanını Birləşdir"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "və bir başqa əlaqə."
+msgstr[1] "və bir başqa əlaqə."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Tam VCard-ı Göstər"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Kompakt VCard-ı Göstər"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Ünvan dəftərinə qeyd et"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Əlaqə olmasın"
@@ -2376,8 +2850,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Sorğu"
 
@@ -2432,9 +2906,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "VCard olaraq qeyd et"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2502,7 +2977,7 @@ msgid "Cut"
 msgstr "Kəs"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2513,18 +2988,8 @@ msgstr "Köçür"
 msgid "Paste"
 msgstr "Yapışdır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Sil"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Hazırkı Görünüş"
 
@@ -2537,7 +3002,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Hər Hansı Kateqoriya"
@@ -2578,21 +3043,6 @@ msgstr "Kateqoriyalar"
 msgid "Company Phone"
 msgstr "Şirkət Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Epoçt"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Epoçt 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Epoçt 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Soyad"
@@ -2629,29 +3079,14 @@ msgstr "Jurnal"
 msgid "Manager"
 msgstr "İdarəçi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Əl Telefonu"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Ləqəb"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Qeyd"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "İdarə"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Quruluş"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Başqa Faks"
@@ -2703,21 +3138,29 @@ msgstr "Bölmə"
 msgid "Web Site"
 msgstr "Veb Saytı"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "En"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Hündürlük"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Fokusa Malikdir"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seçili"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Kursora Malikdir"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Sahə"
@@ -2734,10 +3177,6 @@ msgstr "Mətn Modeli"
 msgid "Max field name length"
 msgstr "Maksimal sahə adı uzunluğu"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Sütun Eni"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2766,407 +3205,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seçili"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Kursora Malikdir"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Üzvləri Sırala"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Epoçt"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "İzahat"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Qrup"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#, fuzzy
-msgid "Video Conferencing"
-msgstr "_Video Görüşmə URL-si:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Maşın Telefonu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "İş"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Bloq"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Şəxsi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Məslək"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Ev səhifəsi"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Müvəffəqiyyət"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Nüsxə xətdə deyil"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Qadağandır"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Əlavə tapıla bilmədi"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-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:60
-msgid "Protocol not supported"
-msgstr "Protokol dəstəklənmir"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Ləğv Edildi"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Mənbə açıla bilmədi"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Tanıtma Bacarılmadı"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Tanıtma Məcburidir"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Belə ismarış yoxdur"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Başqa xəta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Ünvan kitabçası açıla bilmədi"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-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:176
-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:179
-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:205
-msgid "Do you want to save changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Unut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Siyahıya əlavə etmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Əlaqə əlavə etmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Siyahı təkmilləşdirmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Əlavə təkmilləşdirmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Siyahı çıxartma xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Əlaqə silmə xətası"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"%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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s onsuz da mövcuddur.\n"
-"Üstünə yazmaq istəyirsiniz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Üstünə yaz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "siyahı"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Əlaqəni daşı"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Əlaqəni köçür"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Əlaqələri daşı"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Əlaqələri köçür"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Əlaqələri Ünvan Kitabçasından Seç"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Çoxlu VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s üçün VCard"
-
-#.
-#. * 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 "(heç biri)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "İlk Epoçt"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Gedişat Seç"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Yeni \"%s\" əlaqəsi yarat"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Mövcud \"%s\" əlaqəsinə ünvan əlavə et"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Ünvan Kitabçası Sorğulanır..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Əlaqə Mə'lumatını Dəyişdir"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-Poçt Ünvanını Birləşdir"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "və bir başqa əlaqə."
-msgstr[1] "və bir başqa əlaqə."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Tam VCard-ı Göstər"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Kompakt VCard-ı Göstər"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Ünvan dəftərinə qeyd et"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Sütun Eni"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3213,11 +3254,6 @@ msgstr "Evolution vCalendar ixdalçısı"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Zərfi çap et"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Əlaqələri çap et"
@@ -3227,6 +3263,11 @@ msgstr "Əlaqələri çap et"
 msgid "Print contact"
 msgstr "Əlaqəni çap et"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Zərfi çap et"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3411,16 +3452,6 @@ msgstr "Əlaqə Çapı Sınağı"
 msgid "This should test the contact print code"
 msgstr "Bu əlaqə çapını sınayacaqdır"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Standart nəticə yerinə çıxış faylı bildir"
@@ -3475,6 +3506,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Əsas ünvan kitabçasını yükləmə xətası."
@@ -3487,11 +3528,12 @@ msgstr "Giriş Faylı"
 msgid "No filename provided."
 msgstr "Fayl adı bildirilməyib."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Adsız Siyahı"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Şifrəni bildir"
 
@@ -3523,119 +3565,57 @@ msgstr "Ö_n Qurğulu Üstünlük:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot Ediləcəklər əlavələri bloku oxuna bilmədi"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Təqvim və Vəzifələr"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Təqvimlər"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Vaxt zolağınızı, Təqvimi və Vəzifə Siyahısını buradan quraşdırın "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Təqvimi və Vəzifələr"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Təqvim quraşdırma idarəsi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Təqvim vaxtlaşdırma ismarış nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Təqvim nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Təqvim/Vəzifə editoru"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Vəzifələr nümayişçisi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution Təqvim tərkib hissəsi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution Vəzifələr tərkib hissəsi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Vəzifələr"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Təqvim alarm ilə bildriş xidməti"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Başlanğıc:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Son:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s vaxtı alarm ver"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Bağla"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Mürgülə"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Mürgüləmə vaxtı (dəqiqə)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "Görüşü _düzəlt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Mürgülə"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Aç"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 #, fuzzy
 msgid "Dismiss"
 msgstr "_Nəzərə Ama"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 #, fuzzy
 msgid "Dismiss All"
 msgstr "_Heç Birini Nəzərə Alma"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "İzahat yoxdur."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3648,12 +3628,12 @@ msgstr ""
 "Başlama %s\n"
 "Bitiş %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Xəbərdarlıq"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3665,7 +3645,7 @@ msgstr ""
 "üçün qurulubdur.  Evolution bunun yerinə normal\n"
 "xatırlatma ekranını göstərəcəkdir."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3682,19 +3662,19 @@ msgstr ""
 "\n"
 "Həqiqətən də bu proqramı icra etmək istəyirsiniz?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Mənə bu proqram ilə əlaqəli bir də soruşma."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Təqvim alarm ilə bildriş xidməti"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo hazırlana bilmədi"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs-ni başlada bilmədim"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm vermə xidməti emalatxanası yaradıla bilmir"
 
@@ -3803,57 +3783,42 @@ msgid "Weekday the week starts on"
 msgstr "Həftənin başladığı gün"
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+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
 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/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "İcmal bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "İzahat bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Şərh bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "İzahat bunu daxil edir:"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Oxşar Olmayan"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Təqvim"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3862,118 +3827,128 @@ msgstr ""
 "Bu əməliyyat seçili vaxtdan daha köhnə olan bütün hadisələri həmişəlik "
 "siləcəkdir. Davam etsəniz, bu hadisələri geri gətirə bilməyəcəksiniz."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Bundan köhnə hadisələri sil"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "gün"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 %b %d"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' təqvimi silinəcəkdir. Davam etmək istəyirsiniz?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Yeni Təqvim"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Xassələr..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Təqvim yüklənir..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Hadisə və görüşmələr yatamaq üçün '%s' təqvimi açıla bilmir"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Hadisə və görüşmələr yatamaq üçün təqvim mövud deyil"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Təqvimlər"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Yeni görüş yarat"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Yeni görüş"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Görüş"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Yeni görüş istəyi yarat"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Yeni tam günlük görüş"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Tam Günlük Görüş"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Yeni tam günlük görüş yarat"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Yeni təqvim"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_Təqvim"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Yeni təqvim yarat"
 
@@ -4003,15 +3978,36 @@ msgstr "Həftəlik Nümayiş"
 msgid "Month View"
 msgstr "Aylıq Nümayiş"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "İcmal bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "İzahat bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Şərh bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "İzahat bunu daxil edir:"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Oxşar Olmayan"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Təqvim açılırkən xəta oldu"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Yöntəm təqvim açılırkən dəstəklənmir"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Təqvimi açmaq üçün səlahiyyət verilmədi"
 
@@ -4020,19 +4016,6 @@ msgstr "Təqvimi açmaq üçün səlahiyyət verilmədi"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "'%s' içindəki qovluq açıla bilədi"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "Təqvimin göstərəcəyi URI"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Göstəriləcək nümayiş növü"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Səsli Alarm Seçimləri"
@@ -4098,7 +4081,7 @@ msgstr "hər əlavə vaxtda"
 msgid "hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Gedişat/Hadisə"
 
@@ -4117,14 +4100,14 @@ msgstr "Əsaslar"
 msgid "Date/Time:"
 msgstr "Tarix/Vaxt:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "İsmarış göstər"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Səs çal"
 
+#: 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 "Xatırladıcılar"
@@ -4139,6 +4122,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
 msgid "Summary:"
 msgstr "Mündəricat:"
@@ -4177,10 +4161,104 @@ msgstr "dəqiqə"
 msgid "start of appointment"
 msgstr "iclasın başlanğıcı"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, 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 "Yeni Təqvim Əlavə Et"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Vəzifə Siyahısı Qrupu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Yeni Təqvim Əlavə Et"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Növ:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "həftə"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Fəal"
 
@@ -4194,19 +4272,19 @@ msgstr "Silmə"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Qeyri-fəallaşdır"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Fəallaşdır"
 
@@ -4231,162 +4309,176 @@ msgid "60 minutes"
 msgstr "60 dəqiqə"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Bildirişlər"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Qalıb:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Qalıb:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Vəzifə Siyahısı Seçimləri</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Qalıb:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Qalıb:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Təqvim və Vəzifə Qurğuları"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Gecikmiş vəzifə rəngi"
 
-#: 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 "Bugünkü vəzifə rəngi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Günün _sonu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Gün"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Görünüş"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Fəallaşdır"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Cümə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Dəqiqə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Bazar ertəsi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Ba_z"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Şənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Yada salıcını _göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Vaxt səyyahında həftə _sayını göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Bazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Bügunki _vəzifələr:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "C_ax"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Vəzifə Siyahısı"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Cümə Axşamı"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Vaxt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Vaxt _zolağı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Vaxt formatı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Çərşənbə Axşamı"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Həftənin _başlanğıcı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Çərşənbə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "İş Həftəsi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "İş günləri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 saat (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "URL Ə_lavə Et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Üzvləri silərkən təsdiq _istə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Aylıq nümayişlərdə həftə sonlarını _sıxışdır"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Günün _başlanğıcı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Görünüş"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4396,139 +4488,46 @@ msgstr "_Görünüş"
 msgid "_Edit"
 msgstr "_Düzəlt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Sərbəst/Məşğul Nəşri"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Cüm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Ümumi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Başa çatmış vəzifələri bildirilən vaxtdan sonra _gizlə"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "B_e"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Gecikmiş vəzifələr:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Şn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Həftəlik və aylıq nümayişlərdə görüşlərin _sonlanma vaxtlarını göstər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Vaxt dilimləri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "Ça_x"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Çər"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "hər görüşdən əvvəl"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, 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:189
-#, 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:234
-#, 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:247
-#, 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 "Yeni Təqvim Əlavə Et"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Vəzifə Siyahısı Qrupu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Təqvim Xassələri"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Yeni Təqvim Əlavə Et"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Növ:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "həftə"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4607,79 +4606,79 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Siz dəyişikliklər aparmadınız, editor yenilənsin?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Yoxlama xətası: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " alıcı "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Qurtarılıb "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Qurtarılıb "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Qalan "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Qalan"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Cism yenilənə bilmədi"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Görüşü Dəyişdir"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Görüş - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Vəzifə - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Jurnal girişi - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Mündəricat yoxdur"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Fərqli qeyd et..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Hazırkı buraxılış işlədilə bilmir!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Yoxlama xətası: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " alıcı "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Qurtarılıb "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Qurtarılıb "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Qalan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Qalan"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Mənbə açıla bilmədi"
@@ -4800,27 +4799,27 @@ msgstr "Nümayəndələşdir:"
 msgid "Enter Delegate"
 msgstr "Nümayəndəni Bildir"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Görüş"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Xatırladıcı"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Təkrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Vaxtlaşdırma"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Görüş"
 
@@ -4833,7 +4832,7 @@ msgstr "Bitiş tarixi başlama tarixindən əvvəldir!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Başlama tarixi səhvdir"
 
@@ -4919,10 +4918,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4941,15 +4940,15 @@ msgstr "Təşkilatçı lazımdır."
 msgid "At least one attendee is required."
 msgstr "Ən az bir iştirakçı lazımdır."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Təmsil Et..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5226,27 +5225,19 @@ msgstr "Dəyişiklikləri _Unut"
 msgid "Save Event"
 msgstr "Hadisəni Qeyd Et"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "İdxalçı seçin"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Hədəf mənbəni seç"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Təqvim"
+msgid "_Destination"
+msgstr "Hədəf sırf oxunandır"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Yeni vəzifə siyahısı"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Vəzifə Siyahısı"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5274,38 +5265,44 @@ msgid "% _Complete"
 msgstr "% _Bitdi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Bitirilib"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Yüksək"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Fəaliyyətdə"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Alçaq"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Başlamayıb"
 
@@ -5341,11 +5338,11 @@ msgstr "_Veb Səhifəsi:"
 msgid "Assignment"
 msgstr "Tapşırıq"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Bitiş tarixi səhvdir"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ünvan kitabçası açıla bilmədi"
@@ -5354,8 +5351,9 @@ msgstr "Ünvan kitabçası açıla bilmədi"
 msgid "Con_fidential"
 msgstr "Gi_zli"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "İzahat:"
@@ -5501,102 +5499,53 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "Namə'lum işə salma növü üçün %s"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "İctimai"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Şəxsi"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Gizli"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Tarix"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Başlama Tarixi"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Mündəricat"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Sərbəst"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Məşğul"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "%s ünvanını açmaq üçün tıqlayın"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Adsız"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Baz."
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Başlama Tarixi:"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Bitiş Tarixi:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Çərş."
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Vəziyyət:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Coğrafi mövqe bu şəkildə bildirilməlidir: \n"
-"\n"
-"45.436845,125.862501"
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
+msgstr "Vaciblik:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Xeyir"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Veb Səhifəsi:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Namə'lum"
+#: 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 "İctimai"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Təkrarlanan"
+#: 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 "Şəxsi"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Vəzifələndirilmiş"
+#: 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 "Gizli"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5642,17 +5591,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Sərbəst"
+
+#: 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 "Məşğul"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Seçili üzvlər silinir"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Aç"
 
@@ -5661,41 +5619,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Yapışdır"
 
@@ -5753,78 +5712,158 @@ msgstr "Üstünlük"
 msgid "Start date"
 msgstr "Başlama Tarixi"
 
+#: 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 "Mündəricat"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Vəzifə nizamlanması"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Yeni _Görüş..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Yeni Bütün Günlük _Hadisə"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Yeni Görüş"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Yeni Vəzifə"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "İl_gəyi Seç"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Sil..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Qovluğa _Köçür..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Qovluğa _Daşı..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Görüş Planlaşdır..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar şəklində ö_tür..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Bu _Vaqiəni Sil"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "_Bütün Vaqiələri Sil"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "_Bugünə Get"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Tarixə _Get..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Qurğular..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Tarix"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Namə'lum"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Təkrarlanan"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Xeyir"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "Baz."
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Çərş."
+
+#: 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 ""
+"Coğrafi mövqe bu şəkildə bildirilməlidir: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5848,36 +5887,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dəqiqəlik bölmələr"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dəqiqəlik bölmələr"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5986,10 +6025,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Heç biri</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Vəziyyət:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6019,7 +6054,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Oldu"
 
@@ -6232,60 +6267,56 @@ msgstr "Əlavə hökmlü təqvim ismarışını daxil etmir"
 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:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Təqvim faylı yenilənə bilmədi!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Yeniləmə başa çatdı\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Cism tapıla bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "İştirakçı vəziyyəti yeniləndi\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "İştirakçı vəziyyəti yenilənə bilmədi!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Çıxartma Başa Çatdı"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Üzv göndərildi!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Üzv göndərilə bilmədi!\n"
 
@@ -6402,28 +6433,6 @@ msgstr "Temsilli"
 msgid "In Process"
 msgstr "Gedişatda"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "İş Yerində Deyil"
@@ -6484,7 +6493,34 @@ msgstr "İclas _başlama saatı:"
 msgid "Meeting _end time:"
 msgstr "İclas _bitiş saatı:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "%s üçün şifrəni bildir"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6493,24 +6529,22 @@ msgstr ""
 "%s-da xəta:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Vəzifələr %s vaxtı açılır"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6519,38 +6553,47 @@ msgstr ""
 "%s açılırkən xəta:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Vəzifələr başa çatdırılır..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Seçili cismlər silinir..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Geri alma"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Vəzifələr"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Görüş - %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Vəzifələrin yüklənməsi"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "%s açılması"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6558,18 +6601,60 @@ msgstr ""
 "təqvim arxa ara üzü\n"
 " iflas etdi."
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"%s\n"
-"vəzifə arxa ara üzü\n"
-" iflas etdi."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Silmə"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Təqvim və Vəzifələr"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Vaxt zolağınızı, Təqvimi və Vəzifə Siyahısını buradan quraşdırın "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Təqvimi və Vəzifələr"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Təqvim quraşdırma idarəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Təqvim vaxtlaşdırma ismarış nümayişçisi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Təqvim/Vəzifə editoru"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution Təqvim tərkib hissəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution Vəzifələr tərkib hissəsi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Təqvimlər"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Vəzifələr"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprel"
@@ -6715,6 +6800,23 @@ msgstr "Ad Günləri & Bayramlar"
 msgid "On The Web"
 msgstr "Vebdə"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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' təqvimi açıla bilmədi."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Ünvan kitabçası açıla bilmədi"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1-ci"
@@ -6934,7 +7036,7 @@ msgid "Contacts: "
 msgstr "Əlaqələr: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Çap Nümayişi"
 
@@ -6946,67 +7048,77 @@ msgstr "Üzvü Çap Et"
 msgid "Print Setup"
 msgstr "Çap Qurğuları"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Yeni Vəzifə Siyahısı"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Silinən"
+msgstr[1] "Silinən"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Vəzifələrin yüklənməsi"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Vəzifə"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Yeni vəzifə yarat"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Yeni vəzifə"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Vəzifə Siyahısı Qrupu"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Yeni vəzifə yarat"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Göstəriləcək vəzifələr qovluğunun URI-si"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "`%s'-dakı vəzifələr yüklənə bilmədi"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7018,11 +7130,11 @@ msgstr ""
 "\n"
 "Vəzifələr həqiqətən də silinsin?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Bir də soruşma."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Çap Vəzifələri"
 
@@ -8671,7 +8783,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s qovluğu xətdən qoparılmaq üçün hazırlanır"
@@ -8764,33 +8876,6 @@ msgstr "İstifadəçi bayrağına hökmsüz arqumentlər"
 msgid "Error executing filter search: %s: %s"
 msgstr "Filtr axtarışı işə salma xətası: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Axtarış ifadəsi oxuna bilmir:%s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Axtarış ifadəsi işə salma xətası:%s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Namə'lum başlıqda sorğu aparılır: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8822,7 +8907,50 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Yeni ismarış(lar) süzülür"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Axtarış ifadəsi oxuna bilmir:%s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Axtarış ifadəsi işə salma xətası:%s:\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Namə'lum başlıqda sorğu aparılır: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8833,15 +8961,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid bildirişi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg şifrə istəyi oxuna bilmədi."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8850,27 +8978,27 @@ msgstr ""
 "Bu istifadəçi üçün açarın qıfılını aşmaq üçün\n"
 "şifrəyə ehtiyacınız var: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ləğv edildi."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Gizli açarın qıfılı açıla bilmədi: 3 səhv şifrə bildirildi."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG-dən gözlənilməyən cavab alındı: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Şifrələnə bilmədi:Heç bir hökmlü alıcı bildirilməyib."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8881,85 +9009,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s GPG ilə şifrələnə bilmədi: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "İmzalama mə'lumat yaradıla bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 icra edilə bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 icra edilə bilmədi."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "İsmarış imzası təsdiqlənə bilmədi: müvəqqəti fayl yaradıla bilmir: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "İsmarış imzası təsdiqlənə bilmədi: müvəqqəti fayl yaradıla bilmir: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Bu, dijital olaraq imzalanmış ismarış hissəsidir"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Məktub məzmununu indekslə"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Editordan ismarış alına bilmir"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Qıfıllayıcı yardımçı boru yaradıla bilmir: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Qıfıllayıcı yardımçı çəngəllənə bilmir: %s"
-
-#: 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 "'%s' qıfıllana bilmir: lock-helper ilə protokol xətası"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' qıfıllana bilmədi"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8982,6 +9090,26 @@ msgstr "fcntl(2) istifadə edilərək qıfıl faylı alına bilmədi: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "fclock(2) istifadə edilərək qıfıl faylı alına bilmədi: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Qıfıllayıcı yardımçı boru yaradıla bilmir: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Qıfıllayıcı yardımçı çəngəllənə bilmir: %s"
+
+#: 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 "'%s' qıfıllana bilmir: lock-helper ilə protokol xətası"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "'%s' qıfıllana bilmədi"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9224,7 +9352,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Vericidən xətalı tanıtmacavabı alındı."
 
@@ -9422,7 +9550,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Sertifikat ID-si:"
 
 #: camel/camel-smime-context.c:360
@@ -9439,7 +9567,7 @@ msgstr "%s üstündə qovluq qıfılı yaradıla bilməir: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "LDAP vericisinə bağlanma xətası"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Tanıdılma bacarılmadı.\n"
@@ -9510,98 +9638,98 @@ msgstr "Qovluq alına bilmir: %s: %s"
 msgid "Cannot set message digests"
 msgstr "%s ismarışı alına bilmir: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Sertifikat imzası xətası"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "İmzanı dəyişdir"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Verici: %s, Növ: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP əmri iflas etdi: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Qovluq alına bilmir: %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "%s üstündə qovluq qıfılı yaradıla bilməir: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "LDAP vericisinə bağlanma xətası"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Əmr yerinə yetirilməyib"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9618,16 +9746,26 @@ msgstr "Qovluq alına bilmir: %s: %s"
 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Zibil"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9749,7 +9887,7 @@ msgstr "Açar istifadəsi sertifikat imzalamasını dəstəkləmir"
 msgid "Error in application verification"
 msgstr "Tə'minat təsdiqləməsində xəta"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9762,11 +9900,11 @@ msgstr ""
 "Barmaq izi:            %s\n"
 "İmza:                    %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "HÖKMLÜ"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "HÖKMSÜZ"
 
@@ -9790,7 +9928,7 @@ msgstr ""
 "Yenə də qəbul etmək istəyirsiniz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9805,7 +9943,7 @@ msgstr ""
 "\n"
 "Qəbul etmək istəyirsiniz?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9814,7 +9952,7 @@ msgstr ""
 "Sertifikat problemi: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9823,7 +9961,7 @@ msgstr ""
 "Hökmsüz sertifikat domeni: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9832,7 +9970,7 @@ msgstr ""
 "Sertifikatın vaxtı başa çatıb: %s\n"
 "Nəşriyyatçı: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9846,17 +9984,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "`%s' URL-si oxuna bilmədi"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "%s saxlanırkən xəta: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s içində %s bənzəri ismarış yoxdur"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 
@@ -9865,11 +10003,6 @@ msgstr "İsmarışlar Virtual Qovluğa köçürülə ya da daşına bilmir"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9886,10 +10019,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Yeni poçt yoxlanır"
 
 #: 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 "Bütün qovluqlarda yeni poçtu yoxla"
@@ -9922,6 +10057,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9941,26 +10077,322 @@ msgstr "Bu seçim IMAP vericisinə xam mətn şifrəsi ilə bağlanma imkanı ve
 msgid "Checklist"
 msgstr "siyahı"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP vericisindən gözlənilməz cavab: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Qovluq alına bilmir: %s: %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 "Verici gözlənilməz şəkildə bağlantını kəsdi: %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 "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "İsmarış mh qovluğuna əlavə edilə bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "İsmarış mh qovluğuna əlavə edilə bilmir: %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 ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$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 ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$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 ""
+"İsmarış alına bilmir: %2$s qovluğundan %1$s\n"
+"   %3$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 "Qovluqlar"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Ancaq qeydiyyatdan keçmiş qovluqları göstər"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Verici əlavəlı qovluq adı boşluqlarını nəzərə alma"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Ad boşluğu"
+
+#: 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 vericilərində məktubların saxlanması və oxuna bilməsi üçün."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
+
+#: 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:140
+#: 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-a bağlana bilmədi (qapı %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Bağlantı ləğv edildi"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Naməlum xəta"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"%s POP vericisinə bağlana bilmədi İstənən tanıtma protokoluna dəstək "
+"verilmir."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sXahiş edirik %s@%s üçün SMTP şifrənizi bildirin"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "%s POP vericisinə tanıdıla bilmədi: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün hökmsüzdür"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Qabığ Əmri"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Qovluq silinə bilmir: %s: Səhv əməliyyat"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Qovluq yenidən adlandırıla bilmir: %s: Səhv əməliyyat"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Qovluq alına bilmir: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "IMAP vericisindən gözlənilməz cavab: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Heç bir mə'lumat bildirilməyib"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Əməliyyat ləğv edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Verici gözlənilməz şəkildə bağlantını kəsdi: %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:1089
-msgid "Unknown error"
-msgstr "Naməlum xəta"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10005,21 +10437,21 @@ msgstr "%s qovluğu yaradıla bilmədi: %s"
 msgid "Could not load summary for %s"
 msgstr "%s üçün mündəricat yüklənə bilmədi"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Qovluq dağıdılıb vericidə yenisi yaradıldı."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Dəyişdirilmiş ismarışlar axtarılır"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İsmarış alına bilmədi: %s."
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10035,25 +10467,25 @@ msgstr ""
 "İsmarıc alına bilmir: %s\n"
 "   %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Belə ismarış yoxdur"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Bu ismarış hazırda mövcud deyil"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cavabında ismarış gövdəsi tapıla bilmədi"
 
@@ -10095,23 +10527,6 @@ msgstr "LDAP vericisinə bağlanma xətası"
 msgid "Command:"
 msgstr "Qabığ Əmri"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Qovluqlar"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Ancaq qeydiyyatdan keçmiş qovluqları göstər"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Verici əlavəlı qovluq adı boşluqlarını nəzərə alma"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Ad boşluğu"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bu vericidə GƏLƏNLƏR qutusundaki yeni ismarışlara filtrləri tətbiq et"
@@ -10134,86 +10549,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP vericisi"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s üstündə %1$s üçün IMAP xidmətləri"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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-a bağlana bilmədi (qapı %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS Mövcud Deyil"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Bağlantı ləğv edildi"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Şifrənizi bildirmədiniz."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10224,25 +10596,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "%s adında qovluq yoxdur"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" qovluq adı \"%c\" hərfini daxil etdiyi üçün hökmsüzdür"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10250,7 +10615,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Namə'lum qonşu qovluq: %s"
@@ -10351,58 +10716,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s qovluq kökü dəqiq mütləq cığır deyil"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s qovluq kökü düzgün qovluq deyil"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Qovluq alına bilmir: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Yerli qovluqların gələnlər qutusu yoxdur"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s yeli məktub faylı"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s qovluğu %s adi ilə yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' yenidən adlandırıla bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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' qovluq mündəricat faylı silinə bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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' qovluq indeks faylı silinə bilmədi: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10468,7 +10833,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10805,7 +11170,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10814,8 +11179,8 @@ msgid "User cancelled"
 msgstr "İstifadəçi ləğv etdi"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10824,48 +11189,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "İsmarışın avtomatik qeyd edilmə xatası: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Müvəqqəti qovluq bağlana bilmədi: %s"
@@ -10991,7 +11356,7 @@ msgstr "Qrup alına bilmədi: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "İsmarış göndərilə bilmədi: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11044,8 +11409,8 @@ msgstr "%s uid'li ismarış yoxdur"
 msgid "Retrieving POP message %d"
 msgstr "%d POP ismarışı alınır"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Namə'lum səbəb"
 
@@ -11499,7 +11864,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ilişdirilmiş fayl"
 
@@ -11543,6 +11908,99 @@ msgstr "MIME növü:"
 msgid "Suggest automatic display of attachment"
 msgstr "İlişdirilmiş faylın avtomatik göstərilməsini məsləhət et"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Fayl açıla bilmir"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Editordan ismarış alına bilmir"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Çoxlu İsmarış"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Faylı aç"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Avtomatik yarat"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "İmza:"
+
+#: 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.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 "İsmarış yaz"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Tərtib pəncərəsi yaradıla bilmir:\n"
+"Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
+
+#: 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 ""
+"Tərtib pəncərəsi yaradıla bilmir:\n"
+"HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir.\n"
+"Xahiş edirik, gtkhtml və ləbgtkhtml tə'minatlarının\n"
+"düzgün buraxılışlarına malik olduğunuzdan əmin olun.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Tərtib pəncərəsi yaradıla bilmir:\n"
+"HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir."
+
+#: 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 "Yollanacaq hədəf"
@@ -11625,208 +12083,135 @@ msgstr "<qovluq seçmək üçün buraya tıqlayın>"
 msgid "Attach file(s)"
 msgstr "Fayl(lar) ilişdir"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Bu hesab işlədildiyində bütün məktubları _həmişə imzala"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Fayl açıla bilmir"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Editordan ismarış alına bilmir"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Çoxlu İsmarış"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Faylı aç"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Avtomatik yarat"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "İmza:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "İsmarış yaz"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "İsmarışa bir fayl ilişdir"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Tərtib pəncərəsi yaradıla bilmir:\n"
-"Ünvan seçici idarə fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Tərtib pəncərəsi yaradıla bilmir:\n"
-"HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir.\n"
-"Xahiş edirik, gtkhtml və ləbgtkhtml tə'minatlarının\n"
-"düzgün buraxılışlarına malik olduğunuzdan əmin olun.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Tərtib pəncərəsi yaradıla bilmir:\n"
-"HTML editor tərkib hissəsi fəaliyyətə keçirilə bilmir."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "_Sonrakı Oxunmamış İsmarış"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Boru yaradıla bilmədi: %s"
+msgid "Don't Recover"
+msgstr "Silmə"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "İmza faylı qeyd edilə bilmir: %s"
+msgid "Recover"
+msgstr "Sil"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "İmza faylı qeyd edilə bilmir: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Dəyişiklikləri _Unut"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Qısa yolları qeyd edərkən xəta."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Silmə"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Diqqət: Təkmilləşdirilmiş İsmarış"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Qısa yolları qeyd edərkən xəta."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Bu adsız görüşü həqiqətən də silmək istəyirsiniz?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Sil"
+msgid "Discard Changes"
+msgstr "Dəyişiklikləri _Unut"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Boru yaradıla bilmədi: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "_Sonrakı Oxunmamış İsmarış"
+msgid "Could not read signature file \"{0}\"."
+msgstr "İmza faylı qeyd edilə bilmir: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Diqqət: Təkmilləşdirilmiş İsmarış"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "İsmarışa bir fayl ilişdir"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Məktub yazmadan əvvəl bir hesab quraşdırmalısınız."
 
@@ -11954,7 +12339,8 @@ msgstr ""
 "Eyni adlı bir fayl onsuz da mövcuddur.\n"
 "Üstünə yazılsın?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Faylının üsütünə yazılsın?"
 
@@ -12131,81 +12517,97 @@ msgstr "Müqayisə ediləcək vaxtı seçin"
 msgid "_Filter Rules"
 msgstr "Filtr Qaydaları"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"'%s' qaydalı ifadəsində xəta:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Görüş Yenilənməsi"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Tarix seçməlisiniz."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Ayırılan _adı:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Fayl adı bildirməlisiniz."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "%s qovluğu çıxardılır"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Tapşırıq"
+msgid "Missing folder."
+msgstr "%s qovluğu çıxardılır"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Qovluq bildirməlisiniz."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Heç bir verici seçilməyib"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"'%s' qaydalı ifadəsində xəta:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Tarix seçməlisiniz."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Tapşırıq"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Bu filtrə ad verməlisiniz."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Bu vqovluğa ad verməlisiniz."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Fayl adı bildirməlisiniz."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Qovluq bildirməlisiniz."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Heç bir verici seçilməyib"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12218,66 +12620,11 @@ msgstr "Faylı seç"
 msgid "<b>Then</b>"
 msgstr "<b>Qalıb:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Qovluğu Seç"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Vacib"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Ediləcəklər"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Sonra"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Sınaq"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Qayda adı: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Adsız"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Qalıb:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Gedişatı işə sal"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "bütün kriteriyalar uyğun gəlirsə"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "gələn"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "gedən"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12369,6 +12716,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Sonra"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Sınaq"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Qayda adı: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Qalıb:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "bütün kriteriyalar uyğun gəlirsə"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "əgər hər hansı bir kriteriya uyğun gəlirsə"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Gedişatı işə sal"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Temsilli"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Alıcılar"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Cavablanan: %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Daxil et:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "gələn"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "gedən"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12499,7 +12917,7 @@ msgstr "Bayraqlı deyilsə"
 msgid "Junk Test"
 msgstr "İyun"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12539,7 +12957,7 @@ msgstr "Proqramdan çıx"
 msgid "Play Sound"
 msgstr "Səs Çal"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Oxu"
 
@@ -12609,9 +13027,9 @@ msgstr "bununla başlayırsa:"
 msgid "Stop Processing"
 msgstr "Oxumağı Dayandır"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12674,102 +13092,62 @@ msgstr "Mövzu bunu daxil etməsin"
 msgid "Virtual _Folders"
 msgstr "Virtual Qovluqlar"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "Ə_lavə Et"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VQolvuq mənbəsi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Elektronik məktub hesablarnızı buradan quraşdırın"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Məktub"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Poçt hesabları quraşdırma idarəsi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Məktub tərkib hissəsi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Məktub tərtib edicisi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Məktub tərtib edicisi quraşdırma idarəsi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolutionun Məktub qovluğu nümayişcisi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Poçt xassələri idarəsi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Məktub"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poçt Hesabları"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr ""
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Ön qurğulu]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Hesab adı"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Adsız"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Dil(lər)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_İmza Əlavə Et"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Ötürülmüş İsmarış"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Axtarışdan _Virtual Qovluq Yarat..."
 
@@ -12807,287 +13185,462 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Qovluğun yaradılacağı yeri bildirin:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Yeni qovluq yarat"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Qovluq _adı:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VQovluqlar"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Gələnlər qutusu"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Yüklənir..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Daşı"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, 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-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Qovluq seçin"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Köçür"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni qovluq yarat"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "%s qovluğu adını buna dəyişdir:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Qovluğu Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Görünüş"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pəncərədə Aç"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Daşı"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Yeni Qovluq..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Yenidən Adlandır"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VQovluqlar"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Gələnlər qutusu"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Yeni İsmarış olaraq _Düzəlt ..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Çap Et"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Göndərənə _Cavab Yaz"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Qrupa Cavab Yaz"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Hamısına Cavab Yaz"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Ö_tür"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "_Bitirilmiş olaraq işarələ"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Sil"
 
-#: mail/em-folder-view.c:787 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 "Oxun_muş olaraq işarələ"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Qeyri-vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Ox_unmamış olaraq işarələ"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Vacib olaraq işarələ"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Geri Gətir"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Qovluğa _Daşı..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Qovluğa _Köçür..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Yollayanı Ünvan _Kitabçasına Əlavə Et"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Filtrləri _Tətbiq Et"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtr Qaydaları"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "İsmarışdan Qayda _Yarat"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "_Mövzuya görə VQovluğa"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "_Göndərənə görə VQovluğa"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara görə VQovluğa"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Məktublaşma _Qrupuna görə VQovluğa"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "_Göndərənə görə VQovluğa"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "_Mövzuya görə filtrlə"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "_Göndərənə görə filtrlə"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "_Alıcıya görə filtrlə"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "_Məktublaşma Qrupuna görə filtrlə"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "_Göndərənə görə filtrlə"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Ön qurğulu"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "İsmarışı Çap Et"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Körpü Ünvanını Köçür"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Vəzifə əlavə etmək üçün tıqlayın"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Göndərən"
+
+#: 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 "Cavablama-Ünvanı"
+
+#: 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 "Alıcı:"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "%s ünvanını açmaq üçün tıqlayın"
+msgid "%s attachment"
+msgstr "%s ilişdirilmiş fayl"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Dəstəklənməyən sxem"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Nəticələr:"
+msgid "Retrieving `%s'"
+msgstr "%s ismarışı alınır"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
 msgid "Unsigned"
 msgstr "Vəzifələndirilmiş"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "İmzanı dəyişdir"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "İmzanı qeyd et"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Kəsildi"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP Şifrələməsi"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Xəsərli xarici proqram parçası."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP saytını göstərən ox (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Yerli faylı (%s) göstərən ox \"%s\" saytında hökmlüdür"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Yerli faylı (%s) göstərən ox"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Uzaq mə'lumatı (%s) göstərən ox"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Namə'lum xarici mə'lumatı göstərən ox (\"%s\" növündə)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "İsmarışlar daşınır"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Göndərici"
+
+#. 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 ""
+
+#. 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 "Nəticələr:"
+
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13096,12 +13649,7 @@ msgstr ""
 "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
 "bilmir."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "İmzanı dəyişdir"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13110,256 +13658,110 @@ msgstr ""
 "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
 "bilmir."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "İmzanı qeyd et"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Kəsildi"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "PGP Şifrələməsi"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikat ID-si:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifikat hələ hökmlü deyil"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Gecikmiş işlər:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p tarixinə dək"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Daxili Olaraq Göstər"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Gizlə"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Səhifə: %d (Cəmi %d)"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s ismarışı alınır"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Xəsərli xarici proqram parçası."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP saytını göstərən ox (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Yerli faylı (%s) göstərən ox \"%s\" saytında hökmlüdür"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Yerli faylı (%s) göstərən ox"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Uzaq mə'lumatı (%s) göstərən ox"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Namə'lum xarici mə'lumatı göstərən ox (\"%s\" növündə)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "İsmarışlar daşınır"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Göndərən"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Cavablama-Ünvanı"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Alıcı:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Göndərici"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarix"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s ilişdirilmiş fayl"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME ismarışı oxuna bilmədi: Mənbə olaraq göstərilir."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Dəstəklənməyən sxem"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Yarpaq sertifikatı təsdiqlənə bilmədi"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Hər il"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Hər həftə"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "hər ay"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13367,25 +13769,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "%s ön yaddaşa alına bilmədi: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Qovluq alına bilmir: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "%s ön yaddaşa alına bilmədi: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Fayl izahatçısı köçürülə bilmir: %s\n"
+" %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"Yekun faylı yaradıla bilmir: %s\n"
+" %s"
+
+#: mail/em-migrate.c:1919
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "`%s' qovşağı tapıla bilmədi: %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "'%s'-a boru yaradıla bilmədi:'%s'"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 #, fuzzy
@@ -13397,98 +13831,82 @@ msgstr "_Fərqli Qeyd Et..."
 msgid "untitled_image.%s"
 msgstr "Adsız İsmarış"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "Göndərənə _cavab yaz"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Körpünü Səyyahda Aç"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Qrupa _ismarış göndər..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Yollayanı Ünvan Kitabçasına Əlavə Et"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "%s ilə aç..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Bu verici LDAPv3 sxem mə'lumatını dəstəkləmir"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Qeydiyyatdan Keç"
 
-#: mail/em-subscribe-editor.c:637 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 "Qovluq"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Xahiş edirik, verici seçin."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Heç bir verici seçilməyib"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Bu ismarışı bir də göstərmə."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtrlər"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Ötürülmüş İsmarış"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, 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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "İsmarış"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "İsmarışı Fərqli Qeyd Et..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Ünvan"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "%s-dan məktub"
@@ -13506,11 +13924,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13623,131 +14041,140 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Poçt Hesabları"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Poçt Hesabları"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Gedişatı işə sal"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Yeni Məktub Bildirişi"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -13756,33 +14183,25 @@ msgstr ""
 "HTML məktublarını bu tərz məktub istəməyən əlaqələrə göndərdiyimdə _təsdiq "
 "istə"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13838,8 +14257,9 @@ msgid "Spell check inline"
 msgstr "İmla _Yoxlaması"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Ö_n Qurğulu Üstünlük:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -13982,33 +14402,63 @@ msgstr ""
 msgid "spamd port"
 msgstr "İdxal Et"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm idxalçısı"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail idxalçısı"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 idxalçısı"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine idxalçısı"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox idxalçısı"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Elektronik məktub hesablarnızı buradan quraşdırın"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Məktub"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Poçt hesabları quraşdırma idarəsi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Məktub tərkib hissəsi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Məktub tərtib edicisi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Məktub tərtib edicisi quraşdırma idarəsi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Poçt xassələri idarəsi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poçt Hesabları"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Məktub:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14016,15 +14466,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Xahiş edirik gözləyin"
 
@@ -14056,19 +14506,47 @@ msgid "Select folder to import into"
 msgstr "İdxalçı seçin"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "İdxal edilir"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Fayllar İdxal Edilir"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm idxalçısı"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail idxalçısı"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 idxalçısı"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine idxalçısı"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox idxalçısı"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s oxunur"
@@ -14078,7 +14556,7 @@ msgstr "%s oxunur"
 msgid "Priority Filter \"%s\""
 msgstr "Əsas Filtr \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14093,7 +14571,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14101,7 +14579,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14110,24 +14588,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution köhnə Netscape verilənlərinizi idxal edir"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Qurğular"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Poçt Filtrləri"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14161,164 +14639,175 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesab Editoru"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Qovşaq:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_İstifadəçi adı:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Cığır:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "%s ünvanına məktub"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Mövzu %s-dır"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "%s-dan məktub"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s məktublaşma qrupu"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Cavablanan: %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Filtr Qaydası Əlavə Et"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Silinən"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d gün"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d saniyə"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d saniyə"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d əlaqə"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Silinən"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Yeni Məktub İsmarışı"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Məktub İsmarışı"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Yeni məktub ismarışı yaz"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Yeni VQovluq"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poçt Filtrləri"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Yeni təqvim yarat"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "Təqvimin göstərəcəyi URI"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Yoxlama Xidməti"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Vericiyə bağlanır..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Şəxsiyyət"
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Poçtun Alınması"
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 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:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Poçtun Göndərilməsi"
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Hesab İdarəsi"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14327,14 +14816,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Yoxlama Xidməti"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Vericiyə bağlanır..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14654,7 +15135,8 @@ msgid "Execute Command..."
 msgstr "Əmr İcra Et..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Tən-aralıqlı en:"
 
 #: mail/mail-config.glade.h:82
@@ -14977,437 +15459,554 @@ msgstr "rəng"
 msgid "description"
 msgstr "izahat"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Tanıtma"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Bu qovluqdan silinmiş ismarışları həmişəlik sil"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "%s SMTP vericisi istənən %s tanıtma növünü dəstəkləmir."
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Bütün qovluqlardaki silinmiş ismarışları həmişəlik sil"
+"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-errors.xml.in.h:6
+#. 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 "Bu URL-ni həqiqətən də silmək istəyirsiniz?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"HTML şəklində imsarış göndərirsiniz, xahiş edirik aşağıdakı alıcıların HTML\n"
+"şəklində məktub ala bildikləri və istədiklərindən əmin olun:\n"
+
+#: 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 "Göndər"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 ""
 "Bu əlaqəni həqiqətən\n"
 "də silmək istəyirsiniz?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Ancaq _Bcc alıcıları bildirlən ismarış yollamağa çalışdığımda bildir"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Qovluq köçürülə bilmir: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Qovluq alına bilmir: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Müvəqqəti qovluq yaradıla bilmədi: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "%s qovluğu yaradıla bilmədi: %s"
+msgid "Use default drafts folder?"
+msgstr "Ön qurğulu vəzifələr qovluğu açılır"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Qovluq silinə bilmir:\n"
-"%s"
+"Bu hesabın qovluğu açıla bilmədi.\n"
+"Ön qurğulu layihə qovluğunu işlətmək istəyirsiniz?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
+msgid "Use _Default"
+msgstr "Ön qurğulu"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "`%s' qovluğu mövcud deyil."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Bu qovluqdan silinmiş ismarışları həmişəlik sil"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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 ""
-"Qovluq daşına bilmir:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Mənbə açıla bilmədi"
+msgid "_Expunge"
+msgstr "_Cız"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Mənbə açıla bilmədi"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Bütün qovluqlardaki silinmiş ismarışları həmişəlik sil"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "İsmarış açıla bilmir"
+msgid "_Empty Trash"
+msgstr "Zibil Qutusunu _Boşalt"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "%s qovluğu yaradıla bilmədi: %s"
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"`%s' mövqeyinə qeyd edilə bilmir\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_İmza Əlavə Et"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "İmza faylı qeyd edilə bilmir: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "\"%s\"-i Sil"
+msgid "Error while {0}."
+msgstr ""
+"'%s' sırasında xəta:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Seçili əlaqələri sil"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "_Dəyişiklikləri nəzərə alma"
+msgid "Error while performing operation."
+msgstr ""
+"Əməliyyat aparılırkən xəta:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Silmə"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Şifrəni bildir"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Filtr mə'lumatını yükləmə xətası:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Əməliyyat aparılırkən xəta:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"'%s' sırasında xəta:\n"
-"%s"
+"`%s' mövqeyinə qeyd edilə bilmir\n"
+" %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Fayl mövcuddur, üstünə yazılsın?"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "%s qovluğu yaradıla bilmədi: %s"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
-
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgid "Cannot create temporary save directory."
+msgstr "Müvəqqəti qovluq yaradıla bilmədi: %s"
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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/mail-errors.xml.in.h:47
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Tanıtma"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:49
-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 ""
+msgid "File exists but cannot overwrite it."
+msgstr "Fayl mövcuddur, üstünə yazılsın?"
 
-#: mail/mail-errors.xml.in.h:50
-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:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "`%s' faylı mövcud deyil ya da hökmlü fayl deyil."
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"HTML şəklində imsarış göndərirsiniz, xahiş edirik aşağıdakı alıcıların HTML\n"
-"şəklində məktub ala bildikləri və istədiklərindən əmin olun:\n"
+"Qovluq silinə bilmir:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Qovluq silinə bilmir: %s: Qovluq yoxdur"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Qovluq yenidən adlandırıla bilmir: %s: Qovluq yoxdur"
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"Aşağıdakı vQovluq(lar):\n"
-"%2$s silinmiş qovluğunu istifadə edirdi:\n"
-"    '%1$s'\n"
-"Onlar yeniləndilər."
+msgid "Delete \"{0}\"?"
+msgstr "\"%s\"-i Sil"
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "\"%s\" qovluğu həqiqətən də silinsin?"
+
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
-"Aşağıdakı vQovluq(lar):\n"
-"%2$s silinmiş qovluğunu istifadə edirdi:\n"
-"    '%1$s'\n"
-"Onlar yeniləndilər."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. 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-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. 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 ""
+"Qovluq daşına bilmir:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "%s SMTP vericisi istənən %s tanıtma növünü dəstəkləmir."
+msgid "Cannot open source \"{2}\"."
+msgstr "Mənbə açıla bilmədi"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"İmza dəyişdirilib, amma qeyd edilməyib.\n"
-"\n"
-"Dəyişikliklərinizin qeyd edilməsini istəyirsiniz?"
+msgid "Cannot open target \"{2}\"."
+msgstr "İsmarış açıla bilmir"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Bu hesabın qovluğu açıla bilmədi.\n"
-"Ön qurğulu layihə qovluğunu işlətmək istəyirsiniz?"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Qovluq köçürülə bilmir: %s"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Use _Default"
-msgstr "Ön qurğulu"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Qovluq alına bilmir: %s: %s"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+msgid "Cannot open source \"{1}\""
+msgstr "Mənbə açıla bilmədi"
 
-#: mail/mail-errors.xml.in.h:66
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
+msgstr ""
+
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
 msgid "You have not filled in all of the required information."
 msgstr "Lazımi bütün mə'lumatlar verilməlidir."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:68
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
 msgid "You may not create two accounts with the same name."
 msgstr "Eyni adla iki hesab yarada bilməzsiniz."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Seçili əlaqələri sil"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Bu hesabı həqiqətən də silmək istəyirsiniz?"
+
+#. 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-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Silmə"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "İmza faylı qeyd edilə bilmir: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_İmza Əlavə Et"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
 msgstr "_Dəyişiklikləri nəzərə alma"
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Zibil Qutusunu _Boşalt"
+msgid "Do you wish to save your changes?"
+msgstr "Dəyişiklikləri qeyd etmək istəyirsiniz?"
 
-#: mail/mail-errors.xml.in.h:73
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Cız"
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"İmza dəyişdirilib, amma qeyd edilməyib.\n"
+"\n"
+"Dəyişikliklərinizin qeyd edilməsini istəyirsiniz?"
 
-#: mail/mail-errors.xml.in.h:74
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Dəyişiklikləri nəzərə alma"
+
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Send"
-msgstr "Göndər"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "`%s' qovluğu mövcud deyil."
 
-#: mail/mail-errors.xml.in.h:75
+#. 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."
+msgstr ""
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Aşağıdakı vQovluq(lar):\n"
+"%2$s silinmiş qovluğunu istifadə edirdi:\n"
+"    '%1$s'\n"
+"Onlar yeniləndilər."
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Aşağıdakı vQovluq(lar):\n"
+"%2$s silinmiş qovluğunu istifadə edirdi:\n"
+"    '%1$s'\n"
+"Onlar yeniləndilər."
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#. 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-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 "Üstünə yaz"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Göndər"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pinglənir"
@@ -15416,20 +16015,20 @@ msgstr "%s pinglənir"
 msgid "Working"
 msgstr "İşləyir"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Qovluq Filtrdən Keçirilir"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Poçt Alınır"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15438,115 +16037,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:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ismarış göndərilir"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%d / %d ismarışında iflas etdi"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Başa çatdı."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "İsmarışlar qovluğa qeyd edilir"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İsmarışlar %s qovluğuna daşınır"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İsmarışlar %s qovluğuna köçürülür"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"dakı qovluqlar oxunur"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Ötürülmüş ismarışlar"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "%s mənbəsi açılır"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s qovluğu çıxardılır"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s qovluğu saxlanılır"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Qovluq yenilənir"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Qovluq silinir"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' içindəki zibil boşaldılır"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Yerli Qovluqlar"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s ismarışı alınır"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15555,7 +16154,7 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15564,11 +16163,11 @@ msgstr ""
 "İsmarışların mövqeyə qeyd edilmə xətası: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "İlişdirilmiş fayl qeyd edilir"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15577,17 +16176,17 @@ msgstr ""
 "Yekun faylı yaradıla bilmir: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Mə'lumat yazıla bilmədi: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s ilə bağlantı kəsilir"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s ilə bağlantı yenidən qurulur"
@@ -15652,24 +16251,24 @@ msgstr "Yenilənir..."
 msgid "Waiting..."
 msgstr "Gözləyir..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "İstifadəçi əməliyyatı ləğv etdi."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s üçün şifrəni bildirin"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Şifrəni Bildirin"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "Bu şifrəni _yadda saxla"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "Hazırkı iclas boyunca bu şifrəni _yadda saxla"
 
@@ -15711,89 +16310,94 @@ msgstr "Ötürülmüş ismarış"
 msgid "Invalid folder: `%s'"
 msgstr "%s qovluğu açılır"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vqovluq quraşdırılır: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Uri üçün vqovluqlar yenilənir: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Uri üçün vqovluqlar yenilənir: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vQovluqlar"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "VQovluğu Dəyişdir"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Yeni VQovluq"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Görülməmiş"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Görülmüş"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Cavab verilmiş"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Çoxlu Görülməmiş İsmarış"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Çoxlu İsmarış"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Ən Alçaq"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Daha Alçaq"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Daha Yüksək"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Ən Yüksək"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Dünən: %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "İsmarış siyahısı yaradılır"
 
@@ -15825,43 +16429,43 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Böyüklük"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Zəng"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Qətiyyən Ötürmə"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Növbəti"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Nəzərinizə"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Ötür"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Cavab Məcburi Deyil"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Cavab yaz"
 
-#: mail/message-tag-followup.c:70 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 "Hamısına cavab yaz"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "İcmal"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "İzlənəcək Bayraq"
 
@@ -15904,20 +16508,6 @@ msgstr "Qeydiyyatdan _Keç"
 msgid "_Unsubscribe"
 msgstr "Qeydiyyatdan Çı_x"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Qabığı"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution Sınaq Tərkib Hissəsi"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -15925,110 +16515,54 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Bu qısa yol qrupunu yenidən adlandır"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Vəziyyət çubuğunu gizlə"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Ö_n Qurğulu Üstünlük:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolution Məktub quraşdırma ara üzü"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Ön qurğulu vəzifələr qovluğu açılır"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Ön qurğulu vəzifələr qovluğu açılır"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Ön qurğulu vəzifələr qovluğu açılır"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Ön qurğulu vəzifələr qovluğu açılır"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyini bildir"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Epoçt"
@@ -16037,6 +16571,32 @@ msgstr "Epoçt"
 msgid "Brought to you by"
 msgstr "İnkişafçılar"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Naməlum xəta"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Hökmsüz arqumentlər"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "OAF-a qeyd edilə bilmir"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Ümumi xəta"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "( Adsız )"
@@ -16177,11 +16737,11 @@ msgstr "gpg icra edilə bilmədi."
 msgid "_Import"
 msgstr "İdxal Et"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Bağlantılar bağlanır..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution Qurğuları"
 
@@ -16218,11 +16778,33 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "%s ünvanına məktub"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "%s icra xətası."
@@ -16236,14 +16818,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy işə salına bilmədi."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Ximian Evolution Haqqında"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Xətdə _İşlə"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Xətdən Qopuq _İşlə"
 
@@ -16251,46 +16834,6 @@ msgstr "Xətdən Qopuq _İşlə"
 msgid "Work Offline"
 msgstr "Xətdən Qopuq İşlə"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution xətdən çıxma fəaliyyətindədir."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Hökmsüz arqumentlər"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "OAF-a qeyd edilə bilmir"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Quraşdırma Mə'lumat Bazası tapılmadı"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Ümumi xəta"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "İşarələmə qutusu"
@@ -16364,6 +16907,43 @@ msgstr "Fəal Bağlantılar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Bu bağlantıları kəsərək xətdən qopmaq üçün Oldu-ya tıqlayın"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Təqvim:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Əlaqələr: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Məktub:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Vəzifələr:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Qovluq _növü:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Başqa İstifadəçinin Qovluğunu Aç"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Hesab:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Qovluq Adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_İstifadəci:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Sazlama Yardımçısı"
@@ -16405,6 +16985,20 @@ msgstr ""
 "\n"
 "Qurğularınızı qeyd etmək üçün \"Tətbiq Et\" düyməsinə basın. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Qabığı"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution Sınaq Tərkib Hissəsi"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Faylı Evolution içinə almaq üçün \"İdxal Et\" düyməsini tıqlayın. "
@@ -16469,13 +17063,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution aşağıdakı fayllardan verilənləri idxal edə bilər:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16489,71 +17083,128 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Sağolun\n"
 "Ximian Evolution Komandası\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Bunu bir daha demə"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ximian Evolution qabığına yetişilə bilmir."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolution qabığı başladıla bilmir: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Xətdən qopuq modda başla"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Xətdə modunda başla"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Bütün evolution tərkib hissələrini bağlanmaya məcbur et"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Bütün tərkib hissələrinin xəta ayırma verilənlərini bir fayla göndər."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Bağlanır"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ximian Evolution qabığına yetişilə bilmir."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Hesab Bələdçisi"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat ID-si:"
@@ -16806,12 +17457,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifikat ID-si:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kard ID onsuz da mövcuddur"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17030,6 +17675,12 @@ msgstr "Mövzu %s-dır"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kard ID onsuz da mövcuddur"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17071,12 +17722,12 @@ msgstr "İsmarışın ön qurğulu mövzusu."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s' icra edilə bilmədi: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) bağlanır\n"
@@ -17140,7 +17791,8 @@ msgid "Select all contacts"
 msgstr "Bütün əlaqələri seç"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Seçili əlaqələrə ismarış göndər."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17172,8 +17824,8 @@ msgstr "Hazırkı əlaqəni göstər"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Gedişatlar"
@@ -17191,7 +17843,8 @@ msgid "_Preview Pane"
 msgstr "_Nümayiş Paneli"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "VCard olaraq _Qeyd Et"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17322,11 +17975,21 @@ msgstr "Hazırkı əlaqəni göstər"
 msgid "Week"
 msgstr "Həftə"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "İş Həftəsi"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Görüş"
 
+#: 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 "_Bağla"
+
 #: 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
@@ -17648,6 +18311,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Bağla"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17894,7 +18567,8 @@ msgid "Open the selected message in a new window"
 msgstr "Seçili ismarışı yeni pəncərədə aç"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Seçili ismarışı yenidən göndərmək üçün tərtib edicidə aç"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18012,58 +18686,46 @@ msgstr "_Mövzuya görə VQovluğa..."
 msgid "_Attached"
 msgstr "_İlişdirilmiş"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "Qovluğa _Köçür"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "İsmarışdan Filtr _Yarat"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Get"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Daxili"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Daha _Geniş"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_İsmarış Görünüşü"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Qovluğa _Daşı"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Sonrakı İsmarış"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal Görünüş"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "İsmarışı _Aç"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Ə_vvəlki İsmarış"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Sitatlandırılmış"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Yenidən Göndər..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Vasitələr"
@@ -18072,16 +18734,6 @@ msgstr "_Vasitələr"
 msgid "_Undelete"
 msgstr "_Geri Gətir"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Bağla"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "İlişdir"
@@ -18478,6 +19130,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "_Göndər / Al"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "İndi _Tap"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Ş_irkətə Görə"
@@ -18551,10 +19208,6 @@ msgstr "_Bitiş Tarixi:"
 msgid "With _Status"
 msgstr "Vəziyyəti Dəyişdir"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Vəzifələr"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18713,6 +19366,34 @@ msgstr "Başqa..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution Məktub"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Görüş Mə'lumatı"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Göndərilən və Layihə İsmarışları"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -18832,6 +19513,35 @@ msgstr "Mətn"
 msgid "Find _Now"
 msgstr "Axtar"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 onsuz da mövcuddur.\n"
+"Üstünə yazmaq istəyirsiniz?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"`%s' mövqeyinə qeyd edilə bilmir\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"`%s' mövqeyinə qeyd edilə bilmir\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18842,14 +19552,141 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% başa çatdı)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Ünvan Kitabçası qovluq nümayişçisi"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Ünvan _2:"
+
 #, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bloq"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Təqvim nümayişçisi"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Vəzifələr nümayişçisi"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "gnome-vfs-ni başlada bilmədim"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "'%s' içindəki qovluq açıla bilədi"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "Təqvimin göstərəcəyi URI"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Göstəriləcək nümayiş növü"
+
+#~ msgid "Display a message"
+#~ msgstr "İsmarış göstər"
+
+#~ msgid "Alerts"
+#~ msgstr "Bildirişlər"
+
+#~ msgid "Time"
+#~ msgstr "Vaxt"
+
+#~ msgid "_General"
+#~ msgstr "_Ümumi"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "İdxalçı seçin"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Təqvim"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Yeni vəzifə siyahısı"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Təqvim faylı yenilənə bilmədi!\n"
+
 #~ 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?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "%s\n"
+#~ "vəzifə arxa ara üzü\n"
+#~ " iflas etdi."
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Göstəriləcək vəzifələr qovluğunun URI-si"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "`%s'-dakı vəzifələr yüklənə bilmədi"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolutionun Məktub qovluğu nümayişcisi"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Yeni Ünvan Kitabçası"
+#~ msgid "VFolder on Thread"
+#~ msgstr "_Göndərənə görə VQovluğa"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "_Göndərənə görə filtrlə"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "%s ön yaddaşa alına bilmədi: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "%s ön yaddaşa alına bilmədi: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "`%s' qovşağı tapıla bilmədi: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Təqvimin göstərəcəyi URI"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Bu qısa yol qrupunu yenidən adlandır"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Vəziyyət çubuğunu gizlə"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Ön qurğulu vəzifələr qovluğu açılır"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Qovluq çubuğunun nümayiş etdiriləcəyini bildir"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Qısa yol çubuğunun nümayiş etdiriləcəyini bildir"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ximian Evolution qabığı başladıla bilmir: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Yenidən Göndər..."
 
 #, fuzzy
 #~ msgid "The URI that the address book will display"
@@ -18943,9 +19780,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Yoldaş:"
 
-#~ msgid "_Add"
-#~ msgstr "Ə_lavə Et"
-
 #~ msgid "_Business:"
 #~ msgstr "_İş:"
 
@@ -19032,15 +19866,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Bitiş tarixi başlama tarixindən əvvəldir!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Başlama Tarixi:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Bitiş Tarixi:"
-
-#~ msgid "Priority:"
-#~ msgstr "Vaciblik:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19072,13 +19897,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ " %s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fayl izahatçısı köçürülə bilmir: %s\n"
-#~ " %s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19214,9 +20032,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Create a new address book"
 #~ msgstr "Yeni vəzifə yarat"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "%s üçün şifrəni bildir"
-
 #~ msgid "New task list"
 #~ msgstr "Yeni vəzifə siyahısı"
 
@@ -19273,30 +20088,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Bildirilən bölüşülmüş qovluq tapıla bilmir"
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Təqvim:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Məktub:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Vəzifələr:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Qovluq _növü:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Başqa İstifadəçinin Qovluğunu Aç"
-
-#~ msgid "_Account:"
-#~ msgstr "_Hesab:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Qovluq Adı:"
-
-#~ msgid "_User:"
-#~ msgstr "_İstifadəci:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Yeni qovluq yarat"
@@ -19605,9 +20396,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Yardımçı"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Aıağıdakı bağlantılar hazırda fəaldır:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Əlaqə _Axtar"
 
@@ -19623,9 +20411,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ msgid "Addressbook Sources"
 #~ msgstr "Ünvan Kitabçası Mənbələri"
 
-#~ msgid "No data provided"
-#~ msgstr "Heç bir mə'lumat bildirilməyib"
-
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
@@ -19840,9 +20625,6 @@ msgstr "%s (%d%% başa çatdı)"
 #~ "Bu ismarış dijital olaraq imzalanmışdır amma orijinal olduğu təsdiq edilə "
 #~ "bilmir."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution Xətası"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
diff --git a/po/be.po b/po/be.po
index 4ea9645a47..9ff0b6572c 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -20,6 +20,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Кніга адрэсаў \"Эвалюцыі\""
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Кантакты: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Акно \"Эвалюцыі\""
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -45,16 +55,6 @@ msgstr "карткі"
 msgid " card"
 msgstr "1 картка"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Кантакты: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Акно \"Эвалюцыі\""
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Адрэса дапомнае сынхранізацыі:"
@@ -70,67 +70,20 @@ msgstr "Немагчыма загрузіць %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня адрэсаў Пілёта"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Тэчкі аўтазавяршэньня"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "_Ід сэртыфіката:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Кантакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Кніга адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Далучацца да паслужніка LDAP ананімна"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Сродак кіраваньня наладкамі тэчак \"Эвалюцыі\""
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Збой аўтарызацыі.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -173,42 +126,46 @@ msgstr "_Кантакты: "
 msgid "Create a new contacts group"
 msgstr "Стварыць новую групу лычак"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Збой аўтарызацыі на паслужніку LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Немагчыма выканаць запыт да карэннага DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Паслужнік адказаў: \"адсутнічаюць базы пошуку\""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Памылка атрыманьня зьвестак схемы"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Чаканьне..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Зандаваньне %s"
@@ -216,8 +173,8 @@ msgstr "Зандаваньне %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -225,7 +182,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Пэрсанальнае"
@@ -275,20 +232,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Далучацца да паслужніка LDAP ананімна"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Збой аўтарызацыі.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Кніга адрэсаў"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sУвядзіце пароль для %s (карыстальнік %s)"
+#: 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
+#: 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
+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
+#: 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 "Кантакты"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -308,6 +287,63 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Тэчкі аўтазавяршэньня"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Кантакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Ід сэртыфіката:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Кніга адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Раптоўнае акенца кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Праглядальнік кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Праглядальнік візытовак кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Кампанэнт кнігі адрэсаў \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr "  _Адлюстраваць базы, якія падтрымліваюцца"
@@ -329,6 +365,7 @@ msgstr "  _Адлюстраваць базы, якія падтрымліваю�
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -401,7 +438,7 @@ msgstr "_Кантакты: "
 msgid "Address Book Properties"
 msgstr "Крыніцы кнігаў адрэсаў..."
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Заўсёды"
@@ -416,109 +453,99 @@ msgid "Basic"
 msgstr "Асноўнае"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Колеры"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Далучэньне"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Удакладнёная назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Удакладнёная назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "\"Эвалюцыя\" будзе выкарыстоўваць гэтую адрэсу для аўтарызацыі вас на "
 "паслужніку"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Базы пошуку, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Асноўнае"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Ніколі"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Адзін"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Выбярыце колер"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Межы _пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Межы _пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -528,7 +555,7 @@ msgstr ""
 "паслужніка\n"
 "LDAP калі той падтрымлівае SSL ці TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -546,7 +573,7 @@ msgstr ""
 "пакуль вашае злучэньне\n"
 "бясьпечнае."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -560,19 +587,19 @@ msgstr ""
 "нетрывалым  да эксплойдаў\n"
 "бясьпекі. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Пад"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Базы пошуку, якія падтрымліваюцца"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -583,7 +610,7 @@ msgstr ""
 "ваш пошук. Калі вы пакініце гэтае поле пустым, пошук будзе пачаты з карэня \n"
 "дрэва каталёгаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -599,14 +626,14 @@ msgstr ""
 "узровень\n"
 " за базу пошуку.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -616,7 +643,7 @@ msgstr ""
 "Гэта максымальная колькасьць запісаў для загрузкі. Усталяваньне  гэтае \n"
 "лічбы ў вялікае значэньне запаволіць вашую кнігу адрэсаў."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -626,7 +653,7 @@ msgstr ""
 "Усталёўка значэньня у \"Адрэса пошты\"прадастаўляе ананімны доступ да вашага "
 "паслужніка LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -635,7 +662,7 @@ msgstr ""
 "Гэта назва паслужніка якая будзе адлюстроўвацца ў сьпісе \"Эвалюцыі\".\n"
 "Гэта толькі для адлюстраваньня. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -646,128 +673,136 @@ msgstr ""
 "далучэньня. Запытайцеся вашага адміністратара каб даведацца які \n"
 "порт выкарыстоўвае ваш паслужнік."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Фармат часу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "Вы_карыстоўваць SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Выкарыстоўваць удакладнёнаю назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Выкарыстоўваць паштовую адрэсу"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Калі магчыма"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Кантакты: "
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Аб_межаваньне загрузкі:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Э.пошта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Мэтад уваходу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Назва:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Нумар порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Прыярытэт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_База пошуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Назва паслужніка:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Паслужнік:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Таймаут (хвіліны):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Выкарыстоўваць злучэньне праз SSL:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "карткі"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "закладка далучэньня"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "агульная закладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "хвіліны"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 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-popup.c:208
-msgid "Remove All"
-msgstr "Выдаліць усё"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Выдаліць усё"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Прагляд сьпіса кантактаў"
@@ -790,23 +825,15 @@ msgstr "Дадаць да кантактаў"
 msgid "Unnamed Contact"
 msgstr "Кантакт бяз назвы"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Крыніца"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-#, fuzzy
-msgid "Select Contacts from Address Book"
-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
 #, fuzzy
@@ -879,143 +906,143 @@ msgid "<b>Work</b>"
 msgstr "Працоўны тыдзень"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Адрэса _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Адрэса:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Юбілей:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Памочнік"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Дзень народзінаў:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Більбао"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Ка_ляндар:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Места:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Прадпрыемства"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Рэдактар кантактаў"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Краіна:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Па_дразьдзяленьне:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Вольны/Заняты URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Поўнае _Імя..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Хатні"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Паштовае паведамленьне"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Адрэса пошты:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Мэнаджар"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Мянушка:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Заўвагі:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Іншы"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Паштовая скрыня:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1043,9 +1070,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Праца"
@@ -1078,23 +1105,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Вы ўпэўненыя што жадаеце\n"
+"выдаліць гэтыя кантакты?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Можа рэдагавацца"
 
@@ -2076,100 +2119,118 @@ msgstr "Замбія"
 msgid "Zimbabwe"
 msgstr "Зімбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Даслаць паведамленьне"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Сьпіс бяз назвы"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-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-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Ёра"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Група"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Крыніца"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новы кантакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Палі у якія можна пісаць"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Зьменена"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Адсутнічае катэгорыя рэдактара."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Гэты кантакт належыць наступным катэгорыям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Выбярыце адзін з наступных варыянтаў"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Хатні"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 "Неатрымалася адшукаць віджэт для поля: \"%s\""
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+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:280
 msgid "Contact Quick-Add"
 msgstr "Хуткае даданьне кантакта"
@@ -2187,22 +2248,6 @@ msgstr "Поўнае імя:"
 msgid "E-_mail:"
 msgstr "Э. пошта:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Вы ўпэўненыя што жадаеце\n"
-"выдаліць гэтыя кантакты?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы ўпэўненыя што жадаеце\n"
-"выдаліць гэты кантакт?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрэса _2:"
@@ -2352,8 +2397,8 @@ msgstr "рэдактар сьпісу кантактаў"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Кніга"
 
@@ -2414,6 +2459,461 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Адмысловы пошук"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Удзельнікі"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Э. пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Установа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Бостан"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Група"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Тэлефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Праца"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Більбао"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Мабільны тэлефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Пэрсанальнае"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Заўвага"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Паса_да:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Э. пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Хатні факс"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Пасьпяхова"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Сховішча знаходзіцца ў адлучаным стане"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Кніга адрэсаў адсутнічае"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Адмоўлена ў доступе"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Картка ня адшукана"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Ід карткі ужо існуе"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Пратакол не падтрымліваецца"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Адменена"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Збой аўтарызацыі"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Патрабуе аўтарызацыю"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Няма гэткага паведамленьня"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Іншая памылка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, 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/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
+"вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+msgstr ""
+"Гэтая вэрсыя \"Эвалюцыі\" не мае ўбудаванае падтрымкі LDAP.\n"
+"Калі Вы жадаеце выкарыстоўваць LDAP у \"Эвалюцыі\", мусіце\n"
+"перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
+"усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, 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"
+"вы пазначылі нерэчаісны URI, ці паслужнік не адказвае."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Неатрымалася адкрыць кнігу адрэсаў"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"Зашмат картак супала з вашым запытам, і \n"
+"\"Эвалюцыя\" ня можа адлюстраваць іх усе.\n"
+"Калі ласка, зрабіце больш падрабязны пошук,\n"
+"ці абмяжуйце памер адказу кнігі адрэсаў у\n"
+"перавагах паслужніка каталёгаў."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Час адказу паслужніка перавышаны ці вы маеце абмежаваньне\n"
+"для гэтае кнігі адрэсаў. Калі ласка, зрабіце больш падрабязны\n"
+"пошук ці зьмяніце абмежаваньне часу для гэтае кнігі адрэсаў у\n"
+"перавагах паслужніка каталёгаў."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Праграма гэтае кнігі адрэсаў ня здолела разабраць запыт."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Праграма гэтае кнігі адрэсаў адмовіла ў запыце."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "Памылка пад час даданьня сьпісу"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Памылка пад час даданьня карткі"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Памылка рэдагаваньня сьпісу"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Памылка пад час зьмены карткі"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Памылка выдаленьня сьпісу"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Памылка выдаленьня карткі"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
+"Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s ужо існуе\n"
+"Жадаеце перапісаць?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "сьпіс"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Перамясьсціць картку ў"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Капіяваць картку ў"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Перамясьсціць карткі ў"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Капіяваць карткі ў"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Выбар кантактаў з кнігі адрэсаў"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Шматлікія VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard для %s"
+
+#.
+#. * 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"
@@ -2429,8 +2929,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Запыт"
 
@@ -2485,9 +2985,10 @@ msgstr "Кніга адрэсаў"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Захаваць як візытоўку (VCard)"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2555,7 +3056,7 @@ msgid "Cut"
 msgstr "Выразаць"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2566,18 +3067,8 @@ msgstr "Капіяваць"
 msgid "Paste"
 msgstr "Уставіць"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Выдаліць"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Бягучы выгляд"
 
@@ -2594,7 +3085,7 @@ msgstr ""
 "гэта нанава"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Любая катэгорыя"
@@ -2635,21 +3126,6 @@ msgstr "Катэгорыі"
 msgid "Company Phone"
 msgstr "Тэлефон установы"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Э. пошта"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Э. пошта 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Э. пошта 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Прозьвішча"
@@ -2689,29 +3165,14 @@ msgstr "Ярдан"
 msgid "Manager"
 msgstr "Мэнаджар"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Мабільны тэлефон"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Мянушка"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Заўвага"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офіс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Установа"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Іншы Fax"
@@ -2765,21 +3226,29 @@ msgstr "Нечытанае"
 msgid "Web Site"
 msgstr "І-нэт пляцоўка"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Шырыня"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Вышыня"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "Поле"
@@ -2796,10 +3265,6 @@ msgstr "Мадэль тэкста"
 msgid "Max field name length"
 msgstr "Максымальная даўжыня поля імя"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Шырыня слупка"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2828,435 +3293,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Удзельнікі"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Э. пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Бостан"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Група"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Тэлефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Праца"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Більбао"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Пэрсанальнае"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Паса_да:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Хатні факс"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Пасьпяхова"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Сховішча знаходзіцца ў адлучаным стане"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Кніга адрэсаў адсутнічае"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Адмоўлена ў доступе"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Картка ня адшукана"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Ід карткі ужо існуе"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Пратакол не падтрымліваецца"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Адменена"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Збой аўтарызацыі"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Патрабуе аўтарызацыю"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS адсутнічае"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Няма гэткага паведамленьня"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Іншая памылка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, 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/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 LDAP server is unreachable."
-msgstr ""
-"Неатрымалася адкрыць гэтую кнігу адрэсаў. Магчыма\n"
-"вы пазначылі нерэчаісны URI, ці паслужнік LDAP не адказвае."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-msgstr ""
-"Гэтая вэрсыя \"Эвалюцыі\" не мае ўбудаванае падтрымкі LDAP.\n"
-"Калі Вы жадаеце выкарыстоўваць LDAP у \"Эвалюцыі\", мусіце\n"
-"перасабрась праграму з зыходнага тэкста ў CVS пасьля\n"
-"усталёўкі OpenLDAP, які можна атрымаць па спасылцы ніжэй.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, 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"
-"вы пазначылі нерэчаісны URI, ці паслужнік не адказвае."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Неатрымалася адкрыць кнігу адрэсаў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Зашмат картак супала з вашым запытам, і \n"
-"\"Эвалюцыя\" ня можа адлюстраваць іх усе.\n"
-"Калі ласка, зрабіце больш падрабязны пошук,\n"
-"ці абмяжуйце памер адказу кнігі адрэсаў у\n"
-"перавагах паслужніка каталёгаў."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Час адказу паслужніка перавышаны ці вы маеце абмежаваньне\n"
-"для гэтае кнігі адрэсаў. Калі ласка, зрабіце больш падрабязны\n"
-"пошук ці зьмяніце абмежаваньне часу для гэтае кнігі адрэсаў у\n"
-"перавагах паслужніка каталёгаў."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Праграма гэтае кнігі адрэсаў ня здолела разабраць запыт."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Праграма гэтае кнігі адрэсаў адмовіла ў запыце."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Запыт ня быў пасьпяхова выкананы."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Жадаеце захаваць зьмены?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Адмовіць"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Памылка пад час даданьня сьпісу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Памылка пад час даданьня карткі"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Памылка рэдагаваньня сьпісу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Памылка пад час зьмены карткі"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Памылка выдаленьня сьпісу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Памылка выдаленьня карткі"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"Адкрыцьцё %d картак прывядзе да адкрыцьця %d новых вокнаў.\n"
-"Вы сапраўды жадаеце адлюстраваць усе гэтыя карткі?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ужо існуе\n"
-"Жадаеце перапісаць?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Перапісаць"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Памылка захаваньня %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "сьпіс"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Перамясьсціць картку ў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Капіяваць картку ў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Перамясьсціць карткі ў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Капіяваць карткі ў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Выбар кантактаў з кнігі адрэсаў"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Шматлікія VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard для %s"
-
-#.
-#. * 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: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-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Шырыня слупка"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3300,11 +3339,6 @@ msgstr "Імпарт візытовак \"Эвалюцыі\"."
 msgid "VCard (.vcf, .gcrd)"
 msgstr "Візытоўка (.vcf, .gcrd)"
 
-#: 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.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3316,6 +3350,11 @@ msgstr "Друкаваць вылучаныя кантакты"
 msgid "Print contact"
 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"
 msgstr "10 пт. Tahoma"
@@ -3502,18 +3541,6 @@ msgstr "_Сьпіс кантактаў"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Немагчыма адкрыць паведамленьне"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Картка ня адшукана"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3571,6 +3598,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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Немагчыма адкрыць паведамленьне"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Картка ня адшукана"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Памылка загрузкі дапомнай кнігі адрэсаў."
@@ -3583,11 +3622,12 @@ msgstr "Уваходны файл"
 msgid "No filename provided."
 msgstr "Назва файла не пазначана."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Сьпіс бяз назвы"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Пазначце пароль"
@@ -3620,120 +3660,55 @@ msgstr "Дапомны прыярытэт:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Немагчыма прачытаць блёк дастасаваньня заданьняў \"Пілёта\""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Каляндар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Наладка вашае часавае зоны, каляндара і сьпісу задачаў"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Кампанэнт каляндара і заданьняў \"Эвалюцыі\"."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Нагадваньне \"Эвалюцыі\""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "_Закрыць"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Нагадаць _пазьней"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Нагадаць пасьля (хвіліны)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Рэдагаваць сустрэчу"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Апісаньне недаступна."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3742,12 +3717,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3759,7 +3734,7 @@ msgstr ""
 "\"Эвалюцыя\" будзе адлюстроўваць замест гэтага звычайны дыялёг\n"
 "нагадваньня."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3775,19 +3750,19 @@ msgstr ""
 "\n"
 "Вы сапраўды жадаеце выканаць гэтую праграму?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Неатрымалася ініцыялізаваць Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Немагчыма ініцыялізаваць gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Немагчыма стварыць вытворчасьць паслугі нагадваньня"
 
@@ -3900,61 +3875,46 @@ 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:27
+#: 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:28
+#: 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:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Паказаць нумары тыдняў у навігатары па датах"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Агульныя зьвесткі утрымліваюць"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Апісаньне ўтрымлівае"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Камэнтар утрымлівае"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Апісаньне ўтрымлівае"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Іншая пошта"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Каляндар"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3966,125 +3926,136 @@ msgstr ""
 "\n"
 "Выдаліць гэтыя заданьні?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "вяртае менш за"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "дні"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Уласьцівасьці..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Загрузка каляндара..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: 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:1234
 msgid "New appointment"
 msgstr "Новая сустрэча"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Сустрэча"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Нарада"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Стварыць запыт новае нарады"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Новая сустрэча на увесь дзень"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Сустрэча на увесь _дзень"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Стварыць новую сустрэчу"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Новая Калядонія"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Ка_ляндар:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Стварыць новую тэчку"
@@ -4115,15 +4086,36 @@ msgstr "Прагляд тыдню"
 msgid "Month View"
 msgstr "Прагляд месяцу"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Агульныя зьвесткі утрымліваюць"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Апісаньне ўтрымлівае"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Камэнтар утрымлівае"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Апісаньне ўтрымлівае"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Іншая пошта"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Памылка пад час адкрыцьця каляндара"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Мэтад не падтрымліваецца  калі адкрываецца каляндар"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Адсутнічаюць правы на адкрыцьцё каляндара"
 
@@ -4132,19 +4124,6 @@ msgstr "Адсутнічаюць правы на адкрыцьцё калянд
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Немагчыма адчыніць тэчку у '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, які будзе адлюстроўваць каляндар"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Тып прагляду"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Парамэтры нагадваньня гукам"
@@ -4212,7 +4191,7 @@ msgstr "дадатковы час кожныя"
 msgid "hours"
 msgstr "гадзіны"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4231,14 +4210,14 @@ msgstr "Асноўнае"
 msgid "Date/Time:"
 msgstr "Дата/Час:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Адлюстраваць паведамленьне"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Граць гук"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4254,6 +4233,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
 msgid "Summary:"
 msgstr "Агульныя зьвесткі:"
@@ -4292,10 +4272,109 @@ msgstr "хвіліна(ы)"
 msgid "start of appointment"
 msgstr "пачатак сустрэчы"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Вы мусіце пазначыць назву файла."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Памылка iCalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Новая Калядонія"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Тып:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Уключана"
 
@@ -4311,19 +4390,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Уключыць"
 
@@ -4348,164 +4427,177 @@ msgid "60 minutes"
 msgstr "60 хвілін"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Сыгналы"
+#, 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 "Інфармацыя календара"
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Паказаць"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Уключыць"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "Пятніца"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Гадзіны"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Хвіліны"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Панядзелак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Няд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Паказаць нагадваньне"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Нядзеля"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Заданьні усталяваныя на сёньня:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "Чцв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Зьпіс заданьняў"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Чацьвер"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Час"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Часавая зона: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Фармат часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Аўторак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Тыдзень пачынаецца з:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Серада"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Працоўны тыдзень"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Працоўныя дні:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "12 гадзін"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "24 гадзіны"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Дадаць ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Сьціснуць выходныя ў праглядзе месяца"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Дзень пачынаецца:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Паказаць"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4515,145 +4607,46 @@ msgstr "_Паказаць"
 msgid "_Edit"
 msgstr "_Рэдагаваньне"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Запыт \"Вольны/Заняты\""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Птн"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Асноўнае"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Схаваць выкананьне заданьня праз"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Пан"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Нявыкананыя заданьні:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "Суб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Часавыя падзелы:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "Аўт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "перад кожнай сустрэчай"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Вы мусіце пазначыць назву файла."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Мэтад неабходны для загрузкі \"%s\" не падтрымліваецца"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Памылка iCalendar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Новая Калядонія"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Тып:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "тыдні"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4734,80 +4727,80 @@ msgstr "%s  Вы ўнесьлі зьмены. Забыцца на іх і абн
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вы ўнесьлі зьмены, абнавіць рэдактар?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Памылка зацьверджаньня: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " да "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Выканана "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Выканана "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Патрэба "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Умоўленае"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Немагчыма абнавіць аб'ект"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Рэдагаваньне сустрэчы"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Няма агульных зьвестак"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Захаваць як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Немагчыма атрымаць бягучую вэрсыю!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Памылка зацьверджаньня: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " да "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Выканана "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Выканана "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Патрэба "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Умоўленае"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4934,27 +4927,27 @@ msgstr "Дэлегаваць да:"
 msgid "Enter Delegate"
 msgstr "Пазначце дэлегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Сустрэча"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Нагадваньне"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Вяртаньне"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Нарада"
 
@@ -4966,7 +4959,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Дата пачатку памылковая"
 
@@ -5056,10 +5049,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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,15 +5071,15 @@ msgstr "Неабходны арганізатар."
 msgid "At least one attendee is required."
 msgstr "Патрабуе хаця б аднаго удзельніка."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Дэлегаваць у..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5374,26 +5367,19 @@ msgstr "_Адкінуць зьмены"
 msgid "Save Event"
 msgstr "Захаваць падзею"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Выбраць імпарт"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Выбярыце мейсца прызначэньня для імпартаваньня гэтых даньняў"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Каляндар"
+msgid "_Destination"
+msgstr "Выдаліць гэтую тэчку"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Зьпіс заданьняў"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5422,38 +5408,44 @@ msgid "% _Complete"
 msgstr "% Завершана"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Высокі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Нізкі"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Нармальны"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Не распачаты"
 
@@ -5491,11 +5483,11 @@ msgstr "Адрэса Web-старонкі:"
 msgid "Assignment"
 msgstr "Прызначэньне"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Умоўленая дата памылковая"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Неатрымалася адкрыць кнігу адрэсаў"
@@ -5504,8 +5496,9 @@ msgstr "Неатрымалася адкрыць кнігу адрэсаў"
 msgid "Con_fidential"
 msgstr "_Сакрэтна"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Апісаньне:"
@@ -5660,101 +5653,56 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невядомага тыпу трэггера"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Публічнае"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Прыватнае"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Сакрэтнае"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Дата завяршэньня"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата пачатку"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Агульныя зьвесткі"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Вольны"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Заняты"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: 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-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Бяз назвы"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: 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-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Умоўленая дата:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Геаграфічнае разьмяшчэньне мусіць быць пазначана ў фармаце:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Стан:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Прыярытэт:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Не"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Адрэса Web-старонкі:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5800,17 +5748,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Абнаўленьне аб'ектаў"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Адкрыць"
 
@@ -5820,41 +5777,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Уставіць"
 
@@ -5912,78 +5870,157 @@ msgstr "Прыярытэт"
 msgid "Start date"
 msgstr "Дата пачатку"
 
+#: 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:11
 msgid "Task sort"
 msgstr "Сартаваньне заданьняў"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Новая _сустрэча..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Новая падзея на ўвесь дзень"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Новая нарада"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Вылучыць абмеркаваньне тэмы"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Выдаліць..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Апублікаваць інфармацыю \"Вольны/Заняты\""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Капіяваць у тэчку..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Перамясьціць у тэчку..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Заплянаваць нараду..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Перадаслаць як iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Выдаліць гэтую зьяву"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Выдаліць _усе зьявы"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Перайсьці да _сёньня"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Пера_йсьці да даты..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Усталёўкі..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Дата завяршэньня"
+
+#: 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: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-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:168 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
+msgid "No"
+msgstr "Не"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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"
+
 #. 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
@@ -6007,36 +6044,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "дзяленьні %02i хвіліны"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "дзяленьні %02i хвіліны"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6145,10 +6182,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Няма</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Стан:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6178,7 +6211,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Так"
 
@@ -6391,59 +6424,55 @@ msgstr "Укладаньне ня ўтрымлівае рэчаіснага па
 msgid "The attachment has no viewable calendar items"
 msgstr "Укладаньне мае элемэнты каляндара, якія нельга адлюстраваць"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Файл каляндара ня можа быць абноўлены!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Абнаўленьне завершана\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стан удзельніка ня можа быць абноўлены таму, што элемэнт ужо не існуе"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Аб'ект нерэчаісны і ня будзе абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Адказ не ад бягучага удзельніка. Дадаць як ад яго?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены, таму што ён нерэчаісны!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Адбылася памылка ў сыстэме CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Аб'ект адсутнічае\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Вы ня маеце правільных правоў для абнаўленьня каляндара\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Стан удзельніка абноўлены\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Стан удзельніка ня можа быць абноўлены!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Выдаленьне скончана"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Элемэнт дасланы!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Элемэнт ня можа быць дасланы!\n"
 
@@ -6560,28 +6589,6 @@ msgstr "Дэлегаваны"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Пакінуу офіс"
@@ -6642,7 +6649,34 @@ msgstr "Час пачатку нарады:"
 msgid "Meeting _end time:"
 msgstr "Час заканчэньня нарады:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Пазначце пароль для %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6651,21 +6685,19 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Адкрыцьцё заданьняў %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6674,53 +6706,109 @@ msgstr ""
 "Памылка на %s\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Завяршэньне заданьняў..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Выдаленьне вылучаных аб'ектаў..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Выкрэсьленьне"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Заданьні"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Сустрэчы не заплянаваны."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка відарысаў"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Адкрыць у %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Турэцкае"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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 "Кампанэнт каляндара і заданьняў \"Эвалюцыі\"."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
+
+#: 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 "Красавік"
@@ -6858,6 +6946,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Адсутнічаюць правы на адкрыцьцё каляндара"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Неатрымалася адкрыць кнігу адрэсаў"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1-га"
@@ -7077,7 +7182,7 @@ msgid "Contacts: "
 msgstr "Кантакты: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Перадпрагляд друку"
 
@@ -7089,68 +7194,78 @@ msgstr "Друк элемэнта"
 msgid "Print Setup"
 msgstr "Наладка друку"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d выбраныя"
+msgstr[1] "%d выбраныя"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Загрузка відарысаў"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Заданьне"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Новае заданьне"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Зьпіс заданьняў"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Стварыць новае заданьне"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI, які будзе паказаны у тэчцы заданьняў"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Немагчыма загрузіць заданьне ў \"%s\""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7162,11 +7277,11 @@ msgstr ""
 "\n"
 "Выдаліць гэтыя заданьні?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Не пытацца наступнага разу."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Друк заданьняў"
 
@@ -8815,7 +8930,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Падрыхтоўка тэчкі \"%s\" для аўтаномнае працы"
@@ -8908,33 +9023,6 @@ msgstr "Недапушчальныя аргумэнты для user-tag"
 msgid "Error executing filter search: %s: %s"
 msgstr "Памылка выкананьня пошуку фільтра: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Памылка ў сталым выразе \"%s\":\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Памылка пад час выкананьня выраза пошуку \"%s\":\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(супадае ўсе) патрабуе адзінага лягічнага выніка"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8968,7 +9056,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Атрыманьне %d паведамленьняў"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Памылка ў сталым выразе \"%s\":\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Памылка пад час выкананьня выраза пошуку \"%s\":\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(супадае ўсе) патрабуе адзінага лягічнага выніка"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(супадае ўсе) патрабуе адзінага лягічнага выніка"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Завяршэньне запыту на невядомым загалоўке: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8979,15 +9112,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Памылка пад час апрацоўкі падказкі gpg userid."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Памылка пад час апрацоўкі запыту парольнае фразы gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8996,31 +9129,31 @@ msgstr ""
 "Вам патрэбны пароль каб разблякаваць ключ для\n"
 "карыстальніка: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Адменена."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Збой пад час разблякаваньня сакрэтнага ключа: пазначана 3 некарэктныя "
 "парольныя фразы."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Нечаканы адказ ад GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Неатрымліваецца зашыфраваць гэтае паведамленьне: Невызначаны карэктныя "
 "атрымоўцы."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9031,89 +9164,69 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збой у GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неатрымалася праверыць подпіс паведамленьня: ня атрымалася стварыць часовы "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Гэтая частка паведамленьня падпісана электроным подпісам"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Цела індэкса утрымлівае"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Неатрымалася стварыць канал для блякавальніка: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Неатрымліваецца запусьціць блякавальніка: %s"
-
-#: 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 "Неатрымліваецца заблякаваць \"%s\": памылка пратакола з блякавальнікам"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Неатрымалася заблякаваць \"%s\""
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9136,6 +9249,26 @@ msgstr "Неатрымалася атрымаць lock карыстаючыся
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Неатрымалася атрымаць lock карыстаючыся flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Неатрымалася стварыць канал для блякавальніка: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Неатрымліваецца запусьціць блякавальніка: %s"
+
+#: 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 "Неатрымліваецца заблякаваць \"%s\": памылка пратакола з блякавальнікам"
+
+#: 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"
@@ -9384,7 +9517,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Кепскі адказ на аўтарызацыю з паслужніка."
 
@@ -9588,7 +9721,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Ід сэртыфіката:"
 
 #: camel/camel-smime-context.c:360
@@ -9605,7 +9738,7 @@ msgstr "Неатрымліваецца стварыць кантэкст дэк�
 msgid "Failed to add data to CMS encoder"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Збой аўтарызацыі.\n"
@@ -9676,99 +9809,99 @@ msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Немагчыма атрымаць паведамленьне %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Подпіс сэртыфіката памылковы"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Рэдагаваць подпіс"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Паслужнік: %s, Тып: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Збой каманды IMAP: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Неатрымалася адшукаць сэртыфікат для \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Неатрымліваецца адшукаць агульны альгарытм."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Стварыць правіла з паведамленьня"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Неатрымліваецца стварыць кантэкст дэкадаваньня S/MIME"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Збой далучэньня да паслужніка LDAP"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Каманда не реалізавана"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9785,16 +9918,26 @@ msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Неатрымалася стварыць тэчку: недапушчальная апэрацыя ў гэтым сховішчы"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неатрымалася выдаліць тэчку: %s: недапушчальная апэрацыя"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Сьметніца"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9916,7 +10059,7 @@ msgstr "Выкарыстаньне ключа не падтрымлівае по
 msgid "Error in application verification"
 msgstr "Памылка ў дастасаваньні праверкі сапраўднасьці"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9929,11 +10072,11 @@ msgstr ""
 "Адбітак пальца:       %s\n"
 "Подпіс:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "ДОБРА"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "КЕПСКА"
 
@@ -9957,7 +10100,7 @@ msgstr ""
 "Усёроўна жадаеце прыняць ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9972,7 +10115,7 @@ msgstr ""
 "\n"
 "Жадаеце прыняць?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9981,7 +10124,7 @@ msgstr ""
 "Праблема з сэртыфікатам: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9990,7 +10133,7 @@ msgstr ""
 "Дрэнны дамэн сэртыфікату: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9999,7 +10142,7 @@ msgstr ""
 "Сэртыфікат састарэў: %s\n"
 "Выдавец: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10013,17 +10156,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Немагчыма разабраць URL \"%s\""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Памылка захаваньня `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Паведамленьне %s адсутнічае ў %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
@@ -10032,11 +10175,6 @@ msgstr "Немагчыма капіяваць ці перамясьціць па
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Неатрымалася зьмяніць назву тэчкі: %s: недапушчальная апэрацыя"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10053,10 +10191,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Немагчыма закрыць часовую тэчку: %s"
 
 #: 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 "Праверка новае пошты ўва ўсіх тэчках"
@@ -10092,6 +10232,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10113,26 +10254,324 @@ msgstr ""
 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: %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 "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+
+#: 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: %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:429
+#, 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
+#, c-format
+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:140
+#: 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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Далучэньне адмененае"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Невядомая памылка"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Немагчыма далучыцца да паслужніка POP %s: Запытаны мэханізм аўтарызацыі не "
+"падтрымліваецца."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sКалі ласка, пазначце пароль SMTP для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
+
+#: 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: %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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: %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: %s"
+
+#: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Дзеяньне адмененае"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Паслужнік нечакана адключыўся: %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:1089
-msgid "Unknown error"
-msgstr "Невядомая памылка"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10177,21 +10616,21 @@ msgstr "Немагчыма стварыць каталёг %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Немагчыма загрузіць агульныя зьвесткі для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Сканаваньне зьмененых паведамленьняў"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -10207,25 +10646,25 @@ msgstr ""
 "Немагчыма атрымаць паведамленьне: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Няма гэткага паведамленьня"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Гэтае паведамленьне ў бягучы момант недаступна"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Немагчыма адшукаць цела паведамленьня ў адказе FETCH."
 
@@ -10267,23 +10706,6 @@ msgstr "Збой далучэньня да паслужніка LDAP"
 msgid "Command:"
 msgstr "Прадпрыемства"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Тэчкі"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Паказываць толькі запытаныя тэчкі"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Перавызначыць прапанаваную паслужнікам прастору назваў для тэчак"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Прастора назваў"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10308,86 +10730,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чытаньня і захаваньня пошты на паслужніках IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Паслужнік IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "паслуга IMAP для %s на %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS адсутнічае"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Далучэньне адмененае"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Збой далучэньня да паслужніка IMAP %s у рэжыме бясьпекі: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Пашырэньне SSL/TLS не падтрымліваецца."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Збой узгадненьня SSL"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Немагчыма далучыцца да %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Паслужнік IMAP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Вы не пазначылі пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10398,25 +10777,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Тэчка %s адсутнічае "
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Назва тэчкі \"%s\" памылковая, таму што утрымлівае сымбаль \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Гэтая тэчка ня можа утрымліваць падтэчкі"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10424,7 +10796,7 @@ msgstr "Гэтая тэчка ня можа утрымліваць падтэч�
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невядомая бацькоўская тэчка: %s"
@@ -10525,58 +10897,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Адносны шлях да сховішча %s"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Сховішча %s не зьяўляецца каталёгам"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Лакальнае сховішча ня мае тэчкі \"Атрыманае\""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Лакальны файл пошты %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: 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"
@@ -10644,7 +11016,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "не зьяўляецца паштовым каталёгам"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10981,7 +11353,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10990,8 +11362,8 @@ msgid "User cancelled"
 msgstr "Карыстальнік адмяніў"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11000,48 +11372,48 @@ msgstr "Карыстальнік адмяніў"
 msgid "Cannot get message %s: %s"
 msgstr "Немагчыма атрымаць паведамленьне %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Памылка аўтазахаваньня паведамленьня: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Немагчыма закрыць часовую тэчку: %s"
@@ -11166,7 +11538,7 @@ msgstr "Немагчыма атрымаць групу: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Неатрымалася даслаць паведамленьне: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11219,8 +11591,8 @@ msgstr "Няма паведамленьня з uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Атрыманнье паведамленьняў %d па POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Невядомая прычына"
 
@@ -11679,7 +12051,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "укладаньне"
 
@@ -11723,6 +12095,103 @@ msgstr "Тып MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Прапаноўваць аўтаматычнае адлюстраваньне укладаньня"
 
+#: 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 "Немагчыма адкрыць паведамленьне"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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.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 ""
+"Немагчыма стварыць акно рэдактара.\n"
+"Немагчыма актывізаваць кіраваньне выбарам адрэсы."
+
+#: 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 ""
+"Немагчыма стварыць акно рэдактара.\n"
+"Немагчыма актывізаваць кампанэнт рэдактара HTML.\n"
+"Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
+"gtkhtml і libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Неатрымалася стварыць акно рэдактара:\n"
+"Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Рэдактар утрымлівае цэла паведамленьня ў фармаце (не тэксьце), які "
+"нельга рэдагаваць.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Мейсца прызначэньня"
@@ -11805,211 +12274,135 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Attach file(s)"
 msgstr "Укласьці файл(ы)"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Заўсёды падпісываць паведамленьні, калі выкарыстоўваецца гэты уліковы запіс"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Немагчыма адкрыць паведамленьне"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Неатрымліваецца атрымаць паведамленьне з рэдактара"
-
-#: composer/e-msg-composer.c:1551
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "(Паведамленьне бяз назвы)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Адкрыцьцё файла"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Створана аўтаматычна"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Подпіс:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Стварыць паведамленьне"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Укласьці файл у паведамленьне"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Немагчыма стварыць акно рэдактара.\n"
-"Немагчыма актывізаваць кіраваньне выбарам адрэсы."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Немагчыма стварыць акно рэдактара.\n"
-"Немагчыма актывізаваць кампанэнт рэдактара HTML.\n"
-"Калі ласка, праверце карэктнасьць усталяванае вэрсыі\n"
-"gtkhtml і libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Неатрымалася стварыць акно рэдактара:\n"
-"Неатрымалася актывізаваць HTML-кампанэнт рэдактара."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Рэдактар утрымлівае цэла паведамленьня ў фармаце (не тэксьце), які "
-"нельга рэдагаваць.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Наступнае нечытанае паведамленьне"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Жадаеце захаваць зьмены?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Неатрымалася стварыць канал: %s"
+msgid "Don't Recover"
+msgstr "Не імпартаваць"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Неатрымліваецца захаваць файл подпіса: %s"
+msgid "Recover"
+msgstr "Выдаліць"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Неатрымліваецца захаваць файл подпіса: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Адкінуць зьмены"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Жадаеце захаваць зьмены?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Памылка захаваньня лычак."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Не імпартаваць"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Увага: Зьмененае паведамленьне"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Памылка захаваньня лычак."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Вы упэўнены што жадаеце выдаліць гэтую сустрэчу бяз назвы?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Выдаліць"
+msgid "Discard Changes"
+msgstr "_Адкінуць зьмены"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Захаваць паведамлеьне як..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Неатрымалася стварыць канал: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Наступнае нечытанае паведамленьне"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Неатрымліваецца захаваць файл подпіса: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Увага: Зьмененае паведамленьне"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Укласьці файл у паведамленьне"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12140,7 +12533,8 @@ msgstr ""
 "Файл з гэтай назвай ужо існуе.\n"
 "Перапісаць?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Перапісаць файл?"
 
@@ -12317,81 +12711,97 @@ msgstr "Выбраць час для параўнаньня"
 msgid "_Filter Rules"
 msgstr "Правілы філтра"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Памылка ў сталым выразе \"%s\":\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Абнаўленьне нарады"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "_Удакладнёная назва:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Вы мусіце пазначыць назву файла."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Выдаленьне тэчкі %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Прызначэньне"
+msgid "Missing folder."
+msgstr "Выдаленьне тэчкі %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Вы мусіце пазначыць тэчку."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Небыў выбраны паслужнік"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Памылка ў сталым выразе \"%s\":\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Вы мусіце пазначыць дату."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Прызначэньне"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Вы мусіце назваць фільтар."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Вы мусіце назваць гэтую віртуальную тэчку."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Вы мусіце пазначыць назву файла."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Вы мусіце пазначыць тэчку."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Небыў выбраны паслужнік"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12404,66 +12814,11 @@ msgstr "Выбар файла"
 msgid "<b>Then</b>"
 msgstr "<b>Умоўлена:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Выбраць тэчку"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Важнае"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Трэба выканаць"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Пазьней"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Тэст"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Назва правіла: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Бяз назвы"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Умоўлена:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Выканаць дзеяньні"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "калі адпавядае ўсім крытэрам"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "калі задавальняе па любому з крытэраў"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "атрыманае"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "дасланае"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12557,6 +12912,77 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Умоўлена:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "калі адпавядае ўсім крытэрам"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "калі задавальняе па любому з крытэраў"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Выканаць дзеяньні"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Дэлегаваны"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Атрымоўцы"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Адказана на"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Уключае:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "атрыманае"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "дасланае"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12687,7 +13113,7 @@ msgstr "не пазначана"
 msgid "Junk Test"
 msgstr "Чэрвень"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Адмеціна"
@@ -12727,7 +13153,7 @@ msgstr "Выйсьці з праграмы"
 msgid "Play Sound"
 msgstr "Граць гук"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Чытаньне"
 
@@ -12797,9 +13223,9 @@ msgstr "пачынаецца з"
 msgid "Stop Processing"
 msgstr "Спыніць апрацоўку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Тэма"
@@ -12862,105 +13288,62 @@ msgstr "Тема ня ўтрымлівае"
 msgid "Virtual _Folders"
 msgstr "Віртуальныя тэчкі"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Дадаць"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Крыніца віртуальнае тэчкі"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Перавагі рэдактара паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
-"паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Пошта \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Кампанэнт пошты \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Праглядальнік паштовае тэчкі \"Эвалюцыі\"."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Пошта"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "Перавагі пошты"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Дапомна]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Назва уліковага запіса"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Пратакол"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Бяз назвы"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Мова(ы)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Дадаць подпіс"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Подпіс(ы)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Перадасланае паведамленьне"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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 "Стварыць _віртуальную тэчку вынікаў пошуку..."
 
@@ -12998,274 +13381,454 @@ msgstr "<клікніце тутака для выбару тэчкі>"
 msgid "Create New Folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Віртуальныя тэчкі"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Атрыманае"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Загрузка..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Немагчыма капіяваць ці перамясьціць паведамленьні у віртуальную тэчку"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Перамясьціць"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Адмяніць заданьне"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Выбраць тэчку"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Капіяваць"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Зьмяніць назву тэчкі \"%s\" на:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Зьмяніць назву тэчкі"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "Выгляд"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Адкрыць у новым акне"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Перамясьціць"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Новая тэчка..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Зьмяніць _назву"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "Віртуальныя тэчкі"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "Пошта"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Зьмяніць як новае паведамленьне..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Друк"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Адказаць у сьпіс"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Адказаць усім"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Перадаслаць"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Падняцца вышэй..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Выкананы сьцяг"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Ачысьціць сьцяг"
 
-#: mail/em-folder-view.c:787 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 "Пазначыць як чытанае"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Пазначыць як неважнае"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Пазначыць як нечытанае"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Пазначыць як важнае"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Вярнуць"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Перамясьціць у тэчку..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Капіяваць у тэчку..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "_Ужыць фільтары"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правілы філтра"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Стварыць правіла з паведамленьня"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Віртуальная тэчка па тэме"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Віртуальная тэчка па адпраўляльніку"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Віртуальная тэчка па атрымоўцы"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Віртуальная тэчка па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "Віртуальная тэчка па адпраўляльніку"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Фільтар па тэме"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Фільтар па адпраўляльніку"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Фільтар па атрымоўцы"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Фільтар па сьпісе рассылкі"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Фільтар па адпраўляльніку"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Дапомна"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Друк паведамленьня"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скапіяваць спасылку"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клікніце каб дадаць заданьне"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Копія"
+
+#: 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 "Сх.копія"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+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 ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Тэма не падтрымліваецца"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Немагчыма праверыць подпіс"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Немагчыма праверыць подпіс"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Клікніце каб дадаць заданьне"
+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 "Рэдагаваць подпіс"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Перарвана"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "Кадаваньне PGP"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Часка external-body памылкова сфармаваная"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указальнік на FTP сайт (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указальнік на лакальны файл (%s)"
+
+#: 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\")"
+
+#: 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 ""
+
+#. 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
@@ -13273,12 +13836,7 @@ msgstr "Клікніце каб дадаць заданьне"
 msgid "Matches: %d"
 msgstr "Супадзеньні:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Прызначана"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13287,12 +13845,7 @@ msgstr ""
 "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
 "тоеснасьць."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Рэдагаваць подпіс"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13301,258 +13854,112 @@ msgstr ""
 "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
 "тоеснасьць."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Рэдагаваць подпіс"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Перарвана"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "Кадаваньне PGP"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ід сэртыфіката:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Сэртыфікат яшчэ не зацьверджаны"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Пратэрмінавана:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "да %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Убудаваны прагляд"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Схаваць"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Аркуш %d з %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Атрыманьне паведамленьня %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Часка external-body памылкова сфармаваная"
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указальнік на FTP сайт (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указальнік на лякальны файл (%s), даступны на сайце \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указальнік на лакальны файл (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указальнік на аддаленыя даньні (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указальнік на невядомыя вонкавыя даньні (тыпа \"%s\")"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Перамяшчэньне паведамленьняў"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Ад каго"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Адказаць на"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Каму"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Копія"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Сх.копія"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Паштавік"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s укладаньне"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Неатрымалася разабраць паведамленьне MIME. Адлюстроўваецца як крыніца."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Тэма не падтрымліваецца"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Немагчыма праверыць подпіс"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Немагчыма праверыць подпіс"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Штогод"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "Адзін дзень"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Адзін тыдзень"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Адзін меся_ц"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13560,25 +13967,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Збой у кэшы %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Збой у кэшы %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Немагчыма скапіяваць дэскрыптар файла: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"Неатрымалася стварыць файл вываду: %s\n"
+" %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Збой аўтарызацыі на паслужніку POP %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Збой пад час стварэньня канала да \"%s\": %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Збой вызначэньня вузла \"%s\": %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Збой пад час стварэньня канала да \"%s\": %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Неатрымалася стварыць файл вываду: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13589,99 +14028,83 @@ msgstr "Захаваць як..."
 msgid "untitled_image.%s"
 msgstr "Паведамленьне бяз назвы"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Адказаць адпраўляльніку"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Адкрыць спасылку ў аглядальніке"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Даслаць паве_дамленьне ў сьпіс..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Дадаць адпраўляльніка ў кнігу адрэсаў"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Адкрыць у %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Паслужнік не падтрымлівае звесткі схемы LDAPv3"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Падпісацца"
 
-#: mail/em-subscribe-editor.c:637 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 "Тэчка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Калі ласка, выбярыце паслужнік."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Небыў выбраны паслужнік"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Неадлюстроўваць гэтае паведамленьне нанова."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Фільтары"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Перадасланае паведамленьне"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d у %H:%M, %%s піша:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Паведамленьне"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Захаваць паведамлеьне як..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Адрэса"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Ліст ад %s"
@@ -13701,11 +14124,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13818,131 +14241,140 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Уліковыя запісы пошты"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Уліковыя запісы пошты"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Выканаць дзеяньні"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Дапомны прыярытэт:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Нагаданьне аб пошце"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -13951,35 +14383,27 @@ msgstr ""
 "_Папярэджваць пад час адпраўленьня паведамленьняў у фармаце HTML тым, хто не "
 "жадае гэтага"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 ""
 "Папярэджваць пад час адпраўленьня паведамленьняў, у якіх вызначаны толькі "
 "атрымоўцы схаванае копіі."
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14035,8 +14459,9 @@ msgid "Spell check inline"
 msgstr "_Праверка правапіса"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Дапомны прыярытэт:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14179,33 +14604,66 @@ msgstr ""
 msgid "spamd port"
 msgstr "Імпарт"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Імпарт у \"Эвалюцыю\" з Elm"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Перавагі рэдактара паведамленьняў"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Імпарт у \"Эвалюцыю\" з \"Outlook Express 4\""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут наладжваюцца парвмэтры пошты, уключаючы бясьпеку й адлюстраваньне "
+"паведамленьняў"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Тут наладжваюцца праверка правапісу, подпісу й стварэньне паведамленьняў"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Імпарт у \"Эвалюцыю\" з mbox"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Наладка вашых уліковых запісаў пошты робіцца тут"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Пошта \"Эвалюцыі\""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Сродак кіраваньня уліковамі запісамі пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Кампанэнт пошты \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Рэдактар паведамленьняў \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Сродак кіраваньня рэдактарам паведамленьняў \"Эвалюцыі\""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Кіраваньне перавагамі пошты \"Эвалюцыі\""
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "Перавагі пошты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Пошта:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14213,15 +14671,15 @@ msgstr "\"Эвалюцыя\" імпартуе вашую старую пошту
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Калі ласка, пачакайце"
 
@@ -14253,19 +14711,47 @@ msgid "Select folder to import into"
 msgstr "Выбраць імпарт"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Імпартаваньне"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Імпартаваньне файлаў"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Імпарт у \"Эвалюцыю\" з Elm"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Імпарт у \"Эвалюцыю\" з пошты \"Netscape\""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Імпарт у \"Эвалюцыю\" з \"Outlook Express 4\""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Імпарт у \"Эвалюцыю\" з \"Сасны\""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Імпарт у \"Эвалюцыю\" з mbox"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканаваньне %s"
@@ -14275,7 +14761,7 @@ msgstr "Сканаваньне %s"
 msgid "Priority Filter \"%s\""
 msgstr "Прыярытэтны фільтар \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14290,7 +14776,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14298,7 +14784,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14307,24 +14793,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "\"Эвалюцыя\" імпартуе вашыя старыя даньні Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Усталёўкі"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Фільтары пошты"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14358,140 +14844,151 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Рэдактар уліковага запіса \"Эвалюцыі\""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Вузел:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Імя карыстальніка:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Шлях:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Даслаць на %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Тэма %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Ліст ад %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s сьпіс рассылкі"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Адказана на"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Дадаць правіла фільтра"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d выбраныя"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d недасланыя"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Чарнавікі"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d дасланыя"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d недасланыя"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d агулам"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d недасланыя"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d выбраныя"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Новае паштовае паведамленьне"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Паштовае паведамленьне"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Скласьці новае паведамленьне"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Фільтары пошты"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Стварыць новую тэчку"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, які будзе адлюстроўваць каляндар"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: 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:89
 msgid "Identity"
 msgstr "сапраўдны"
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14500,15 +14997,15 @@ msgstr ""
 "Калі вы няпэўныя, запытайцеся вашага сыстэмнага адміністратара ці правайдэра "
 "паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Выбярыце адзін з наступных варыянтаў"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Адпраўка пошты"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14516,11 +15013,11 @@ msgstr ""
 "Калі ласка, пазначце інфармацыю аб шляхах адпраўкі пошты. Калі вы няпэўныя, "
 "запытайцеся вашага сыстэмнага адміністратара ці правайдэра паслуг Інтарнэт."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Кіраваньне рахункамі"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14529,14 +15026,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Праверка паслугі"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Далучэньне да паслужніка..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14856,7 +15345,8 @@ msgid "Execute Command..."
 msgstr "Выканаць каманду..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Фіксаваная шырыня:"
 
 #: mail/mail-config.glade.h:82
@@ -15185,352 +15675,457 @@ msgstr "колер"
 msgid "description"
 msgstr "апісаньне"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Аўтарызацыя"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Паслужнік SMTP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
+
+#. 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-errors.xml.in.h:2
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Вы упэўнены што жадаеце выдаліць гэты рахунак?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Вы упэўненыя што жадаеце адкрыць усе %d паведамленьні ў асобных вокнах?"
+"Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
+"упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
+"пошту у фармаце HTML:\n"
 
-#: mail/mail-errors.xml.in.h:5
+#: 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 ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Зьнішчыць усе выдаленыя паведамленьні з усіх тэчак"
+msgid "_Send"
+msgstr "Даслаць"
 
-#: mail/mail-errors.xml.in.h:6
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Вы упэўненыя што жадаеце перадаслаць усе %d паведамленьні?"
 
-#: mail/mail-errors.xml.in.h:7
-#, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-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-errors.xml.in.h:8
+#. 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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Вы упэўненыя што жадаеце перадаслаць усе %d паведамленьні?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Немагчыма капіяваць тэчку: %s"
+msgid "Use default drafts folder?"
+msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Неатрымалася атрымаць тэчку: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
+"Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Неатрымалася стварыць часовы каталёг: %s"
+msgid "Use _Default"
+msgstr "Дапомна"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Немагчыма стварыць каталёг\n"
-" %s\n"
-"Памылка: %s"
+"Вы упэўненыя што жадаеце адкрыць усе %d паведамленьні ў асобных вокнах?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Немагчыма выдаліць тэчку:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
+msgid "_Expunge"
+msgstr "_Выкрэсьліць"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Тэчка \"%s\" не існуе."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Зьнішчыць усе выдаленыя паведамленьні з усіх тэчак"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Немагчыма перамясьціць тэчку: %s"
+msgid "_Empty Trash"
+msgstr "Спустошыць _сьметніцу"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Маюцца недасланыя паведамленьні! Вы жадаеце завяршыць працу?"
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
+msgid "Error while {0}."
+msgstr ""
+"Памылка пад час \"%s\":\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Немагчыма адкрыць паведамленьне"
+msgid "Error while performing operation."
+msgstr ""
+"Памылка пад час выкананьня апэрацыі:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
+msgid "Enter password."
+msgstr "Пазначце пароль"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Памылка пад час загрузкі інфармацыі фільтара:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Немагчыма стварыць каталёг %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Немагчыма захаваць у `%s'\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Дадаць подпіс"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Немагчыма стварыць каталёг\n"
+" %s\n"
+"Памылка: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Неатрымліваецца захаваць файл подпіса: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Выдаліць \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Выдаліць вылучаныя кантакты"
+msgid "Cannot create temporary save directory."
+msgstr "Неатрымалася стварыць часовы каталёг: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Жадаеце захаваць зьмены?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Не выдаляць"
+msgid "File exists but cannot overwrite it."
+msgstr "Файл існуе, перапісаць?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Пазначце пароль"
+msgid "File exists but is not a regular file."
+msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Памылка пад час загрузкі інфармацыі фільтара:\n"
+"Немагчыма выдаліць тэчку:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Памылка пад час выкананьня апэрацыі:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Неатрымалася выдаліць тэчку: %s: тэчка адсутнічае"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Памылка пад час \"%s\":\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Файл існуе, перапісаць?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Неатрымалася зьмяніць назву тэчкі: %s: тэчка адсутнічае"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Файл \"%s\" ня існуе альбо не зьяўляецца звычайным файлам."
+msgid "Delete \"{0}\"?"
+msgstr "Выдаліць \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Сапраўды выдаліць тэчку \"%s\"?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Аўтарызацыя"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Немагчыма перамясьціць тэчку: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Не атрымалася адкрыць падзеленую тэчку: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Вы дасылаеце паведамленьне фарматаванае ў HTML. Калі ласка,\n"
-"упэўніцеся што наступныя атрымоўцы жадаюць і могуць атрымліваць\n"
-"пошту у фармаце HTML:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Неатрымалася атрымаць тэчку: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Сапраўды выдаліць тэчку \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Не атрымалася адкрыць падзеленую тэчку: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Вы не пазначылі ўсё неабходную інфармацыю."
 
-#: mail/mail-errors.xml.in.h:55
+#. 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 ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"Наступныя віртуальныя тэчкі:\n"
-"%sВыкарыстана выдаленая тэчка:\n"
-"    \"%s\"\n"
-"І быдзе абноўлена."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Не выдаляць"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Наступныя віртуальныя тэчкі:\n"
-"%sВыкарыстана выдаленая тэчка:\n"
-"    \"%s\"\n"
-"І быдзе абноўлена."
+msgid "Could not save signature file."
+msgstr "Неатрымліваецца захаваць файл подпіса: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Дадаць подпіс"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Адкінуць зьмены"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "Паслужнік SMTP %s не падтрымлівае запатрабаваны тып ідэнтыфікацыі %s"
+msgid "Do you wish to save your changes?"
+msgstr "Жадаеце захаваць зьмены?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15538,85 +16133,97 @@ msgstr ""
 "\n"
 "Вы жадаеце захаваць зьмены?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Неатрымалася адкрыць тэчку чарнавікоў для гэтага рахунка.\n"
-"Жадаеце дапомна выкарыстоўваць тэчку чарнавікоў?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Дапомна"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Адкінуць зьмены"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Вы не пазначылі ўсё неабходную інфармацыю."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Маюцца недасланыя паведамленьні! Вы жадаеце завяршыць працу?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Вы ня можаце стварыць два рахункі з аднолькавымі назвамі."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Тэчка \"%s\" не існуе."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Адкінуць зьмены"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Спустошыць _сьметніцу"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Наступныя віртуальныя тэчкі:\n"
+"%sВыкарыстана выдаленая тэчка:\n"
+"    \"%s\"\n"
+"І быдзе абноўлена."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Выкрэсьліць"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Даслаць"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Наступныя віртуальныя тэчкі:\n"
+"%sВыкарыстана выдаленая тэчка:\n"
+"    \"%s\"\n"
+"І быдзе абноўлена."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Перапісаць"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Асьпэн"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Зандаваньне %s"
@@ -15625,135 +16232,135 @@ msgstr "Зандаваньне %s"
 msgid "Working"
 msgstr "Праца"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Фільтраваньне тэчкі"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Атрыманьне пошты"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Збой пад час захаваньня пошты ў часовым файле %s: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Адпраўленьне паведамленьня %d з %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Неатрымалася дэкадаваць паведамленьне."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Выканана."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Захаваньне паведамленьня ў тэчцы"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перамяшчэньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Капіяваньне паведамленьняў у %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканаваньне тэчак у \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Перадасланыя паведамленьні"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Адкрыцьцё сховішча %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Выдаленьне тэчкі %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Захаваньне тэчкі \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Абнаўленьне тэчкі"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Выкрэсьленьне тэчкі"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Спусташэньне сьметніцы ў \"%s\""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Лакальныя тэчкі"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Атрыманьне паведамленьня %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Атрыманьне %d паведамленьняў"
 msgstr[1] "Атрыманьне %d паведамленьняў"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Захаваньне %d паведамленьняў"
 msgstr[1] "Захаваньне %d паведамленьняў"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15762,7 +16369,7 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15771,11 +16378,11 @@ msgstr ""
 "Памылка захаваньня паведамленьняў у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Захаваньне ўкладаньня"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15784,17 +16391,17 @@ msgstr ""
 "Неатрымалася стварыць файл вываду: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Немагчыма запісаць даньні: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Адлучэньне ад %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Перадалучэньне да %s"
@@ -15859,24 +16466,24 @@ msgstr "Абнаўленьне..."
 msgid "Waiting..."
 msgstr "Чаканьне..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Апэрацыя адменена карыстальнікам."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Пазначце пароль для %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Пазначце пароль"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Запомніць гэты пароль"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомніць гэты пароль да завяршэньня сэанса"
 
@@ -15918,89 +16525,94 @@ msgstr "Перадасланае паведамленьне"
 msgid "Invalid folder: `%s'"
 msgstr "Адкрыцьцё тэчкі \"%s\""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Наладка віртуальнае тэчкі %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Абнаўленьне віртуальнае тэчкі на URI: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Віртуальныя тэчкі"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Рэдагаваньне віртуальных тэчак"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Новая віртуальная тэчка"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Нечытанае"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Прагледзенае"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Адказанае"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Шматлікія непрагледзеныя паведамленьні"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Шматлікія паведамленьні"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Ніжэйшы"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Ніжей"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Высокі"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Вышэйшы"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Сёньня %I:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Учора %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Стварэньне сьпісу паведамленьняў"
 
@@ -16032,43 +16644,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Пазначыць як \"Да выкананьня\""
 
@@ -16111,131 +16723,61 @@ msgstr "_Падпісацца"
 msgid "_Unsubscribe"
 msgstr "_Адмовіцца ад падпіскі"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Абалонка \"Эвалюцыі\""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "\"Эвалюцыя\""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
 msgstr "380"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
-msgid "Default shortcut group"
-msgstr "Зьмяніць назву групы лычак"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Схаваць панэлю лычак"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Дапомны прыярытэт:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Дапомны прыярытэт:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Інтэрфэйс наладкі пошты \"Эвалюцыі\""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Дапомна пазначаць укладаньне для адлюстраваньня ўбудаваным."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Зьмяніць назву гэтае тэчкі"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Схаваць панэлю лычак"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Э. пошта"
@@ -16244,6 +16786,32 @@ msgstr "Э. пошта"
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Невядомая памылка"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Недапушчальныя аргумэнты"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Неатрымалася зарэгістраваць на OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Адсутніча канфігурацыя базы даньняў"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Звычайная памылка"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Бяз назвы)"
@@ -16384,11 +16952,11 @@ msgstr "Збой выкананьня gpg."
 msgid "_Import"
 msgstr "Імпарт"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Закрыцьцё далучэньняў..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Наладкі \"Эвалюцыі\""
 
@@ -16425,11 +16993,35 @@ msgstr "Назва тэчкі ня мусіць ўтрымліваць сымб�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' і '..' зарэзэрваваныя назвы тэчак."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
+"працаваць у адлучаным рэжыме."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
+"працаваць у далучаным рэжыме."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Даслаць на %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Сродкі GNOME для сувязі з \"Пілётам\" не ўсталяваныя на гэтае сыстэме."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Памылка выкананьня: %s"
@@ -16443,14 +17035,15 @@ msgid "Bug buddy could not be run."
 msgstr "\"Bug buddy\" не запушчаны."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Пра \"Эвалюцыю\" Ximian"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Далучаны рэжым"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Адлучаны рэжым"
 
@@ -16458,48 +17051,6 @@ msgstr "_Адлучаны рэжым"
 msgid "Work Offline"
 msgstr "Працаваць у адлучаным рэжыме"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"\"Эвалюцыя\" працуе ў далучаным рэжыме.  Клікніце на гэтую кнопку каб "
-"працаваць у адлучаным рэжыме."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Эвалюцыя пераходзіць да працы ў адлучаным рэжымн."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"\"Эвалюцыя\" працуе ў адлучаным рэжыме.  Клікніце на гэтую кнопку каб "
-"працаваць у далучаным рэжыме."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Недапушчальныя аргумэнты"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Неатрымалася зарэгістраваць на OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Адсутніча канфігурацыя базы даньняў"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Звычайная памылка"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Пазначальнік"
@@ -16575,6 +17126,43 @@ msgstr ""
 "Націсьніце \"Так\" каб закрыць гэтыя далучэньні й працаваць у адлучаным "
 "рэжыме"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "Ка_ляндар:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Кантакты: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Пошта:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Заданьні:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Т_ып тэчкі:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Адкрыць іншую тэчку карыстальніка"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "Уліковы запіс:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Назва _тэчкі:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Імя карыстальніка:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Дапаможнік усталёўкі \"Эвалюцыі\""
@@ -16617,6 +17205,20 @@ msgstr ""
 "\n"
 "Клікніце кнопку \"Ужыць\" каб захаваць вашыя усталёўкі. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Абалонка \"Эвалюцыі\""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "\"Эвалюцыя\""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Кампанэнт тэставаньня \"Эвалюцыі\"."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Клікніце \"Імпарт\" для імпартаваньня файлаў у \"Эвалюцыю\"."
@@ -16681,13 +17283,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "\"Эвалюцыя\" можа імпартаваць даньні з наступных файлаў:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16701,57 +17303,48 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Дзякуй\n"
 "Каманда распрацоўшчыкаў \"Эвалюцыі Ximian\"\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Не пытацца ў наступны раз."
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Няма доступу да абалонкі \"Эвалюцыі\"."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Не атрымліваецца ініцыялізаваць абалонку \"Эвалюцыі\": %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Запуск у адлучаным рэжыме"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Запуск у далучаным рэжыме"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Прымусова выключыць усе кампанэнты \"Эвалюцыі\""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Даслаць вывад адладкі усіх кампанэнтаў у файле."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "\"Эвалюцыя\""
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16760,14 +17353,80 @@ msgstr ""
 "%s: --online і --offline не могуць выкарыстоўвацца разам.\n"
 "  Use %s --help для атрыманьня падрабязнасьцяў.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Далучэньне"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Няма доступу да абалонкі \"Эвалюцыі\"."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ід сэртыфіката:"
@@ -17018,12 +17677,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Ід сэртыфіката:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Ід карткі ужо існуе"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17242,6 +17895,12 @@ msgstr "Тэма %s"
 msgid "Certificate Signature Value"
 msgstr "Подпіс сэртыфіката памылковы"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Ід карткі ужо існуе"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17283,12 +17942,12 @@ msgstr "Дапомная тэма паведамленьня."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Немагчыма выканаць '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Выключэньне %s (%s)\n"
@@ -17352,7 +18011,8 @@ msgid "Select all contacts"
 msgstr "Вылучыць усе кантакты"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Даслаць паведамленьні асобам вылучаных кантактаў."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17384,8 +18044,8 @@ msgstr "Прагледзіць бягучы кантакт"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Дзеяньні"
@@ -17403,7 +18063,8 @@ msgid "_Preview Pane"
 msgstr "_Акно перадпрагляду"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Захаваць як візытоўку"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17534,11 +18195,21 @@ msgstr "Прагледзіць бягучы кантакт"
 msgid "Week"
 msgstr "Тыдзень"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Працоўны тыдзень"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 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 "_Закрыць"
+
 #: 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
@@ -17861,6 +18532,16 @@ msgstr "_Інвертаваць вылучэньне"
 msgid "_Threaded Message List"
 msgstr "Паведамленьні як абмеркаваньне тэмы"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "Закрыць"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18110,7 +18791,8 @@ msgid "Open the selected message in a new window"
 msgstr "Адкрыць вылучанае паведамленьне ў новым акне"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Адкрыць вылучанае паведамленьне ў рэдактары каб перадаслаць яго"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18228,58 +18910,46 @@ msgstr "Віртуальная тэчка па тэме..."
 msgid "_Attached"
 msgstr "Як укладзенае"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "Капіяваць у тэчку"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Стварыць фільтар з паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Перайсьці да"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Як убудаванае"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Большы"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Выгляд паведамленьня"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Перамясьціць у тэчку"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Наступнае паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Звычайны выгляд"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Адкрыць паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Папярэдняе паведамленьне"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Цытавана"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Перадаслаць..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Інструмэнты"
@@ -18288,16 +18958,6 @@ msgstr "Інструмэнты"
 msgid "_Undelete"
 msgstr "Вярнуць з выдаленага"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "Закрыць"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Укласьці"
@@ -18693,6 +19353,11 @@ msgstr "Перавагі пошты"
 msgid "_Send / Receive"
 msgstr "Даслаць / Атрымаць"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Шукаць зараз"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Па установах"
@@ -18766,10 +19431,6 @@ msgstr "_Умоўленая дата:"
 msgid "With _Status"
 msgstr "Усталяваць стан"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Заданьні"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18928,6 +19589,34 @@ msgstr "Іншае..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Памылка \"Эвалюцыі\""
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Пошта \"Эвалюцыі\""
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Зьвесткі аб нарадзе"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Агульныя зьвесткі \"Эвалюцыі\""
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Дасланыя паведамленьні і чарнавікі"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19047,6 +19736,35 @@ msgstr "Тэкст"
 msgid "Find _Now"
 msgstr "Шукаць зараз"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"Жадаеце перапісаць?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Немагчыма захаваць у `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Немагчыма захаваць у `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19057,9 +19775,132 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завершана)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Праглядальнік тэчак кнігі адрэсаў \"Эвалюцыі\""
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Кніга адрэсаў"
+#~ msgid "Address 2:"
+#~ msgstr "Адрэса _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Більбао"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Праглядальнік каляндара \"Эвалюцыі\""
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Праглядальнік заданьняў \"Эвалюцыі\""
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Немагчыма ініцыялізаваць gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Немагчыма адчыніць тэчку у '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, які будзе адлюстроўваць каляндар"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Тып прагляду"
+
+#~ msgid "Display a message"
+#~ msgstr "Адлюстраваць паведамленьне"
+
+#~ msgid "Alerts"
+#~ msgstr "Сыгналы"
+
+#~ msgid "Time"
+#~ msgstr "Час"
+
+#~ msgid "_General"
+#~ msgstr "_Асноўнае"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Выбраць імпарт"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Каляндар"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Зьпіс заданьняў"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Файл каляндара ня можа быць абноўлены!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI, які будзе паказаны у тэчцы заданьняў"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Немагчыма загрузіць заданьне ў \"%s\""
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Праглядальнік паштовае тэчкі \"Эвалюцыі\"."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "Віртуальная тэчка па адпраўляльніку"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Фільтар па адпраўляльніку"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Збой у кэшы %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Збой у кэшы %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Збой вызначэньня вузла \"%s\": %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, які будзе адлюстроўваць каляндар"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Зьмяніць назву групы лычак"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Схаваць панэлю лычак"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Адкрыцьцё тэчкі з дапомнымі задачамі"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Зьмяніць назву гэтае тэчкі"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Схаваць панэлю лычак"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Не атрымліваецца ініцыялізаваць абалонку \"Эвалюцыі\": %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Перадаслаць..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19241,9 +20082,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Супруг(а):"
 
-#~ msgid "_Add"
-#~ msgstr "_Дадаць"
-
 #~ msgid "_Business:"
 #~ msgstr "Працоўны:"
 
@@ -19360,18 +20198,6 @@ msgstr "%s (%d%% завершана)"
 #~ "спэцыялізаваную інфармацыю аб паслужніку. Калі ласка,\n"
 #~ "зьвяжыцеся з вашым адміністратарам каб атрымаць яе."
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Дата пачатку:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Умоўленая дата:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Прыярытэт:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19403,13 +20229,6 @@ msgstr "%s (%d%% завершана)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Немагчыма скапіяваць дэскрыптар файла: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19541,10 +20360,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Прагледзіць выгляд каляндара ў друку"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Пазначце пароль для %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Зьпіс заданьняў"
 
@@ -19600,30 +20415,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Немагчыма адшукаць пазначаную падзеленую тэчку."
 
-#~ msgid "C_alendar:"
-#~ msgstr "Ка_ляндар:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Пошта:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Заданьні:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Т_ып тэчкі:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Адкрыць іншую тэчку карыстальніка"
-
-#~ msgid "_Account:"
-#~ msgstr "Уліковы запіс:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Назва _тэчкі:"
-
-#~ msgid "_User:"
-#~ msgstr "_Імя карыстальніка:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Стварыць запыт новае нарады"
@@ -19937,9 +20728,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Памочнік"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Актыўныя у бягучы момант далучэньні:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Шукаць кантакты"
 
@@ -20170,9 +20958,6 @@ msgstr "%s (%d%% завершана)"
 #~ "Гэта паведамленьне з лічбавым подпісам, які ня можа быць правераны на "
 #~ "тоеснасьць."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Памылка \"Эвалюцыі\""
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20301,18 +21086,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Інфармацыя календара"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Нагадваньні"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Пачынаецца:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Інфармацыя календара"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Клясыфікацыя"
 
@@ -21319,9 +22092,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Тутака наладжваецца вонкавы выгляд вынікаў \"Эвалюцыі\""
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Агульныя зьвесткі \"Эвалюцыі\""
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Кампанэнт агульных зьвестак \"Эвалюцыі\""
 
@@ -21724,9 +22494,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Asia"
 #~ msgstr "Азыя"
 
-#~ msgid "Aspen"
-#~ msgstr "Асьпэн"
-
 #~ msgid "Asswan"
 #~ msgstr "Эсван"
 
@@ -23803,10 +24570,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgstr "Нармальны"
 
 #, fuzzy
-#~ msgid "Nome"
-#~ msgstr "Хатні"
-
-#, fuzzy
 #~ msgid "Norfolk"
 #~ msgstr "Норфалскія выспы"
 
@@ -25620,9 +26383,6 @@ msgstr "%s (%d%% завершана)"
 #~ msgid "Shown"
 #~ msgstr "Паказанае"
 
-#~ msgid "No tasks"
-#~ msgstr "Заданьні адсутнічаюць"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Няма апісаньня)"
 
diff --git a/po/bg.po b/po/bg.po
index 6cffcb901c..4e0e727bc7 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 1.1\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2002-08-16 02:00+0300\n"
 "Last-Translator: Borislav Aleksandrov <B.Aleksandrov@cnsys.bg>\n"
 "Language-Team: Bulgarian <dict@linux.zonebg.com>\n"
@@ -23,6 +23,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Редактирай адресната книга"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакти:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Прозорец на еволюшън"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -48,16 +58,6 @@ msgstr "Няма карти"
 msgid " card"
 msgstr "1 карта"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Контакти:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Прозорец на еволюшън"
-
 #: addressbook/conduit/address-conduit.c:272
 #, fuzzy
 msgid "Default Sync Address:"
@@ -74,73 +74,24 @@ msgstr "Не мога да заредя %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Дата на приключване"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "_Сертифициран ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Редактирай адресната книга"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-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:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Композер на поща за Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Компонент на Evolution за показване на пощенски папки"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+msgid "Failed to authenticate.\n"
 msgstr ""
+"Не мога да се оторизирам пред IMAP сървър.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Въведедете парола за %s (потребител %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -185,12 +136,16 @@ msgstr "Контакти:"
 msgid "Create a new contacts group"
 msgstr "Създава нова група препратка"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr "Не успях да се свържа с LDAP сървъра."
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -198,39 +153,39 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 #, fuzzy
 msgid "This server does not support LDAPv3 schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 #, fuzzy
 msgid "Error retrieving schema information"
 msgstr ""
 "Грешка при зареждане информацията за финтъра:\n"
 "%s"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 #, fuzzy
 msgid "Server did not respond with valid schema information"
 msgstr "IMAP сървъра не съдържа %s информация"
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Изчакване ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Сканира на \"%s\""
@@ -238,8 +193,8 @@ msgstr "Сканира на \"%s\""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -247,7 +202,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Personal"
@@ -298,24 +253,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"Не мога да се оторизирам пред IMAP сървър.\n"
-"%s\n"
-"\n"
+msgid "New Address Book"
+msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Въведедете парола за %s (потребител %s)"
+#: 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
+#: 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
+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
+#: 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 "Контакти"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -335,6 +308,68 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Дата на приключване"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Сертифициран ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Създава или редактира пощенски акаунти и други настройки"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Редактирай адресната книга"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Композер на поща за Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: 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
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -357,6 +392,7 @@ msgstr " _Проверка за подържани типове"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 ""
@@ -430,7 +466,7 @@ msgstr "Контакти:"
 msgid "Address Book Properties"
 msgstr "Източници на адреси"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always"
@@ -447,119 +483,109 @@ msgid "Basic"
 msgstr "Основни"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Затвори"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Connecting"
 msgstr "Концепсион"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Име на списък:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Име на списък:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Зарежда _Картинки"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, fuzzy
 msgid "Evolution will use this DN to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Еволюшън ще използва този адрес, за да ви идентифицира пред сървъра"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Неподържана схема"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Never"
 msgstr "_всеки"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Едно"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Избери цвят"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Обхват на търсенето: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Търси в база:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Търси в база:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Обхват на търсенето: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Търся"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -570,7 +596,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -579,20 +605,20 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Неподържана схема"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -600,7 +626,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -610,27 +636,27 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -640,7 +666,7 @@ msgstr ""
 "Това име ще се изпозва за идентифицирнаето на потребителското ви име. Ползва "
 "се само при показване."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -648,138 +674,145 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат на време:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid "Using email address"
 msgstr "Това е пощен_ски адрес"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: addressbook/gui/component/ldap-config.glade.h:74
 #: calendar/gui/dialogs/calendar-setup.glade.h:12
 #, fuzzy
 msgid "_Display name:"
 msgstr "_Дисплей"
 
-#: addressbook/gui/component/ldap-config.glade.h:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 #, fuzzy
 msgid "_Port number:"
 msgstr "Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Приоритет:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 #, fuzzy
 msgid "_Search base:"
 msgstr "Търси в база:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Име на сървъра:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Име на сървъра:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Време за забавяне (минути)"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Изплзва криптирана връзка (_SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "cards"
 msgstr "Няма карти"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Отново връзка с %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "general-tab"
 msgstr "Основен"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "минути"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "searching-tab"
 msgstr "Търся"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Премахни всички"
+msgid "Select Contacts from Address Book"
+msgstr "Избор на Контакт от Адресната книга"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Премахни всички"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -804,23 +837,16 @@ msgstr "Добави към контактите"
 msgid "Unnamed Contact"
 msgstr "Неименуван Контакт"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Източник"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Избор на Контакт от Адресната книга"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -893,60 +919,50 @@ msgid "<b>Work</b>"
 msgstr "Работна Седмица"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Адрес _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Адрес:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Годишнина:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Асистент"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Дата на ра_ждане:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Болоня"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Календар"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Град:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Компания"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -954,84 +970,94 @@ msgstr "Компания"
 msgid "Contact"
 msgstr "Контакти"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Редактор за Контакти"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Държава:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "От_дел"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "Сво_боден/Зает URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Пълно _Име..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Домашен"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 #, fuzzy
 msgid "Location:"
 msgstr "_Местонахождение: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Пощенско Съобщение"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Адрес на ел. поща"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Мениджър"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Прякор:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Бележки:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Друго"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "Пощенска Кутия:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1059,9 +1085,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
@@ -1097,24 +1123,41 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Сигурен ли сте, че искате\n"
+"да изтриете този контакт?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, fuzzy
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #, fuzzy
 msgid "Editable"
 msgstr "Разрешава"
@@ -2095,102 +2138,120 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Предишно Съобщение"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Неименуван Списък с Контакти"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-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-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Айдахо"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Група"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Източник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Нов Контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Виртуални Папки"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Чад"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Редактор на категории не е наличен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Този контакт принадлежи на следните категории:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Моля, изберете от следните опции"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Нигер"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 "Не мога да намеря графичен обект за поле: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+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:280
 msgid "Contact Quick-Add"
 msgstr "Бързо добавяне на контакт"
@@ -2213,23 +2274,6 @@ msgstr ""
 "\n"
 "E-поща:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Сигурен ли сте, че искате\n"
-"да изтриете този контакт?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Сигурен ли сте, че искате\n"
-"да изтриете този контакт?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрес _2:"
@@ -2384,8 +2428,8 @@ msgstr "Редактор за Контакти"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Бодо"
@@ -2448,6 +2492,455 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Допълнително търсене"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Членове"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-поща"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Организация"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Бостън"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Група"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Понце"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Корк"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Болоня"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Мобилен Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Вернал"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Бележка"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Работа:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Домашен Факс"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Успешно"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Файлът `%s' не съществува."
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Отказан достъп"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Картата не е намерена"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Карта ID вече съществува"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Протокола на се подържа"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Прекратено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не мога да преименувам папката: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Оторизацията пропадна"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Изисква Удостоверение"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Няма такова съобщение"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Друга грешка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, 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/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Не мога да отворя тази адресна книга. Или сте\n"
+"въвели невярно URI, или LDAP сървъра не работи.\n"
+" "
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+msgstr ""
+"В тази версия на Еволюшън не е компилирана поддръжка на\n"
+"LDAP. Ако искате да ползвате LDAP с Еволюшън, компилирайте\n"
+"програмата от CVS след като сте изтеглили и инсталирали \n"
+"OpenLDAP от хипервръзката отдолу.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, 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"
+"въвели невярно URI, или LDAP сървъра не работи.\n"
+" "
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Не мога да отворя адресната книга"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+#, fuzzy
+msgid "_Discard"
+msgstr "Динард"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Грешка при добавяне на списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Грешка при добавяне на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Грешка при модифициране на списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Грешка при модифициране на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Грешка при изтриване на списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Грешка при изтриване на карта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s вече съществува\n"
+"Искате ли да го презапишете?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+#, fuzzy
+msgid "Overwrite"
+msgstr "Презаписване на файл?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, fuzzy, c-format
+msgid "Error saving %s: %s"
+msgstr "Грешка при съхранението на файл: %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "списък"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Премести съобщени(ето/ята) в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Копира избраната задача"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Няма карти"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Няма карти"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Избор на Контакт от Адресната книга"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Множество VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard за %s"
+
+#.
+#. * 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"
@@ -2463,8 +2956,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
 msgid "Query"
 msgstr "Гърнси"
@@ -2524,9 +3017,10 @@ msgstr "Адресна книга"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Съхрани като VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2600,7 +3094,7 @@ msgid "Cut"
 msgstr "Отрежи"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2611,18 +3105,8 @@ msgstr "Копирай"
 msgid "Paste"
 msgstr "Поставя"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Изтрий"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 #, fuzzy
 msgid "Current View"
 msgstr "_Текущ Преглед"
@@ -2636,7 +3120,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Коя да е категория"
@@ -2677,21 +3161,6 @@ msgstr "Категории"
 msgid "Company Phone"
 msgstr "Телефон на Компания"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Ел. Поща 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Ел. Поща 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Фамилия"
@@ -2731,29 +3200,14 @@ msgstr "Йордания"
 msgid "Manager"
 msgstr "Мениджър"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Мобилен Телефон"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Прякор"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Бележка"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Организация"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Друг Факс"
@@ -2807,23 +3261,33 @@ msgstr "Неименувано"
 msgid "Web Site"
 msgstr "Web страница"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Широчина:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Височина:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Изтрий"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Сортиране на Задачи"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -2843,11 +3307,6 @@ msgstr "Раз_мер на Текст"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
-msgid "Column Width"
-msgstr "Колумбия"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 #, fuzzy
 msgid ""
@@ -2881,431 +3340,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Адрар"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Изтрий"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Сортиране на Задачи"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Членове"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-поща"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Бостън"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Група"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Понце"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Корк"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Болоня"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Вернал"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Работа:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Домашен Факс"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Успешно"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Файлът `%s' не съществува."
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Отказан достъп"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Картата не е намерена"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Карта ID вече съществува"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Протокола на се подържа"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Прекратено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не мога да преименувам папката: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "Оторизацията пропадна"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Изисква Удостоверение"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Няма такова съобщение"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Друга грешка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, 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/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 LDAP server is unreachable."
-msgstr ""
-"Не мога да отворя тази адресна книга. Или сте\n"
-"въвели невярно URI, или LDAP сървъра не работи.\n"
-" "
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-msgstr ""
-"В тази версия на Еволюшън не е компилирана поддръжка на\n"
-"LDAP. Ако искате да ползвате LDAP с Еволюшън, компилирайте\n"
-"програмата от CVS след като сте изтеглили и инсталирали \n"
-"OpenLDAP от хипервръзката отдолу.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, 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"
-"въвели невярно URI, или LDAP сървъра не работи.\n"
-" "
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Не мога да отворя адресната книга"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Искате ли да съхраните промените?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, fuzzy
-msgid "_Discard"
-msgstr "Динард"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Грешка при добавяне на списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Грешка при добавяне на карта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Грешка при модифициране на списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Грешка при модифициране на карта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Грешка при изтриване на списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Грешка при изтриване на карта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s вече съществува\n"
-"Искате ли да го презапишете?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-#, fuzzy
-msgid "Overwrite"
-msgstr "Презаписване на файл?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, fuzzy, c-format
-msgid "Error saving %s: %s"
-msgstr "Грешка при съхранението на файл: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "списък"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Премести съобщени(ето/ята) в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Копира избраната задача"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Няма карти"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Няма карти"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Избор на Контакт от Адресната книга"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Множество VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard за %s"
-
-#.
-#. * 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: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
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 #, fuzzy
-msgid "Show Compact VCard"
-msgstr "Съхрани Контакт като VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Запиши в адресната книга"
+msgid "Column Width"
+msgstr "Колумбия"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3354,11 +3392,6 @@ msgstr "Композер на поща за Evolution."
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3370,6 +3403,11 @@ msgstr "Отпечатай избраните контактите"
 msgid "Print contact"
 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"
 msgstr ""
@@ -3556,18 +3594,6 @@ msgstr "Списък _Контакти"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Не мога да отворя съобщение"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Картата не е намерена"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3625,6 +3651,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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Не мога да отворя съобщение"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Картата не е намерена"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Грешка при зареждането на адресна книга"
@@ -3637,12 +3675,13 @@ msgstr "Файл за изход"
 msgid "No filename provided."
 msgstr "Няма име на файл"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Неименуван Списък с Контакти"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Въведедете парола"
@@ -3676,128 +3715,55 @@ msgstr "_Приоритет:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не мога да прочета списъкът със задачи от pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Настройки на Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Настройки на Календар и Задачи"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Календар на Evolution iTip/iMip преглед"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Календар на Evolution iTip/iMip преглед"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution - Редактор на Новини"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution - Редактор на Новини"
-
-#: 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:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Задачи"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Аларма на Evolution."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "_Затвори"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Заба_вяне"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Време за забавяне (минути)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Редактирай среща"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Няма описание."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3806,12 +3772,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3822,7 +3788,7 @@ msgstr ""
 "по ел. поща все още, но това напомняне е конфигурирано\n"
 "да изпраща поща."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3833,20 +3799,21 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Алармено известяващо обслужване"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Не мога да инициализирам Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Не мога да инициализирам gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3960,61 +3927,46 @@ 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:27
+#: 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:28
+#: 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:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показвай номерата на седмиците в навигацията за _ден"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Съдържания на Обобщен"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Съдържания на описание"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Съдържание на Коментар"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Съдържания на описание"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Несъвпадащ"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4027,130 +3979,141 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "е по малко от"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "дни"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Свойства..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Клендарът се зарежда..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: 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:1234
 #, fuzzy
 msgid "New appointment"
 msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 #, fuzzy
 msgid "_Appointment"
 msgstr "Среща"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "New meeting"
 msgstr "Настройки за Източник на Новини"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Среща"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Създава нова задача"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова Среща"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Нова _Среща"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Създава нова поща"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледония"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Създай нова папка"
@@ -4181,16 +4144,37 @@ msgstr "Изглед за Седмица"
 msgid "Month View"
 msgstr "Изгел за Месец"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Съдържания на Обобщен"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Съдържание на Коментар"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Съдържания на описание"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Несъвпадащ"
+
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Грешка при комуникацията с календарния сървър"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Отказан достъп"
@@ -4200,19 +4184,6 @@ msgstr "Отказан достъп"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Не мога да отворя папка в `%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, което ще се показва в календара"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Опции на Звукова Аларма"
@@ -4283,7 +4254,7 @@ msgstr "допълнително време всеки"
 msgid "hours"
 msgstr "часове"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4302,14 +4273,14 @@ msgstr "Базов"
 msgid "Date/Time:"
 msgstr "Дата/Време:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Показва съобщение"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Издава зук"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4325,6 +4296,7 @@ msgstr "Изпрати 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
 msgid "Summary:"
 msgstr "Обобщено:"
@@ -4363,10 +4335,110 @@ msgstr "минут(а/и)"
 msgid "start of appointment"
 msgstr "начало на среща"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Име на стил:"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Метода заявен за зареждане на `%s' не се подържа"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "iКалендар Грешка"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Нова Каледония"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Освежава Списък"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+#, fuzzy
+msgid "_Source URL:"
+msgstr "POP Източник URI"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Разрешен"
 
@@ -4382,19 +4454,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Разрешава"
 
@@ -4420,167 +4492,179 @@ msgstr "60 минути"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "Alerts"
-msgstr "Алберта"
+msgid "<b>Alerts</b>"
+msgstr "_Статус:"
 
 #: 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 "Календарна информация"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "Приключено "
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Дисплей"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Раз_решен"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "Петък"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Часове"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Понеделник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "S_un"
 msgstr "Н_ед"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Събота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Неделя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "_Задачи, чиито срок изтича днес:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Чет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "_Списък със задачи"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Четвъртък"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Време"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "_Времева Зона: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Формат на време:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Сряда"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Работна Седмица"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: 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:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 часа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "Д_обави"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Сбий почивните дни в месечен пре_глед"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Day begins:"
 msgstr "Начало на задача: <b>"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Дисплей"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4590,151 +4674,51 @@ msgstr "_Дисплей"
 msgid "_Edit"
 msgstr "_Редактирай"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Заявка Свободен/Зает"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Пет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Основен"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Скрий завършени_те задачи след"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "По_н"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "П_ресрочени задачи:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Съб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Показвай времето на с_вършване на срещите в седмицата и месеца"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Времеде_ление:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #, fuzzy
 msgid "_Tue"
 msgstr "_Вт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Ср"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "before every appointment"
 msgstr "след началото на срещата"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Име на стил:"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Метода заявен за зареждане на `%s' не се подържа"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iКалендар Грешка"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Нова Каледония"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Освежава Списък"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-#, fuzzy
-msgid "_Source URL:"
-msgstr "POP Източник URI"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "седмици"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4810,81 +4794,81 @@ msgstr "%s  Вие имате промени. Да ги забравя ли и �
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Вие нямате направени промени, да обновя редактора?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Неизвестна грешка: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " в"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Приключено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Дължим"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Дължим"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 #, fuzzy
 msgid "Could not update object"
 msgstr "Не мога да обновя обекта!"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Редактиране на Среща"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Няма резюме"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Съхрани като..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Не мога да получа текущата версия!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Неизвестна грешка: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " в"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Приключено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Приключено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Дължим"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Дължим"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -5012,27 +4996,27 @@ msgstr "Делегира На:"
 msgid "Enter Delegate"
 msgstr "Въведете Делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Среща"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Напомня"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Среща"
 
@@ -5044,7 +5028,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Начална Дата"
@@ -5137,10 +5121,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5159,15 +5143,15 @@ msgstr "Необходим е организатор."
 msgid "At least one attendee is required."
 msgstr "Необходим е поне един участник."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Делегира На.."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5462,26 +5446,19 @@ msgstr ""
 msgid "Save Event"
 msgstr "Съобщение на Календар"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Избери Папка"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Избор на отдалечена папка за импортиране на тези данни"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Календар"
+msgid "_Destination"
+msgstr "Изтрий тази папка"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "_Списък със задачи"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5513,38 +5490,44 @@ msgid "% _Complete"
 msgstr "% Приключено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Високо"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Ниско"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Нормално"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Не е Стартиран"
 
@@ -5582,11 +5565,11 @@ msgstr "_Web адрес:"
 msgid "Assignment"
 msgstr "Задача"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не мога да отворя адресната книга"
@@ -5595,8 +5578,9 @@ msgstr "Не мога да отворя адресната книга"
 msgid "Con_fidential"
 msgstr "_Конфиденциален"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Описание:"
@@ -5751,101 +5735,57 @@ msgstr "%s в %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s е неизвестен тип за превключване"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Публичен"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Частен"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Конфиденциален"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Крайна Дата"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Начална Дата"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Резюме"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Свободно"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Заето"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
+#: 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-model-tasks.c:302
-msgid "S"
-msgstr "Ю"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Неименувано"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-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-model-tasks.c:304
-msgid "W"
-msgstr "З"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Крайна Дата"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географското местонахождение трябва да бъде въведено в следния формат: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+#, fuzzy
+msgid "Status:"
+msgstr "_Статус:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Приоритет:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Не"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Web адрес:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5891,17 +5831,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Обновява обектите"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Отвори"
 
@@ -5911,41 +5860,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Постави"
 
@@ -6006,82 +5956,161 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Начална Дата"
 
+#: 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:11
 msgid "Task sort"
 msgstr "Сортиране на Задачи"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Нова _Среща..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Всички Нови _Събития за Деня"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 #, fuzzy
 msgid "New Meeting"
 msgstr "Среща"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Нова Задача"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Избери _Нишка"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Изтрии..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Потребителска Информация"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Копирай в Папка..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Премести в Папка..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "План на _Среща"
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Препраща като _iКалендар"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Изтрии това С_ъбитие"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Изтрии Всички _Събития"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Отиди на _Днес"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Отиди _на Дата..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "Пощенски Настройки..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Крайна Дата"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -6105,36 +6134,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i минутно разделяне"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i минутно разделяне"
 
 #: calendar/gui/e-itip-control.c:592
 #, fuzzy
@@ -6247,11 +6276,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Без</i>"
 
-#: calendar/gui/e-itip-control.c:950
-#, fuzzy
-msgid "Status:"
-msgstr "_Статус:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6282,7 +6306,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6495,61 +6519,57 @@ msgstr "Прикаченото не съдържа валидно календа
 msgid "The attachment has no viewable calendar items"
 msgstr "Прикаченото няма видими обекти на календар"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Календарният файл не може да бъде зареден!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Обновяването приключено\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 #, fuzzy
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Не мога да отворя папка в `%s'"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Преместването Приключено"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Обекта изпратен!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Обекта не може да бъде изпратен!\n"
 
@@ -6667,28 +6687,6 @@ msgstr "Делегиран"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Извън Офиса"
@@ -6749,84 +6747,171 @@ msgstr "Начяло на срещата:"
 msgid "Meeting _end time:"
 msgstr "Край на срещата:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Въведедете парола за %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Грешка при стартиране на %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отваряне на задачи в %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Грешка при стартиране на %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Зарежда _Картинки"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Дата на приключване"
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Изтрий избраните обекти"
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 #, fuzzy
 msgid "Expunging"
 msgstr "Изтриване на папка"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Няма срещи"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Зарежда _Картинки"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Отвори в %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Торино"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+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
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Настройки на Календар и Задачи"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Календар на Evolution iTip/iMip преглед"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution - Редактор на Новини"
+
+#: 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
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Задачи"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Април"
@@ -6966,6 +7051,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Отказан достъп"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Не мога да отворя адресната книга"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1ви"
@@ -7185,7 +7287,7 @@ msgid "Contacts: "
 msgstr "Контакти:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Печатен Преглед"
 
@@ -7197,69 +7299,79 @@ msgstr "Печат на Обект"
 msgid "Print Setup"
 msgstr "Печатни Настройки..."
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "_Списък със задачи"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] " %d избрано"
+msgstr[1] " %d избрано"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Зарежда _Картинки"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 #, fuzzy
 msgid "New task"
 msgstr "Нова Задача"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Задачи"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Нова Задача"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "_Списък със задачи"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Създава нова задача"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI на папки със  задачи за показване"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Не мога да заредя задачи в `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -7273,11 +7385,11 @@ msgstr ""
 "\n"
 "Действително ли да изтрия съобщенията?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Не показвай това съобщение отново."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Отпечатай карти"
@@ -8941,7 +9053,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Запазване на папка %s"
@@ -9037,33 +9149,6 @@ msgstr "Грешни аргументи"
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка при търсене на филтър: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"немога да анализирам търсеният израз: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Грешка при изпълнение търсене на израз: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(съвпадение на всичи) изисква единичен булев резулат"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9097,7 +9182,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Получавам %d съобщение"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"немога да анализирам търсеният израз: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Грешка при изпълнение търсене на израз: %s:\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(съвпадение на всичи) изисква единичен булев резулат"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(съвпадение на всичи) изисква единичен булев резулат"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9105,43 +9235,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Прекратено."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочакван отговор от POP сървър: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Не мога да криптирам това съобщение: няма зададен получател"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9149,86 +9279,66 @@ msgid ""
 "%s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: camel/camel-gpg-context.c:1246 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"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Не мога да проверя съобщението: не мога да създам временен файл: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Това е част от криптирано съобщение"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Съдържанието на съобщенията"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Не мога да получа съобщение от редактора"
 
-#: 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-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9251,6 +9361,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"
@@ -9495,7 +9625,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Грешна оторизация отговори сървъра."
 
@@ -9699,7 +9829,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Сертифициран ID:"
 
 #: camel/camel-smime-context.c:360
@@ -9716,7 +9846,7 @@ msgstr "Не мога да създам декодиращ контекст за
 msgid "Failed to add data to CMS encoder"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr ""
@@ -9792,98 +9922,98 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Файл с Подпис:"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Добави критерии"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сървър:%s, Тип: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP команда пропадна: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Неуспех при намиране на сертификат за \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Създай правило от съобщението"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Не мога да създам декодиращ контекст за S/MIME"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Изпращането на потребителското име до сървъра неуспешно"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Командата не се използва"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9900,16 +10030,26 @@ msgstr "Не мога да получа папка: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не мога да създам папката: Грешна операция за това хранилище"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не мога да изтрия папка %s: Грешна операция"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Не мога да преименувам папката %s Грешна операция"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Кошче"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -10042,7 +10182,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10051,11 +10191,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -10077,7 +10217,7 @@ msgstr ""
 "Искате ли да приемете въпреки това?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10092,28 +10232,28 @@ msgstr ""
 "\n"
 "Искате ли да приемете въпреки това?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "_Сертифициран ID:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10125,17 +10265,17 @@ msgstr "_Сертифициран ID:"
 msgid "Could not parse URL `%s'"
 msgstr "Не мога да анализирам URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Грешка при стартиране на %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Няма такова съобщение: %s в %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Проврка за нови съобщения във всички папки"
@@ -10145,11 +10285,6 @@ msgstr "Проврка за нови съобщения във всички па
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Не мога да преименувам папката %s Грешна операция"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10166,10 +10301,12 @@ 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 "Проврка за нови съобщения във всички папки"
@@ -10203,6 +10340,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10222,26 +10360,327 @@ msgstr "Тази опция ще ви свърже с IMAP сървър изпо
 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: %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 "Не мога да получа папка: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не мога да получа папка: %s: %s"
+
+#: 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: %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:429
+#, fuzzy, c-format
+msgid "IMAP server %s"
+msgstr "SMTP сървър %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s услуга за %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:140
+#: 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:815
+#: 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/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Връзкрата прекратена"
+
+#: 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"
+msgstr ""
+"Не мога да се свържа с POP сърър.\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
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Не мога да се свържа с POP сърър.\n"
+"Грешно изпратено име на потребител %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Неизвестна грешка"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Не мога да се свържа с POP сървър.\n"
+"Нямаподръжка за заявената оторизация"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sМоля въведете SMTP паролата за %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Не мога да се оторизирам пред KPOP сървър: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, 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: %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr ""
+"\n"
+"Коментар:"
+
+#: 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: %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: %s"
+
+#: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Действието прекратено"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сървъра неочаквано се откачи: %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:1089
-msgid "Unknown error"
-msgstr "Неизвестна грешка"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10284,21 +10723,21 @@ msgstr "Не мога да създам директория %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Не мога да заредя обобщение за %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Сканирам за променени съобщения"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10314,25 +10753,25 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Няма такова съобщение"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Съобщението не е налично"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Не мога да намеря тялото на съобщението в FETCH отговора."
 
@@ -10376,23 +10815,6 @@ msgstr ""
 "\n"
 "Коментар:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Папки"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показва само папките с абонат"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Място за име"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Използва филтри за нови съобщения в INBOX от този сървър"
@@ -10415,89 +10837,45 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За четене и запазване на поща от IMAP сървъри"
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "SMTP сървър %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s услуга за %s на %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Връзкрата прекратена"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Не мога да се свържа с POP сърър.\n"
-"Грешно изпратено име на потребител %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 #, fuzzy
 msgid "SSL/TLS extension not supported."
 msgstr "Операцията не се подържа"
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 #, fuzzy
 msgid "SSL negotiations failed"
 msgstr "Оторизацията пропадна"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не мога да се свържа към сървър %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сървър %s не подържа заявената оторизация тип %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Вие не сте въвели парола."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10508,25 +10886,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Няма такава папка %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "В името на папката не може да се съдържа символа 'Return'"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "На бащината папка не е разрешено да има подпапки"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10534,7 +10905,7 @@ msgstr "На бащината папка не е разрешено да има
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не мога да получа папка: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестна грешка: %s"
@@ -10638,58 +11009,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "За четене и съхранение на локална поща в стандартен mbox spool файлове"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: 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:186
+#: 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:295
+#: 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:360
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Не мога да преименувам папката: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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:395
+#: 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-store.c:418
+#: 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"
@@ -10755,7 +11126,7 @@ msgstr "Не мога да изтрия папката `%s': %s"
 msgid "not a maildir directory"
 msgstr "не е maildir директория"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11095,7 +11466,7 @@ msgid "Server rejected username/password"
 msgstr "Сървърът отхвърли потребителското име/паролата"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -11105,8 +11476,8 @@ msgid "User cancelled"
 msgstr "Действието прекратено"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11117,49 +11488,49 @@ msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, fuzzy, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Не мога да взема списък на група от сървъра"
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Грешка при автоматичното запазване на файл: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, fuzzy
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Вие не може да копирате съобщения от тази папка боклук"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Вие не може да копирате съобщения от тази папка боклук"
@@ -11277,7 +11648,7 @@ msgstr "Не мога да създам програмен канал: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Не мога да получа съобщение: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11331,8 +11702,8 @@ msgstr "Няма съобщение с uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Получавам POP съобщение %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Неизвестна грешка"
@@ -11796,7 +12167,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "прикачен"
 
@@ -11841,6 +12212,92 @@ msgstr "MIME тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предлага автоматично показване на прикачен"
 
+#: 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 "Не мога да отворя съобщение"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не мога да получа съобщение от редактора"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+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.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
 #, fuzzy
 msgid "Posting destination"
@@ -11926,202 +12383,135 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Attach file(s)"
 msgstr "Прикрепи файл"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "В_инаги подписва изходящите съобщения когато използва този акаунт"
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Не мога да криптирам това съобщение: няма прост текст за криптиране"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Не мога да отворя съобщение"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Не мога да получа съобщение от редактора"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Неименувано Съобщение)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Отвори файл"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2087
-#, fuzzy
-msgid "Signature:"
-msgstr "Запазва сигнатура"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Напиши Съобщение"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Прикрепи файл към съобщението"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Сигурен ли сте, че искате да изтриете тази неименувана среща?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Следващо Непрочетено Съобщение"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Искате ли да съхраните промените?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Не мога да създам програмен канал: %s"
+msgid "Don't Recover"
+msgstr "Не Изтривай"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Не мога да запазя сигнатурен файл."
+msgid "Recover"
+msgstr "Премахни"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Не мога да запазя сигнатурен файл."
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Динард"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Искате ли да съхраните промените?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Грешка при запазване на препратки."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Не Изтривай"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Предупреждение: Модифицирано Съобщение"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Грешка при запазване на препратки."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Сигурен ли сте, че искате да изтриете тази неименувана среща?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Премахни"
+msgid "Discard Changes"
+msgstr "Динард"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Съхрани Съобщението Като..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Не мога да създам програмен канал: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Следващо Непрочетено Съобщение"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Не мога да запазя сигнатурен файл."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Предупреждение: Модифицирано Съобщение"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Прикрепи файл към съобщението"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12253,7 +12643,8 @@ msgstr ""
 "Файл със същото име вече съществува.\n"
 "Да го презапиша ли?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Презаписване на файл?"
 
@@ -12432,84 +12823,100 @@ msgstr "Изберете време за да го сравните отново
 msgid "_Filter Rules"
 msgstr "Правила на Филтриране"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Грешка в регулярен израз '%s':\n"
-"%s"
+msgid "Missing date."
+msgstr "Обновяване на срещата:"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Забравихте да изберете дата."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Spool `%s' не съществува или не е обикновен файл"
+msgid "Missing file name."
+msgstr "_Име на списък:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Обновяване на срещата:"
+msgid "You must specify a file name."
+msgstr "Име на стил:"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "_Име на списък:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Spool `%s' не съществува или не е обикновен файл"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Изтривам папка %s"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Задача"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "Име на стил:"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Не е избран сървър"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Грешка в регулярен израз '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Забравихте да изберете дата."
+msgid "Missing name."
+msgstr "Задача"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Трябва да има име този филтър."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Тази vпапка трябва да има име."
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Име на стил:"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "Име на стил:"
+msgid "No sources selected."
+msgstr "Не е избран сървър"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12523,69 +12930,11 @@ msgstr "Избери действие:"
 msgid "<b>Then</b>"
 msgstr "Приключено "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Избери Папка"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Важно"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "To Do"
-msgstr "Того"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Later"
-msgstr "след"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Тест"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Име на правило:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Неименувано"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "Приключено "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Изпълнява действия"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "ако всички критерии са изпълнени"
-
-#: filter/filter-rule.c:813
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "ако някои от критериите е изпълнен"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "входящ"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "изходящ"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12680,6 +13029,80 @@ 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
+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
+#, fuzzy
+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
+#, fuzzy
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "Приключено "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ако всички критерии са изпълнени"
+
+#: filter/filter-rule.c:854
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "ако някои от критериите е изпълнен"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Изпълнява действия"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Делегиран"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Получатели"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Отговаря на"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Включва:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "входящ"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "изходящ"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12816,7 +13239,7 @@ msgstr "Маркирано"
 msgid "Junk Test"
 msgstr "Юни"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12858,7 +13281,7 @@ msgstr "Изиза от програмата"
 msgid "Play Sound"
 msgstr "Издава звук:"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Чети"
 
@@ -12931,9 +13354,9 @@ msgstr "започва с"
 msgid "Stop Processing"
 msgstr "Прекрати Обработката"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Тема"
@@ -12998,118 +13421,69 @@ msgstr "Темата несъдържа"
 msgid "Virtual _Folders"
 msgstr "Виртуални Папки"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "Доб_ави"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "Източници на vПапки"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Създава или редактира пощенски акаунти и други настройки"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Композер на поща за Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Композер на поща за Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Фабрика за контрол на задачи в Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Компонент на Evolution за показване на пощенски папки"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент на Evolution за показване на пощенски папки"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Поща"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Акаунти"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr ""
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 #, fuzzy
 msgid "[Default]"
 msgstr "По подразбиране"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 #, fuzzy
 msgid "Account name"
 msgstr "Потребителско име:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 #, fuzzy
 msgid "Protocol"
 msgstr "Пуерто Рико"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 #, fuzzy
 msgid "Unnamed"
 msgstr "Неименуван Контакт"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 #, fuzzy
 msgid "Language(s)"
 msgstr "Език"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Изтрива всички сигнатури"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Файл с Подпис:"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Препратени съобщения"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Създава Виртуална _Папка От Съобщение"
@@ -13149,286 +13523,469 @@ msgstr "<натиснете тук за да изберете папка>"
 msgid "Create New Folder"
 msgstr "Създай нова папка..."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Име на папка:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Зареждам"
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Проврка за нови съобщения във всички папки"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Премести"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Прекъсни Задача"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Избери папка"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Копирай"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Създай нова папка"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименувай папката \"%s\" на:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Преименувай папка"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Изглед"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Отвори в Нов Прозорец"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Премести"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова папка"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Преименува"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+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 ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Inbox"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+msgid "Mail"
+msgstr "Поща"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Редактирай като ново съобщение..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Печат"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Отговори на списъка"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Отговори на всички"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Препрати"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Приключено"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Изчисти"
 
-#: mail/em-folder-view.c:787 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 "Отбележи: прочетено"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Маркирай като Не_важни"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Отбележи: непрочетено"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Маркира като В_ажно"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Възстанови изтрито"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Премести в Папка..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Копирай в Папка..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Добави подателя в адресната книга"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Приложи Филтри"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правила на Филтриране"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Създай правило от съобщението"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder върху _Тема"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "_vПапка на Изпращач"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "v_Папка на Получатели"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Филтър върху _Mailing List"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "_vПапка на Изпращач"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Филтър върху Т_ема"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Филтър върху Из_пращач"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Филтър върху По_лучатели"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Филтър върху Mailing _List"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Филтър върху Из_пращач"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "По подразбиране"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Отпечатай Съобщението"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Копира местоположениет на указател"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Кликнете за да добавите задача"
 
-#: mail/em-folder-view.c:2214
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+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 ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Неподържана схема"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неуспех при проверка на сертификати"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Неуспех при проверка на сертификати"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Кликнете за да добавите задача"
+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 "Добави критерии"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Прекъснат"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP криптиране"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указател към FTP сайт (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указател към локален файл (%s)"
+
+#: 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
+#, fuzzy
+msgid "Mailer"
+msgstr ""
+"\n"
+"Пощенска програма: "
+
+#. 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 ""
+
+#. 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
@@ -13436,12 +13993,7 @@ msgstr "Кликнете за да добавите задача"
 msgid "Matches: %d"
 msgstr "Съвпадения:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Назначен"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13450,12 +14002,7 @@ msgstr ""
 "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 "повече информация."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Добави критерии"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13464,262 +14011,113 @@ msgstr ""
 "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 "повече информация."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Добави критерии"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Прекъснат"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "PGP криптиране"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Сертифициран ID:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Съобщението не е налично"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 #, fuzzy
 msgid "Overdue:"
 msgstr "П_ресрочени задачи:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Работа в 'O_nline' "
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Скрий"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, fuzzy, c-format
 msgid "Page %d of %d"
 msgstr "Получаване на съобщение номер %d от %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Получавам съобщение %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указател към FTP сайт (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указател към локален файл (%s) валиден на сайта \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указател към локален файл (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указател към отдалечени данни (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указател към неизвестни външни данни (\"%s\" type)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Премести съобщения"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "От"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Отговор-До"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-#, fuzzy
-msgid "Mailer"
-msgstr ""
-"\n"
-"Пощенска програма: "
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s прикачен"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не мога да анализирам MIME съобщение. Показвам го в изходен код."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Неподържана схема"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Неуспех при проверка на сертификати"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Неуспех при проверка на сертификати"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Всеки"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Един Ден"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "_Една седмица"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Един месец"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13727,26 +14125,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Неуспех при кеширане на съобщение %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Не мога да получа папка: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Неуспех при кеширане на съобщение %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Не мога да намеря във файл %s:\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Не мога да запазя файл със списък на група за %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Не мога да отворя или създам .newsrc файл за %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неуспех при кеширане на съобщение %s: %s"
 
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Не мога да създам изходен файл: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Съхрани Като..."
@@ -13756,99 +14184,83 @@ msgstr "Съхрани Като..."
 msgid "untitled_image.%s"
 msgstr "Неименувано Съобщение"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Отговори на подателя"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "_Отвори Указател в Браузер"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Изпраща с_ъобщението към списък..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Добави адресна книга"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори в %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "IMAP сървъра не съдържа %s информация"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Абонира"
 
-#: mail/em-subscribe-editor.c:637 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 "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Моля, изберете сървър."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Не е избран сървър"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Не показвай това съобщение отново."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Филтри"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Препратени съобщения"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "На %a, %Y-%m-%d в %H:%M, %%s записа:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Съобщение"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Съхрани Съобщението Като..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "_Адрес:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail от %s"
@@ -13868,11 +14280,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13986,167 +14398,168 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Акаунти"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Акаунти"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Де_йствия за филтриране на журнал за:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "_Приоритет:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Mail Конфигурация"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Mail Конфигурация"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "Пита при изпращане на HTML съобщения до контакти които не я искат"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Пита когато се изпраща поща само с получатели в полето _Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14200,8 +14613,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "_Приоритет:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14343,53 +14757,86 @@ msgstr ""
 msgid "spamd port"
 msgstr "Вмъкни"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: 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/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Композер на поща за Evolution."
+msgid "Configure your email accounts here"
+msgstr "Създава или редактира пощенски акаунти и други настройки"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Композер на поща за Evolution."
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail component"
 msgstr "Композер на поща за Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Композер на поща за Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Фабрика за контрол на задачи в Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Акаунти"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+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:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Моля почакайте"
 
@@ -14421,19 +14868,51 @@ msgid "Select folder to import into"
 msgstr "Избери Папка"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Импортира"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Импортира Файлове"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Композер на поща за Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Композер на поща за Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Композер на поща за Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Композер на поща за Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканира на \"%s\""
@@ -14443,7 +14922,7 @@ msgstr "Сканира на \"%s\""
 msgid "Priority Filter \"%s\""
 msgstr "Приоритет: %s"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14458,7 +14937,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14466,7 +14945,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14475,25 +14954,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution импортира вашите стари дани от Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Настройки"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Редактирай Филтри"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14527,130 +15006,141 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Редактор на Акаунти в Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Хост:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "_Потрбителско име:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Път:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail до %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Темата е %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail от %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s пощенски списък"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Отговаря на"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Добавя правило за Филтър"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr " %d избрано"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr " %d неизпратено"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Чернови"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr " %d изпратено"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr " %d неизпратено"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d общо"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr " %d неизпратено"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr " %d избрано"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Ново _Mail съобщение"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Пощенско Съобщение"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Напиши Съобщение"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Нов VFolder"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Редактирай Филтри"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Създай нова папка"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, което ще се показва в календара"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: 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:89
 msgid "Identity"
 msgstr "Потребител"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14661,13 +15151,13 @@ msgstr ""
 "\"опционални\" по-долу не е задължително да бъдат запълнени,\n"
 "освен ако не искате тази информация да бъде изпращана по пощата."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14677,16 +15167,16 @@ msgstr ""
 "Ако не сте сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Моля, изберете от следните опции"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Изпращане на Email"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14696,11 +15186,11 @@ msgstr ""
 "сигурен питайте системният\n"
 "администратор или вашият доставчик на поща."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Мениджър на Акаунт"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14716,14 +15206,6 @@ msgstr ""
 "да състави акаунта за пощата. Моля въведете име за този акаунт долу.\n"
 "Това име ще бъде предназначено само за показване."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Проверява Обслужване"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Свързване със сървъра..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -15049,7 +15531,7 @@ msgstr "Изпълнява действия"
 
 #: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "завършва с"
 
 #: mail/mail-config.glade.h:82
@@ -15390,344 +15872,459 @@ msgstr " цвят"
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Удостоверение"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP сървър %s не подържа заявеният тип оторизация %s"
+
+#. 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-errors.xml.in.h:2
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Сигурен ли сте, че искате да изтриете този акаунт?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Сигурен ли сте, че искате да отворите всички %d съобщения в отделни прозорци?"
+"Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
+"HTML форматирана поща:\n"
 
-#: mail/mail-errors.xml.in.h:5
+#: 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 ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Изтрива за постоянно всички съобщения от тези папки"
+msgid "_Send"
+msgstr "Изпрати"
 
-#: mail/mail-errors.xml.in.h:6
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
 
-#: mail/mail-errors.xml.in.h:7
-#, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-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-errors.xml.in.h:8
+#. 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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Сигурен ли сте, че искате да препратите всичките %d съобщения?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Не мога да проверя папката `%s': %s"
+msgid "Use default drafts folder?"
+msgstr "Отваряне на папка %s"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Не мога да получа папка: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Не мога да отворя папката чернова за този акаунт.\n"
+"Искате ли да използвате подразбираща се?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Не мога да създам временна директория: %s"
+msgid "Use _Default"
+msgstr "По подразбиране"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Не мога да създам директория\n"
-"%s\n"
-"Грешка: %s"
+"Сигурен ли сте, че искате да отворите всички %d съобщения в отделни прозорци?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Не мога да изтрия папката:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Не мога да изтрия папка %s: Няма такава папка"
+msgid "_Expunge"
+msgstr "_Задрасква"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Папката `%s' не съществува."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Изтрива за постоянно всички съобщения от тези папки"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+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 ""
-"Не мога да преименувам папката:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Не мога да преименувам папката: %s"
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Не мога да преименувам папката: %s"
+msgid "Error while {0}."
+msgstr ""
+"Грешка при '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Не мога да отворя съобщение"
+msgid "Error while performing operation."
+msgstr ""
+"Грешка при извършване на операция:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Не мога да преименувам папката %s Няма такава папка"
+msgid "Enter password."
+msgstr "Въведедете парола"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Грешка при зареждане информацията за финтъра:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Не мога да създам директория %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Не мога да взема съобщение: %s\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Изтрива всички сигнатури"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Не мога да създам директория\n"
+"%s\n"
+"Грешка: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Не мога да запазя сигнатурен файл."
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Изтрий \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Действително ли да изтрия акаунта?"
+msgid "Cannot create temporary save directory."
+msgstr "Не мога да създам временна директория: %s"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Искате ли да съхраните промените?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Не изтривай"
+msgid "File exists but cannot overwrite it."
+msgstr "Файла съществува. Да го презапиша?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Въведедете парола"
+msgid "File exists but is not a regular file."
+msgstr "Spool `%s' не съществува или не е обикновен файл"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Грешка при зареждане информацията за финтъра:\n"
+"Не мога да изтрия папката:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Грешка при извършване на операция:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Не мога да изтрия папка %s: Няма такава папка"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Грешка при '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Файла съществува. Да го презапиша?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Не мога да преименувам папката %s Няма такава папка"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Spool `%s' не съществува или не е обикновен файл"
+msgid "Delete \"{0}\"?"
+msgstr "Изтрий \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
+"Не мога да изтрия папката:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:47
-#, fuzzy
-msgid "Invalid authentication"
-msgstr "Удостоверение"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. 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 ""
+"Не мога да преименувам папката:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:50
-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:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Не мога да преименувам папката: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Вие изпращате HTML-форматирано съобщение, но следните получатели не искат "
-"HTML форматирана поща:\n"
+msgid "Cannot open target \"{2}\"."
+msgstr "Не мога да отворя съобщение"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr ""
-"Не мога да изтрия папката:\n"
-"%s"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Не мога да проверя папката `%s': %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Не мога да получа папка: %s: %s"
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Не мога да преименувам папката: %s"
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. 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-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Вие не сте попълнили всичи полета за необходимата информация."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. 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-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Не изтривай"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Не мога да запазя сигнатурен файл."
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Изтрива всички сигнатури"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP сървър %s не подържа заявеният тип оторизация %s"
+msgid "Do you wish to save your changes?"
+msgstr "Искате ли да съхраните промените?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15735,85 +16332,87 @@ msgstr ""
 "\n"
 "Искате ли да запазите промените?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
-"Не мога да отворя папката чернова за този акаунт.\n"
-"Искате ли да използвате подразбираща се?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "По подразбиране"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Отваряне на папка %s"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Вие не сте попълнили всичи полета за необходимата информация."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Папката `%s' не съществува."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Вие не може да имате две сигнатури с едно име."
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Изпразва _Кошчето"
-
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Задрасква"
-
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Изпрати"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. 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-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: 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:787
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Сканира на \"%s\""
@@ -15822,135 +16421,135 @@ msgstr "Сканира на \"%s\""
 msgid "Working"
 msgstr "Работи"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Филтър върху папка"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Получаване на Пощата"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспех при запазване на поща във времен файл %s: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Изпращане на съпбщение %d от %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Неуспех при декодиране на съобщението"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Приключено."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Запазва съобщението в папка"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премести съобщени в %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копиране на съобщението в %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканиране на папки в \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Препратени съобщения"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Отваря хранилище %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Изтривам папка %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Запазване на папка %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Освежаване на папка"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Изтриване на папка"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Импортира %s като %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Локални Папки"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получавам съобщение %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Получавам %d съобщение"
 msgstr[1] "Получавам %d съобщение"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Съхраняване на %d съобщения"
 msgstr[1] "Съхраняване на %d съобщения"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15959,7 +16558,7 @@ msgstr ""
 "Не мога да създам изходен файл: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15968,11 +16567,11 @@ msgstr ""
 "Грешка при запазване на съобщения в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Запазвам прикачено"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15981,17 +16580,17 @@ msgstr ""
 "Не мога да създам изходен файл: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не мога да запиша данните: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Разкачване от %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Отново връзка с %s"
@@ -16057,24 +16656,24 @@ msgstr "Обновяване ..."
 msgid "Waiting..."
 msgstr "Изчакване ..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Потребителя прекрати операцията."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Въведедете парола за %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Въведедете парола"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Запомни тази парола"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Запомня тази парола за остатъка от тази сесия"
@@ -16119,89 +16718,94 @@ msgstr "Препратени съобщения"
 msgid "Invalid folder: `%s'"
 msgstr "Отваряне на папка %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка на vпапка %s"
 
-#: mail/mail-vfolder.c:207
-#, 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:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Обновяване на vпапки за uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vПапки"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Редактирай VПапки"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Нов VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Непрегледано"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Прегледано"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Отговорено"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Множество Невидяни Съобщения"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Множество Съобщения"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Най долу"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Ниско"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "По Горе"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Най Горе"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Днес %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Генерирам списък на съобщенията"
 
@@ -16236,47 +16840,47 @@ msgstr "Получено"
 msgid "Size"
 msgstr "Размер"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 #, fuzzy
 msgid "Call"
 msgstr "Карол"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 #, fuzzy
 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
 #, fuzzy
 msgid "For Your Information"
 msgstr "Източник на Информация"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: 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:85
+#: 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:86
+#: 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
 #, fuzzy
 msgid "Review"
 msgstr "Преглед"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16324,21 +16928,6 @@ msgstr "Абонирай се"
 msgid "_Unsubscribe"
 msgstr "О_тпиши се"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Shell на Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Композер на поща за Evolution."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16346,110 +16935,54 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Преименува тази група препратка"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Превключи показването на панела с папките"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Скрива лентата с препратки"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "_Приоритет:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "_Приоритет:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Интерфейс на Mail Конфигурация"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Отваряне на папка %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Отваряне на папка %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Отваряне на папка %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Отваряне на папка %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Превключи показването на панела с папките"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Превключи показването на панела с ускорителите"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Email"
@@ -16458,6 +16991,32 @@ msgstr "Email"
 msgid "Brought to you by"
 msgstr "Доведена до вас от"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Неизвестна грешка"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Грешни аргументи"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Не мога да регистрирам в OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Конфигурационната база данни не е намерена"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Генерира грешка"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Неименуван)"
@@ -16599,11 +17158,11 @@ msgstr "Неуспех при декодиране на съобщението"
 msgid "_Import"
 msgstr "Вмъкни"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Затварям връзката..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Еволюшън "
@@ -16643,11 +17202,35 @@ msgstr "В името на папката не може да се съдържа
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' и '..' са запазени имена на папка."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Evolution в момента е 'online'.  Кликнете на този бутон за да го превключите "
+"в режим 'offline'."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution е в процес на преминаване на режим 'offline'."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Evolution  в момента е 'offline.' Кликнете на този бутон за да го "
+"превключите на 'online'."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail до %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Инструмента GNOME Pilot изглежда не е инсталиран на тази система"
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка при изпълнение на %s"
@@ -16662,14 +17245,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy не може да бъде стартиран."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Относно Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Работа в 'O_nline' "
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Работа в '_Offline'"
 
@@ -16677,48 +17261,6 @@ msgstr "Работа в '_Offline'"
 msgid "Work Offline"
 msgstr "Работа в 'Offline'"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Evolution в момента е 'online'.  Кликнете на този бутон за да го превключите "
-"в режим 'offline'."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Evolution е в процес на преминаване на режим 'offline'."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Evolution  в момента е 'offline.' Кликнете на този бутон за да го "
-"превключите на 'online'."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Грешни аргументи"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Не мога да регистрирам в OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Конфигурационната база данни не е намерена"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Генерира грешка"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -16794,6 +17336,51 @@ msgstr "Активни връзки"
 msgid "Click OK to close these connections and go offline"
 msgstr "Кликнете на OK за да затворите връзките и да преминете в 'offline'"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Календар"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Контакти:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Поща"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Задачи"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Тип на папка:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Създай нова папка..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Акаунт"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Име на папка:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Потрбителско име:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Асистент за Настройка на Evolution"
@@ -16838,6 +17425,21 @@ msgstr ""
 "\n"
 "Кликнете на бутона \"Завърши\" за да запазите настройките."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Shell на Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Композер на поща за Evolution."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16903,13 +17505,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution не може да импортира данни от следните файлове:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16923,73 +17525,129 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr "Относно Evolution"
 
-#: shell/main.c:261
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Не ме питай отново"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Нямам достъп до Ximian Evolution shell."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Не мога да инициализирам Ximian Evolution shell: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Стартира импорт"
 
-#: shell/main.c:501
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Стартира Интелигентно Импортиране"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Изпраща изхода от дебъга на всички компоненти във файл."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Константин"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Нямам достъп до Ximian Evolution shell."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Помощник на Evolution за Акаунти"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Сертифициран ID:"
@@ -17237,12 +17895,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Сертифициран ID:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Карта ID вече съществува"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17465,6 +18117,12 @@ msgstr "Темата е %s"
 msgid "Certificate Signature Value"
 msgstr "Файл с Подпис:"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Карта ID вече съществува"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17509,12 +18167,12 @@ msgstr "Отрязва избраните съобщения"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Не мога да преименувам папката: %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17582,7 +18240,8 @@ msgid "Select all contacts"
 msgstr "Избери всички контакти"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Изпрати съобщение до избрани контакти"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17615,8 +18274,8 @@ msgstr "текущото време"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Действия"
@@ -17634,7 +18293,8 @@ msgid "_Preview Pane"
 msgstr "_Предварителен преглед на Pane"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Запази като VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17770,11 +18430,21 @@ msgstr "текущото време"
 msgid "Week"
 msgstr "Седмица"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Работна Седмица"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 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 "_Затвори"
+
 #: 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
@@ -18107,6 +18777,16 @@ msgstr "_Обърнат Избор"
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "Затвори"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18364,7 +19044,8 @@ msgid "Open the selected message in a new window"
 msgstr "Отваря избраните съобщения в нов прозорец"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Отваря избраното съобщение в редактора за препращане"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18488,63 +19169,50 @@ msgstr "VFolder върху _Тема"
 msgid "_Attached"
 msgstr "Прикрепи"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Копирай в Папка"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Създай Правило От Съобщението"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Go To"
 msgstr "Отиди"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Inline"
 msgstr "Работа в 'O_nline' "
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_По-голям"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Показване на _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Премести в _Папка"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 #, fuzzy
 msgid "_Next Message"
 msgstr "Следващо Съобщение"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Нормално Показване"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Отваря _Съобщение"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Предишно Съобщение"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Resend..."
-msgstr "Преименувай..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Инс_трументи"
@@ -18553,16 +19221,6 @@ msgstr "Инс_трументи"
 msgid "_Undelete"
 msgstr "Възстанови изтрито"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "Затвори"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Прикрепи"
@@ -18972,6 +19630,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "Изпращане / Получаване"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Намери Сега"
+
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -19051,11 +19714,6 @@ msgstr "_Крайна Дата"
 msgid "With _Status"
 msgstr "Задава статус"
 
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "_Задачи"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19219,6 +19877,34 @@ msgstr "Друго..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Грешка в Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Информация за Среща"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Композер на поща за Evolution."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Изпрати и Чернова Съобщение"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19344,6 +20030,35 @@ msgstr "Тест"
 msgid "Find _Now"
 msgstr "Намери Сега"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"Искате ли да го презапишете?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Не мога да взема съобщение: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Не мога да взема съобщение: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19355,8 +20070,135 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% приключено)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Адресна книга"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Интерфейс за търсенето по имена в адресната книга на Еволюшън"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Адрес _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Болоня"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Календар на Evolution iTip/iMip преглед"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution - Редактор на Новини"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Не мога да инициализирам gnome-vfs"
+
+#, fuzzy
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Не мога да отворя папка в `%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, което ще се показва в календара"
+
+#~ msgid "Display a message"
+#~ msgstr "Показва съобщение"
+
+#, fuzzy
+#~ msgid "Alerts"
+#~ msgstr "Алберта"
+
+#~ msgid "Time"
+#~ msgstr "Време"
+
+#~ msgid "_General"
+#~ msgstr "_Основен"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Избери Папка"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Календар"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "_Списък със задачи"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Календарният файл не може да бъде зареден!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI на папки със  задачи за показване"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Не мога да заредя задачи в `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Компонент на Evolution за показване на пощенски папки"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "_vПапка на Изпращач"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Филтър върху Из_пращач"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Неуспех при кеширане на съобщение %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Неуспех при кеширане на съобщение %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Неуспех при кеширане на съобщение %s: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, което ще се показва в календара"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Преименува тази група препратка"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Скрива лентата с препратки"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Отваряне на папка %s"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Отваряне на папка %s"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Отваряне на папка %s"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Отваряне на папка %s"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Превключи показването на панела с папките"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Превключи показването на панела с ускорителите"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Не мога да инициализирам Ximian Evolution shell: %s"
+
+#, fuzzy
+#~ msgid "_Resend..."
+#~ msgstr "Преименувай..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19437,9 +20279,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "S_pouse:"
 #~ msgstr "Съпруг:"
 
-#~ msgid "_Add"
-#~ msgstr "Доб_ави"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Работа"
@@ -19490,18 +20329,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Task List Creation Assistant"
 #~ msgstr "Източници на адреси"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "На_чална Дата:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Крайна Дата"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Приоритет:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19532,14 +20359,6 @@ msgstr "%s (%d%% приключено)"
 #~ "Не мога да отрежа файл %s:\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Не мога да намеря във файл %s:\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19659,10 +20478,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Преглед на календар за печат"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Въведедете парола за %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "_Списък със задачи"
 
@@ -19735,38 +20550,6 @@ msgstr "%s (%d%% приключено)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "C_alendar:"
-#~ msgstr "Календар"
-
-#, fuzzy
-#~ msgid "_Mail:"
-#~ msgstr "_Поща"
-
-#, fuzzy
-#~ msgid "_Tasks:"
-#~ msgstr "Задачи"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Тип на папка:"
-
-#, fuzzy
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Създай нова папка..."
-
-#, fuzzy
-#~ msgid "_Account:"
-#~ msgstr "Акаунт"
-
-#, fuzzy
-#~ msgid "_Folder Name:"
-#~ msgstr "Име на папка:"
-
-#, fuzzy
-#~ msgid "_User:"
-#~ msgstr "_Потрбителско име:"
-
-#, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Създава нова задача"
 
@@ -20106,9 +20889,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Асистент"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Следните връзки са в момента активни:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Тър_си за Контакти"
 
@@ -20360,9 +21140,6 @@ msgstr "%s (%d%% приключено)"
 #~ "Това съобщение е цифрово подписано. Кликнете на иконата за заключване за "
 #~ "повече информация."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Грешка в Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20469,18 +21246,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Календарна информация"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Напомняне"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "_Статус:"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Календарна информация"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Класификация"
 
@@ -21446,10 +22211,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgstr "Папката съдържа Обобщение на Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Композер на поща за Evolution."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Композер на поща за Evolution."
 
@@ -21854,9 +22615,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Asia"
 #~ msgstr "Азия"
 
-#~ msgid "Aspen"
-#~ msgstr "Аспен"
-
 #~ msgid "Asswan"
 #~ msgstr "Асуан"
 
@@ -22910,9 +23668,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Conroe"
 #~ msgstr "Конроу"
 
-#~ msgid "Constantine"
-#~ msgstr "Константин"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Копър Харбър"
 
@@ -22976,9 +23731,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Creston"
 #~ msgstr "Крестън"
 
-#~ msgid "Crestview"
-#~ msgstr "Крествю"
-
 #~ msgid "Cross City"
 #~ msgstr "Крос Сити"
 
@@ -26300,9 +27052,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Shown"
 #~ msgstr "Шелтън"
 
-#~ msgid "No tasks"
-#~ msgstr "Няма задачи"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Без описание)"
 
@@ -26851,9 +27600,6 @@ msgstr "%s (%d%% приключено)"
 #~ msgid "Delete news feed"
 #~ msgstr "Всички източници на новини:"
 
-#~ msgid "_Mail"
-#~ msgstr "_Поща"
-
 #~ msgid "_Weather"
 #~ msgstr "_Време"
 
@@ -28001,9 +28747,6 @@ msgstr "%s (%d%% приключено)"
 #~ 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"
 
diff --git a/po/ca.po b/po/ca.po
index 5e39a26675..9946a6f78b 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -12,14 +12,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-19 20:19+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
 "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"
 
 # fitxer: addressbook.gui.component.ca.po
@@ -200,7 +200,6 @@ msgstr "S'està migrant '%s':"
 
 # fitxer: addressbook.gui.component.ca.po
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
 #: mail/em-folder-tree-model.c:195 mail/em-folder-tree-model.c:197
@@ -210,9 +209,6 @@ msgstr "En aquest ordinador"
 
 # fitxer: addressbook.gui.component.ca.po
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -324,7 +320,6 @@ msgstr "Propietats..."
 #. 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/GNOME_Evolution_Addressbook.server.in.in.h:6
 #: addressbook/tools/evolution-addressbook-export-list-folders.c:51
@@ -3925,19 +3920,19 @@ msgid "GTK Tree View"
 msgstr "Visualització d'arbre del GTK"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Prova de reflux"
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: 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."
 
 # fitxer: addressbook.gui.widgets.ca.po
-#: addressbook/gui/widgets/test-reflow.c:122
+#: addressbook/gui/widgets/test-reflow.c:109
 msgid "This should test the reflow canvas item"
 msgstr "Hauria de provar l'element de l'àrea de dibuix de reflux"
 
@@ -4692,10 +4687,6 @@ msgstr "%A %d %B %Y"
 # fitxer: calendar.ca.po.5
 #. 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
@@ -6012,11 +6003,6 @@ msgstr "Hora d'_inici:"
 
 # fitxer: calendar.ca.po.4
 #. 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
@@ -7147,10 +7133,6 @@ msgstr ""
 
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -7158,10 +7140,6 @@ msgstr "%a %d/%m/%Y %H:%M:%S"
 
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -7196,10 +7174,6 @@ msgstr "pm"
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -7208,9 +7182,6 @@ msgstr "%A, %d de %B"
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -7937,10 +7908,6 @@ msgstr "%A, %d de %B de %Y"
 # fitxer: calendar.ca.po.3
 #. 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
@@ -7950,10 +7917,6 @@ msgstr "%a %d/%m/%Y"
 # fitxer: calendar.ca.po.3
 #. 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"
@@ -15031,8 +14994,6 @@ msgstr "Categories de sincronització:"
 # fitxer: e-util.ca.po
 #. 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"
@@ -15040,8 +15001,6 @@ msgstr "%a %m/%d/%Y %I:%M %p"
 # fitxer: e-util.ca.po
 #. 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 %m/%d/%Y %H:%M"
@@ -15102,14 +15061,12 @@ msgstr "%m/%d/%Y %H"
 
 # fitxer: e-util.ca.po
 #. 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"
 
 # fitxer: e-util.ca.po
 #. 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"
@@ -15117,9 +15074,6 @@ msgstr "%H:%M:%S"
 # fitxer: e-util.ca.po
 #. 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"
@@ -15127,9 +15081,6 @@ msgstr "%I:%M %p"
 
 # fitxer: e-util.ca.po
 #. 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"
@@ -15245,7 +15196,6 @@ msgstr "_Nom distingit:"
 
 # fitxer: filter.ca.po
 #. 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 "Heu d'especificar un nom de fitxer."
@@ -15286,7 +15236,6 @@ msgstr ""
 
 # fitxer: calendar.ca.po.4
 #. 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."
@@ -18670,7 +18619,6 @@ msgstr ""
 
 # fitxer: mail.ca.po.2
 #. 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?"
@@ -18745,7 +18693,6 @@ msgid ""
 msgstr "Suprimeix permanentment tots els missatges esborrats d'aquesta carpeta"
 
 #. 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 ""
@@ -18827,13 +18774,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
@@ -18871,8 +18811,6 @@ msgstr ""
 
 # fitxer: mail.ca.po.3
 #. 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
@@ -18896,9 +18834,6 @@ msgid "Cannot create temporary save directory."
 msgstr "No s'ha pogut crear el directori temporal: %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}\"."
@@ -18933,7 +18868,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "No s'ha pogut suprimir la carpeta 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 "
@@ -18969,14 +18903,12 @@ 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 ""
 
 # fitxer: mail.ca.po.3
 #. 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."
@@ -18988,14 +18920,12 @@ 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 ""
 
 # fitxer: calendar.ca.po.3
 #. 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}\"."
@@ -19003,14 +18933,12 @@ msgstr "No s'ha pogut obrir la font"
 
 # fitxer: camel.ca.po.4
 #. 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 "No es pot obrir el missatge"
 
 #. 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 ""
@@ -19030,7 +18958,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "No s'ha pogut obrir la font"
 
 #. 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 ""
@@ -20614,7 +20541,6 @@ msgstr "S'està connectant"
 
 # fitxer: shell.ca.po
 #. shell:noshell title
-#. shell:noshell-reason title
 #: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
 #, fuzzy
 msgid "Cannot start Evolution"
@@ -20622,7 +20548,6 @@ msgstr "Quant al Ximian Evolution"
 
 # fitxer: mail.ca.po.2
 #. 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."
diff --git a/po/cs.po b/po/cs.po
index d667035797..696ee55f7e 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-19 03:14+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-19 11:20+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"
 
@@ -138,15 +138,15 @@ msgstr "Nemohu se dotázat na kořenový DSE"
 msgid "The server responded with no supported search bases"
 msgstr "V odpovědi serveru nejsou podporované základy vyhledávání"
 
-#: addressbook/gui/component/addressbook-config.c:1242
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Tento server nepodporuje schéma informací LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1263
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Chyba při načítání informací o schématu"
 
-#: addressbook/gui/component/addressbook-config.c:1271
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Server neodpověděl platnou informací o schématu"
 
@@ -162,18 +162,14 @@ 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:438
 #: 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:244 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:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
@@ -266,9 +262,8 @@ msgstr "Vlastnosti..."
 #. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: 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"
@@ -295,46 +290,55 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI složky naposledy používané v dialogu výběru jmen"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Automatické dokončování"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certifikáty"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Zde nastavte automatické dokončování"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Adresář Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Kontextové menu adresy adresáře Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Prohlížeč adres adresáře Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Prohlížeč karet adresáře Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Komponenta adresáře Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Ovládací prvek správy certifikátů S/Mime Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Ovládací prvek nastavení složky Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 msgid "Manage your S/MIME certificates here"
 msgstr "Zde spravujte vaše certifikáty S/MIME"
 
@@ -3167,17 +3171,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í"
 
@@ -3791,10 +3795,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
@@ -3853,7 +3853,7 @@ msgstr ""
 "kalendář pro čtení i zápis."
 
 #: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Kalendáře"
 
@@ -4853,11 +4853,6 @@ 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/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
@@ -5741,8 +5736,9 @@ msgstr "Začátek"
 #: 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:1111
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Neznámá"
 
@@ -5792,20 +5788,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"
@@ -5836,10 +5824,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"
@@ -5847,9 +5831,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"
@@ -6451,10 +6432,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
@@ -6463,10 +6440,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"
@@ -6524,7 +6497,7 @@ msgid "Expunging"
 msgstr "Čistím"
 
 #: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: 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/importers/icalendar-importer.c:79
@@ -6557,37 +6530,55 @@ msgid "Purging"
 msgstr "Čistím"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Kalendář a úkoly"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Zde nastavte vaši časovou zónu, kalendář a seznam úkolů"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution Kalendář a úkoly"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Ovládací prvek nastavení kalendáře Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Prohlížeč naplánovaných zpráv kalendáře Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor kalendáře/úkolů Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Komponenta Kalendář Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Evolution's Tasks component"
 msgstr "Komponenta Úkoly Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendáře"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Úkoly"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "duben"
@@ -6995,7 +6986,7 @@ msgstr[0] "%d úkol"
 msgstr[1] "%d úkoly"
 msgstr[2] "%d úkolů"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:499
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8966,8 +8957,8 @@ msgid "This is a digitally signed message part"
 msgstr "Toto je digitálně podepsaná část zprávy"
 
 #: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Nemohu ověřit podpis zprávy: Nesprávný formát zprávy"
 
@@ -8985,7 +8976,7 @@ msgstr "Nemohu vygenerovat data šifrování: %s"
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitálně šifrovaná část zprávy"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Šifrovaný obsah"
 
@@ -9494,7 +9485,7 @@ msgstr "Nemohu vytvořit obsah enkodéru"
 msgid "Failed to add data to CMS encoder"
 msgstr "Nemohu přidat data k enkodéru CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Nemohu zakódvat data"
 
@@ -9554,91 +9545,91 @@ msgstr "Nemohu spočítat digesty"
 msgid "Cannot set message digests"
 msgstr "Nemohu nastavit digesty zprávy"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Import certifikátu selhal"
 
-#: camel/camel-smime-context.c:624
+#: camel/camel-smime-context.c:628
 msgid "Certificate only message, cannot verify certificates"
 msgstr "Zpráva jen s certifikátem, nemohu ověřit certifikáty"
 
-#: camel/camel-smime-context.c:627
+#: camel/camel-smime-context.c:631
 msgid "Certificate only message, certificates imported and verified"
 msgstr "Zpráva jen s certifikátem, certifikáty importovány a ověřeny"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Nemohu najít digesty podpisu"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Podepisující: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Dekodér selhal"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nemohu najít certifikát pro `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Nemohu najít společný algoritmus pro šifrování"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Nemohu alokovat slot pro šifrovací klíč"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Nemohu vytvořit zprávu CMS"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Nemohu vytvořit CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Nemohu připojit CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Nemohu připojit objekt dat CMS"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Nemohu vytvořit CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Nemohu přidat CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Nemohu vytvořit kontext enkodéru"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Nemohu přidat data k enkodéru"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Dekodér selhal, chyba %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Dešifrování S/MIME: Nenalezen šifrovaný obsah"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "import klíčů: neimplementováno"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "export klíčů: neimplementováno"
 
@@ -9670,11 +9661,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:808
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Koš"
 
-#: camel/camel-store.c:810 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Smetí"
@@ -9897,12 +9888,12 @@ msgstr "Nemohu zpracovat URL `%s'"
 msgid "Error storing `%s': %s"
 msgstr "Chyba při ukládání `%s': %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taková zpráva neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nemohu kopírovat nebo přesunout zprávy do Virtuální složky"
 
@@ -10365,7 +10356,7 @@ msgstr "Taková zprá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:233
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Tato zpráva není právě dostupná"
 
@@ -11054,7 +11045,7 @@ 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:258
+#: 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
@@ -11063,8 +11054,8 @@ msgid "User cancelled"
 msgstr "Uživatel zrušen"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11073,46 +11064,46 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Interní chyba: uid v neplatném formátu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:357
+#: 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:368
+#: 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:408
-#: camel/providers/nntp/camel-nntp-folder.c:421
+#: 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:433
+#: 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:436
+#: 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:452
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:463
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nemůžete kopírovat zprávy ze složky NNTP!"
 
@@ -11733,7 +11724,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "příloha"
 
@@ -12228,16 +12219,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"
@@ -12289,31 +12276,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"
@@ -12417,7 +12396,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:"
@@ -12448,7 +12426,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."
@@ -12891,7 +12868,7 @@ msgstr "začíná na"
 msgid "Stop Processing"
 msgstr "Zastavit zpracování"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:755 mail/em-format-html.c:1538
+#: 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
@@ -13041,7 +13018,7 @@ msgid "Create New Folder"
 msgstr "Vytvořit novou složku"
 
 #: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:699
+#: mail/mail-component.c:701
 #: 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:"
@@ -13112,7 +13089,7 @@ msgstr "_Kopírovat"
 msgid "Creating folder `%s'"
 msgstr "Vytvářím složku `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:699
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Vytvořit složku"
 
@@ -13167,10 +13144,10 @@ msgstr "Příchozí"
 msgid "Loading..."
 msgstr "Načítám..."
 
-#: mail/em-folder-view.c:414 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: 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:507
-#: mail/mail-component.c:550
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 msgid "Mail"
 msgstr "Pošta"
 
@@ -13318,38 +13295,38 @@ msgstr "_Kopírovat umístění odkazu"
 msgid "Click to mail %s"
 msgstr "Kliknutím sem pošlete e-mail %s"
 
-#: mail/em-format.c:750 mail/em-format-html.c:1432 mail/em-format-quote.c:192
+#: 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 "Od"
 
-#: mail/em-format.c:751 mail/em-format-html.c:1432 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 "Odpovědět-komu"
 
-#: mail/em-format.c:752 mail/em-format-html.c:1432 mail/em-format-quote.c:192
+#: 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 "Komu"
 
-#: mail/em-format.c:753 mail/em-format-html.c:1432 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 "Kopie"
 
-#: mail/em-format.c:754 mail/em-format-html.c:1432 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 "Skrytá kopie"
 
-#: mail/em-format.c:756 mail/em-format-html.c:1582 mail/em-format-quote.c:316
+#: 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:1603 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Diskusní skupiny"
 
@@ -13358,113 +13335,113 @@ msgstr "Diskusní skupiny"
 msgid "%s attachment"
 msgstr "%s příloha"
 
-#: mail/em-format.c:1072 mail/em-format.c:1191
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Nemohu zpracovat zprávu S/MIME: Neznámá chyba"
 
-#: mail/em-format.c:1181
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Nepodporovaný typ šifrování pro multipart/encrypted"
 
-#: mail/em-format.c:1327
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Nemohu zpracovat zprávu MIME. Zobrazím ji jako zdrojový kód."
 
-#: mail/em-format.c:1346
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Nepodporovaný formát podpisu"
 
-#: mail/em-format.c:1354
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Chyba při ověřování podpisu"
 
-#: mail/em-format.c:1354
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Neznámá chyba při ověřování podpisu"
 
-#: mail/em-format-html.c:454 mail/em-format-html.c:456
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Získávám `%s'"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:645
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Nepodepsána"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Platný podpis"
 
-#: mail/em-format-html.c:563 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Neplatný podpis"
 
-#: mail/em-format-html.c:564
+#: mail/em-format-html.c:562
 msgid "Valid signature but cannot verify sender"
 msgstr "Platný podpis, ale nemohu ověřit odesílatele"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:654
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Nešifrována"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Šifrována slabě"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Šifrována"
 
-#: mail/em-format-html.c:573 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Šifrována, silně"
 
-#: mail/em-format-html.c:839
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Chybná část externího těla."
 
-#: mail/em-format-html.c:869
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Odkaz na FTP server (%s)"
 
-#: mail/em-format-html.c:880
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Odkaz na místní soubor (%s) platný na serveru \"%s\""
 
-#: mail/em-format-html.c:882
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Odkaz na místní soubor (%s)"
 
-#: mail/em-format-html.c:903
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Odkaz na vzdálená data (%s)"
 
-#: mail/em-format-html.c:914
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Odkaz na neznámá externí data (typ \"%s\")"
 
-#: mail/em-format-html.c:1156
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formátuji zprávu"
 
 #. pseudo-header
-#: mail/em-format-html.c:1542 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 "Program elektronické pošty"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1569
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1572
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13474,30 +13451,30 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Nalezeno: %d"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Zpráva není podpesána. Není zaručeno, že je tato zpráva pravá."
 
-#: mail/em-format-html-display.c:646
+#: 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 ""
 "Tato zpráva je podepsána a je platná, takže je velmi pravděpodobně pravá."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "Podpis této zprávy nemůže být ověřen, možná byla při přenosu změněna."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Platný podpis, nemohu ověřit odesílatele"
 
-#: mail/em-format-html-display.c:648
+#: 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."
@@ -13505,7 +13482,7 @@ msgstr ""
 "Tato zpráva je podepsána platným podpisem, ale odesílatel zprávy nemůže být "
 "ověřen."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13513,7 +13490,7 @@ msgstr ""
 "Tato zpráva není šifrována. Její obsah může být čten při přenosu přes "
 "Internet."
 
-#: mail/em-format-html-display.c:655
+#: 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 "
@@ -13523,7 +13500,7 @@ msgstr ""
 "zvenku by bylo těžké, ale ne nemožné zobrazit obsah této zprávy v rozumném "
 "čase."
 
-#: mail/em-format-html-display.c:656
+#: 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."
@@ -13531,7 +13508,7 @@ msgstr ""
 "Tato zpráva je šifrována. Pro člověka zvenku by bylo těžké zobrazit obsah "
 "této zprávy."
 
-#: mail/em-format-html-display.c:657
+#: 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 "
@@ -13540,31 +13517,31 @@ 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:758
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Zobrazit certifikát"
 
-#: mail/em-format-html-display.c:773
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Tento certifikát nelze zobrazit"
 
-#: mail/em-format-html-display.c:1005
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Dokončeno dne %d. %B %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Již mělo být splněno:"
 
-#: mail/em-format-html-display.c:1016
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1086
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Zobrazit v textu"
 
-#: mail/em-format-html-display.c:1087
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Skrýt"
 
@@ -13708,28 +13685,28 @@ msgstr "Vyberte prosím server."
 msgid "No server has been selected"
 msgstr "Nebyl vybrán žádný server"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Příště tuto zprávu nezobrazovat."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "zpráva"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Uložit zprávu..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Přidat adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1012
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Zprávy z %s"
@@ -14207,54 +14184,63 @@ msgid "spamd port"
 msgstr "port spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Nastavení editoru"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr "Zde nastavte možnosti pošty včetně zabezpečení a zobrazování zpráv"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Zde nastavte hledání překlepů, podpisy a editor zpráv"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Zde nastavte své účty e-mailu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolution Pošta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Ovládací prvek nastavení účtů pošty Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Komponenta pošty Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Editor zpráv pošty Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Ovládací prvek nastavení editoru zpráv pošty Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Ovládací prvek nastavení pošty Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "Účty e-mailu"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Nastavení pošty"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importuje vaši starou poštu Elm"
@@ -14505,66 +14491,66 @@ msgstr "%s konferencí"
 msgid "Add Filter Rule"
 msgstr "Přidat pravidlo filtru"
 
-#: mail/mail-component.c:460
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d odstraněno"
 
-#: mail/mail-component.c:462
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d smetí"
 
-#: mail/mail-component.c:485
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d konceptů"
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d odesláno"
 
-#: mail/mail-component.c:489
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d neodesláno"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d celkem"
 
-#: mail/mail-component.c:495
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d nepřečteno"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nová zpráva"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Zpráva"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Napsat novou zprávu"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nová složka pošty"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Složka pošty"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Vytvořit novou složku pošty"
 
-#: mail/mail-component.c:793
+#: mail/mail-component.c:795
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Nemohu aktualizovat nastavení nebo složky pošty."
 
@@ -15303,7 +15289,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?"
@@ -15382,7 +15367,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."
@@ -15457,13 +15441,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
@@ -15492,8 +15469,6 @@ 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}\"."
@@ -15510,9 +15485,6 @@ 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}\"."
@@ -15539,7 +15511,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 "
@@ -15573,13 +15544,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."
@@ -15590,25 +15559,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}\"."
@@ -15624,7 +15589,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."
@@ -16574,6 +16538,11 @@ msgstr ""
 "Evolution je nyní off-line. Stiskem tohoto tlačítka přejdete do režimu on-"
 "line."
 
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Poslat %s"
+
 #: shell/e-shell-window-commands.c:64
 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."
@@ -16599,7 +16568,7 @@ msgstr "O Evolution"
 msgid "_Work Online"
 msgstr "Pracovat _on-line"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Pracovat při odpojení"
 
@@ -16956,13 +16925,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."
@@ -18836,6 +18803,11 @@ msgstr "_Stručná příručka"
 msgid "_Send / Receive"
 msgstr "_Odeslat / přijmout"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Nové _okno"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Podle _společnosti"
@@ -18900,10 +18872,6 @@ msgstr "S _termínem dokončení"
 msgid "With _Status"
 msgstr "Se _stavem"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Úkoly"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
diff --git a/po/da.po b/po/da.po
index 6f664f975c..643c5c1a65 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -27,6 +27,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution adressebog"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakter: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _vindue"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -52,16 +62,6 @@ msgstr "kort"
 msgid " card"
 msgstr "1 kort"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakter: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution _vindue"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadresse:"
@@ -77,67 +77,20 @@ msgstr "Kunne ikke indlæse %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunne ikke læse pilotens adresseapplikationsblok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Mapper for automatisk udfyldning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "_Certifikat-ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Konfigurér dine e-post-konti her"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebog - adresse-pop-op"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebog - adressevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebog - kortvisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressebogskomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebog - mappevisning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-post-indstillings-styreelement"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Tilslutter LDAP-serveren anonymt"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappeindstillingsopsætnings-styreelement"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Mislykkedes med godkendelse.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sAngiv adgangskode for %s (bruger %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -180,42 +133,46 @@ msgstr "_Kontakter:"
 msgid "Create a new contacts group"
 msgstr "Opret en ny genvejsgruppe"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Fejl ved hentning af schemainformation"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Venter..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinger %s"
@@ -223,8 +180,8 @@ msgstr "Pinger %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -232,7 +189,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personligt"
@@ -282,20 +239,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Tilslutter LDAP-serveren anonymt"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Mislykkedes med godkendelse.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Adressebog"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sAngiv adgangskode for %s (bruger %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -315,6 +294,63 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Mapper for automatisk udfyldning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Certifikat-ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfigurér dine e-post-konti her"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebog - adresse-pop-op"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebog - adressevisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebog - kortvisning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressebogskomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-post-indstillings-styreelement"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappeindstillingsopsætnings-styreelement"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  _Vis de baser som understøttes "
@@ -336,6 +372,7 @@ msgstr "  _Vis de baser som understøttes "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -408,7 +445,7 @@ msgstr "_Kontakter:"
 msgid "Address Book Properties"
 msgstr "Adressebogs-kilder"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Altid"
@@ -423,107 +460,97 @@ msgid "Basic"
 msgstr "Grundlæggende"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "F_arver"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Tilslutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Generelt"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Én"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Vælg en farve"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "S_øgningsomfang: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "S_øgningsomfang: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Søger..."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -532,7 +559,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -549,7 +576,7 @@ msgstr ""
 "på arbejdet behøver Evolution ikke at anvende SSL/TLS eftersom forbindelsen "
 "allerede er sikker."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -562,19 +589,19 @@ msgstr ""
 "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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Understøttede søgebaser"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -586,7 +613,7 @@ msgstr ""
 "Hvis du efterlader dette tomt kommer søgningen at begynde ved roden af "
 "katalogtræet."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -601,7 +628,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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -609,7 +636,7 @@ msgstr ""
 "Dette er det komplette navn på din ldap-server. For eksempel \"ldap.mitfirma."
 "dk\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -620,7 +647,7 @@ msgstr ""
 "højt\n"
 "sænkes hastigheden på adressebogen."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -630,7 +657,7 @@ msgstr ""
 "at sætte dette til \"E-postadresse\" kræver anonym adgang til din ldap-"
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -639,7 +666,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -650,128 +677,136 @@ msgstr ""
 "En liste med standard er givet. Spørg din systemadministrator hvilken port "
 "du skal bruge."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Bruger distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Bruger e-postadresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Når det er muligt"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakter:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Nedhæntningsgrænse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-post-_adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Logindmetode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Navn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Udgangspunkt for søgning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Servernavn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Brug sikker anslutning (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "forbindelsesfaneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "generel-faneblad"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minutter"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "søgefaneblad"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adressebog - navnevalgsgrænseflade"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjern alle"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjern"
 
+#: 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 "Navn"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Fjern alle"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -794,23 +829,15 @@ msgstr "Tilføj i kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt uden navn:"
 
-#: 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
-msgid "Name"
-msgstr "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
 msgid "Source"
 msgstr "Kilde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adressebog - navnevalgsgrænseflade"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -883,143 +910,143 @@ msgid "<b>Work</b>"
 msgstr "Arbejdsuge"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresse _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Br_yllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Fø_dselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bologna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_By:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Lan_d:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Af_deling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL for L_edig/optaget:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Fulde navn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Hjemme"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-post-adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Leder"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Kalde_navn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tater:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Andre"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postboks:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1047,9 +1074,9 @@ msgstr "Side"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Arbejde"
@@ -1082,23 +1109,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"fjerne disse kontakter?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"slette denne kontakt?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2080,100 +2123,118 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Post meddelelse"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Navnløs liste"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Tjeneste klar"
-
-#: 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 "Sted:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Bruger_navn:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Gruppe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Kilde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Ændret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakt hører til disse kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Følgende forbindelser er aktive:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Post meddelelse"
+
+#: 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 "Tjeneste klar"
+
+#: 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 "Sted:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Bruger_navn:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hurtig kontakt-tilføjelse"
@@ -2194,22 +2255,6 @@ msgstr "_Fulde navn:"
 msgid "E-_mail:"
 msgstr "E-post"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"fjerne disse kontakter?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"slette denne kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2363,8 +2408,8 @@ msgstr "kontakt-liste-redigering"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bog"
 
@@ -2425,6 +2470,463 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avanceret søgning"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Medlemmer"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Arbejde"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Personligt"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Kommentar"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Jobtitel:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax hjemme"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Succes"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "\"Offline\" lager"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Tilgang nægtet"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Kort ikke fundet"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokollen er ikke understøttet"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Afbrudt"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Godkendelse mislykkedes"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Godkendelse kræves"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Ingen sådan besked"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Anden fejl"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Vi kunne ikke åbne denne adressbog. Dette betyder enten\n"
+"at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
+"kan nåes."
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Vi kunne ikke åbne denne adressbog. Dette betyder entet\n"
+"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
+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 ""
+"Flere kort matchede denne forespørgsel end enten serveren er\n"
+"konfigureret til at returnere eller Evolution er konfigurerat at vise.\n"
+"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
+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 ""
+"Udførelsestiden for denne forespørgsel overskred serverens grænse eller den "
+"grænse\n"
+"som du har konfigureret for denne adressbog. Gør din søgning mere\n"
+"specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
+"for denne adressbog."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Fejl ved tilføjelse af kort"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Fejl ved ændring af liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Fejl ved ændring af kort"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Fejl ved fjernelse af kort"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s eksisterer allerede\n"
+"Vil du overskrive den?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Flyt kort til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopiér kort til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Flyt kort til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopiér kort til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Vælg kontakter fra adressebogen"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Flere VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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 "(ingen)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primær e-post"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Vælg en handling"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Opret en ny kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Kører forespørgsel i adressebog..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Redigér kontaktinfo"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Flet e-postadresse"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "og ét andet kort."
+msgstr[1] "og ét andet kort."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Vis brevets _kildetekst"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Gem kontakt som VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gem i adressebog"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2440,8 +2942,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Forespørgsel"
 
@@ -2496,9 +2998,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Gem som VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2566,7 +3069,7 @@ msgid "Cut"
 msgstr "Klip ud"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2577,18 +3080,8 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Indsæt"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Slet"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktuel visning"
 
@@ -2604,7 +3097,7 @@ msgstr ""
 "er gået ned. Du skal genstarte Evolution for at kunne anvende den igen"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Enhver kategori"
@@ -2645,21 +3138,6 @@ msgstr "Kategorier"
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Efternavn"
@@ -2699,29 +3177,14 @@ msgstr "Jordan"
 msgid "Manager"
 msgstr "Leder"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kaldenavn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Kommentar"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisation"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Anden fax"
@@ -2775,21 +3238,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Netside"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Bredde"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Højde"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Har fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valgt"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markør"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
@@ -2806,10 +3277,6 @@ msgstr "Tekstmodel"
 msgid "Max field name length"
 msgstr "Maksimal feltnavnslængde"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolonnebredde"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2838,437 +3305,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valgt"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markør"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Medlemmer"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Gruppe"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Arbejde"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Personligt"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Jobtitel:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax hjemme"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Succes"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "\"Offline\" lager"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adressbogen findes ikke"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Tilgang nægtet"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Kort ikke fundet"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Kort-ID eksisterer allerede"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokollen er ikke understøttet"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Afbrudt"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Godkendelse mislykkedes"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Godkendelse kræves"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Ingen sådan besked"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Anden fejl"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Vi kunne ikke åbne denne adressbog. Dette betyder enten\n"
-"at du har angivet en forkert URI eller at LDAP-serveren ikke\n"
-"kan nåes."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Vi kunne ikke åbne denne adressbog. Dette betyder entet\n"
-"at du har angivet en fejlagtig URI eller at LDAP-serveren ikke\n"
-"kunne nåes."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Kunne ikke åbne adressebogen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Flere kort matchede denne forespørgsel end enten serveren er\n"
-"konfigureret til at returnere eller Evolution er konfigurerat at vise.\n"
-"Gør din søgning mere specifik eller øg resultatgrænsen i\n"
-"katalogserverindstillingerne for denne adressebog."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Udførelsestiden for denne forespørgsel overskred serverens grænse eller den "
-"grænse\n"
-"som du har konfigureret for denne adressbog. Gør din søgning mere\n"
-"specifik eller øg resultatgrænsen i katalogserverindstillingerne\n"
-"for denne adressbog."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Denne forespørgsel udførtes ikke successfuldt."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Vil du gemme ændringene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Fejl ved tilføjelse af liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Fejl ved tilføjelse af kort"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Fejl ved ændring af liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Fejl ved ændring af kort"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Fejl ved fjernelse af liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Fejl ved fjernelse af kort"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s eksisterer allerede\n"
-"Vil du overskrive den?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Overskriv"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Flyt kort til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopiér kort til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Flyt kort til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopiér kort til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Vælg kontakter fra adressebogen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Flere VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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 "(ingen)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primær e-post"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Vælg en handling"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Opret en ny kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Tilføj adresse for eksisterende kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Kører forespørgsel i adressebog..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Redigér kontaktinfo"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Flet e-postadresse"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "og ét andet kort."
-msgstr[1] "og ét andet kort."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Vis brevets _kildetekst"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Gem kontakt som VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Gem i adressebog"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolonnebredde"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3312,11 +3351,6 @@ msgstr "Evolutions VCard-importerer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Udskriv konvolut"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3328,6 +3362,11 @@ msgstr "Udskriv valgte kontakter"
 msgid "Print contact"
 msgstr "Udskriv valgte kontakter"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Udskriv konvolut"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3514,18 +3553,6 @@ msgstr "Kontakt_liste"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Kan ikke åbne besked"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Kort ikke fundet"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3583,6 +3610,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Kan ikke åbne besked"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Kort ikke fundet"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fejl ved indlæsning af adressebog."
@@ -3595,11 +3634,12 @@ msgstr "Inddatafil"
 msgid "No filename provided."
 msgstr "Intet filnavn angivet."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Navnløs liste"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Indtast adgangskode"
@@ -3632,121 +3672,56 @@ msgstr "Standardprioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikke læse pilotens programblok for opgaveliste"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og opgaver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalender-opsætnings-styringselement"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendertilrettelægnings-beskedvisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendervisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender/opgave-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution opgavevisning"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender-og-opgaver-komponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutions testkomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Opgaver"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
-
 # Konteksten er planlægning af opgaver. Dette er tidspunktet for begyndelsen
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Begynder:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Slutter:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmer %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Luk"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Udsæ_t"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Udsæt-tid (minutter)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "R_edigér aftale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Udsæ_t"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åbn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgængelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3755,12 +3730,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3772,7 +3747,7 @@ msgstr ""
 "at sende e-post. Evolution vil vise en normal dialog\n"
 "for påmindelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3789,19 +3764,19 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køre dette program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Spørg mig ikke om dette program igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalenderalarmbekendgørelsestjeneste"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initialisere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Kunne ikke initiere gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke oprette fabrik for alarm-tjenesten"
 
@@ -3914,61 +3889,46 @@ 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 "Spørg efter bekræftelse ved sletning _af opføringer"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Spørg efter bekræftelse ved sletning _af opføringer"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Fjern færdiggjorte opgaver"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Sammendrag indeholder"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Kommentar indeholder"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Beskrivelse indeholder"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Ingen træffere"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3980,125 +3940,136 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "returnerer mindre end"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dage"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A den %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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Egenskaber ..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Indlæser kalender..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Møde"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Mød_e"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Opret en ny mødeindkaldelse"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nyt heldagsmøde"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmøde"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Opret en ny aftale"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Ny-kaledonia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alender:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Opret en ny mappe"
@@ -4129,15 +4100,36 @@ msgstr "Ugevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Sammendrag indeholder"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Kommentar indeholder"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Beskrivelse indeholder"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Ingen træffere"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fejl under åbning af kalender"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metode ikke understøttet under åbning af kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Du har ikke rettigheder til at åbne kalenderen"
 
@@ -4146,19 +4138,6 @@ msgstr "Du har ikke rettigheder til at åbne kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Kunne ikke åbne mappen i \"%s\""
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URIen som kalenderen skal vise"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Typen af visning der skal bruges"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Valgmuligheder for lyd-alarmer"
@@ -4226,7 +4205,7 @@ msgstr "ekstra gange hver"
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4245,14 +4224,14 @@ msgstr "Basis"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Vis en besked"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Afspil en lyd"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4268,6 +4247,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
 msgid "Summary:"
 msgstr "Sammendrag:"
@@ -4306,10 +4286,110 @@ msgstr "minutt(er)"
 msgid "start of appointment"
 msgstr "start på aftale"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Ny-kaledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Opgaveliste"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Ny-kaledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "uger"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Aktiveret"
 
@@ -4325,19 +4405,19 @@ msgstr "Fjern ikke"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Deaktivér"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aktivér"
 
@@ -4362,164 +4442,177 @@ msgid "60 minutes"
 msgstr "60 minutter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Advarsler"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Begynder:</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Påmindelser"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Kalenderinformation"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Udføres inden:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Arbejdsuge"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Indstillinger for kalender og opgaver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Farve for udgåede opgaver"
 
-#: 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 "Farve for opgaver som går ud i dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Dagen _slutter:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Vis"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktivér"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minutter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Mandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_søn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Lørdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Vis en påmindelse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Vis uge_nummer i datonavigation"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Gøremål for idag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Opgaveliste"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Tids_zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Tirsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Ugen begynder:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Arbejdsuge"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Arbetsdage:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timer (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 timer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Tilføj ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Spørg efter bekræftelse ved sletning _af opføringer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Komprimér weekender i månedsvisning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Dagen begynder:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4529,146 +4622,46 @@ msgstr "_Vis"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Forespørgsel om ledig/optaget"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Generelt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Sk_jul udførte opgaver efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Man"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Opgaver der skulle have været udført:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "L_ør"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Vis sluttiderne for møder i uge- og månadsoversigterne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Tidsopdelinger:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "t_irs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "før hvert møde"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Du skal angive et filnavn."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Ny-kaledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Opgaveliste"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar-fejl"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Ny-kaledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "uger"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4750,83 +4743,83 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har ikke gjort ændringer. Opdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfejl: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Fuldført "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Færdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Færdig "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Kunne ikke opdatere objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Redigér aftale"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Aftale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Opgave - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journalopføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Ingen sammendrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gem som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Ændringer i dette objekt kan bliver muligvis ignoreret hvis en opdatering "
 "ankommer via e-post"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Kan ikke hente versionsdata!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfejl: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Fuldført "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Færdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Færdig "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4954,27 +4947,27 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Indtast delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Aftale"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Påmindelse"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Genindtræffelse"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Mødeplanlægning"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Møde"
 
@@ -4986,7 +4979,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Startdatoen er forkert"
 
@@ -5076,10 +5069,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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,15 +5091,15 @@ msgstr "En organisator er påkrævet."
 msgid "At least one attendee is required."
 msgstr "Mindst en deltager er nødvendig"
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Deleger til..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5394,26 +5387,19 @@ msgstr "_Forkast ændringer"
 msgid "Save Event"
 msgstr "Kalenderhændelser"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Vælg importør"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Vælg en målmappe til at importere data"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalender"
+msgid "_Destination"
+msgstr "Slet denne mappe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Opgaveliste"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5442,38 +5428,44 @@ msgid "% _Complete"
 msgstr "% færdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Fuldført"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Høj"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "I gang"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Ikke startet"
 
@@ -5511,11 +5503,11 @@ msgstr "_Hjemmeside-adresse:"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Forfaldsdatoen er forkert"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kunne ikke åbne adressebogen"
@@ -5524,8 +5516,9 @@ msgstr "Kunne ikke åbne adressebogen"
 msgid "Con_fidential"
 msgstr "Kon_fidensiel"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Beskrivelse:"
@@ -5680,101 +5673,56 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukendt udløsertype"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Offentlig"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Fortroligt"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Slutdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Startdato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Sammendrag"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Optaget"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Klik for at tilføje en opgave"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Uden navn"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "Ø"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Sta_rt dato:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Fær_dig-dato:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske positionen skal skrives ind på formatet: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritet:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nej"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Hjemmeside-adresse:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukendt"
+#: 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 "Offentlig"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Genindtræffer"
+#: 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 "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Tildelt"
+#: 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 "Fortroligt"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5820,17 +5768,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+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:399
+msgid "Busy"
+msgstr "Optaget"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Sletter de valgte objekter"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Åbn"
 
@@ -5840,41 +5797,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Indsæt"
 
@@ -5932,78 +5890,157 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdato"
 
+#: 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 "Sammendrag"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Opgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Ny _aftale..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Ny aftale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nyt møde"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Ny opgave"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vælg _tråd"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Slet..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Udgiv ledig/optaget-information"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiér til mappe..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_yt til mappe..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Book møde..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Slet denne _hændelse"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Slet _alle hændelser"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Indstillinger..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Slutdato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Ukendt"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Genindtræffer"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nej"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "Ø"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: 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 ""
+"Den geografiske positionen skal skrives ind på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -6027,36 +6064,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutters opdeling"
+#. 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 " "
+
+#. 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 " "
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr " "
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutters opdeling"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6165,10 +6202,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6198,7 +6231,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "O.k."
 
@@ -6412,61 +6445,57 @@ msgstr "Bilaget indeholder ikke en gyldig kalender-besked"
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilaget har ingen synlige kalender-elementer"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderfilen kunne ikke opdateres!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Opdatering fuldført\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldigt og kan ikke opdateres\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objektet kunne ikke findes\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Deltagerstatus opdateret\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltagerstatus kunne ikke opdateres!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Fjernelse fuldført"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Elementet sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Elementet kunne ikke sendes!\n"
 
@@ -6583,28 +6612,6 @@ msgstr "Delegeret"
 msgid "In Process"
 msgstr "I gang"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A den %d %B, %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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ude"
@@ -6665,7 +6672,34 @@ msgstr "Tid for mødets _start:"
 msgid "Meeting _end time:"
 msgstr "Tid for mødets slutning:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 den %d %B, %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.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 %d/%m-%Y"
+
+#. 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 "%d/%m-%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Indtast adgangskode for %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6674,21 +6708,19 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åbner lager %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6697,53 +6729,109 @@ msgstr ""
 "Fejl ved %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Færdiggør opgaver..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Fjerner markerede objekter..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Udrenser"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Opgaver"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ingen aftaler."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Indlæser billeder"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Åbn i %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurér din tidszone, kalender og opgaveliste her "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og opgaver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalender-opsætnings-styringselement"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendertilrettelægnings-beskedvisning"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender/opgave-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender-og-opgaver-komponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutions testkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Opgaver"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6881,6 +6969,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Du har ikke rettigheder til at åbne kalenderen"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Kunne ikke åbne adressebogen"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7100,7 +7205,7 @@ msgid "Contacts: "
 msgstr "Kontakter: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Forhåndsvisning af udskrift"
 
@@ -7112,68 +7217,78 @@ msgstr "Udskriv element"
 msgid "Print Setup"
 msgstr "Printeropsætning"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d valgte"
+msgstr[1] "%d valgte"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Indlæser billeder"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Opgave"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nyt gøremål"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Opgaveliste"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Opret en ny opgave"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URIen til opgavemappen, der skal vises"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunne ikke indlæse opgaverne i `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7185,11 +7300,11 @@ msgstr ""
 "\n"
 "Vil du virkelig fjerne disse opgaver?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Spørg mig ikke igen."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Udskriv opgaver"
 
@@ -8838,7 +8953,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappen \"%s\" til afkoblet tilstand"
@@ -8931,33 +9046,6 @@ msgstr "Ugyldige argumenter til (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fejl under udførelse af filtersøgning: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan ikke tolke søgeudtrykket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fejl under kørsel af søgeudtrykket %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) kræver et enkelt boolsk resultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Udfører forespørgsel på ukendt header: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8990,7 +9078,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Henter %d beskeder"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Kan ikke tolke søgeudtrykket: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Fejl under kørsel af søgeudtrykket %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) kræver et enkelt boolsk resultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) kræver et enkelt boolsk resultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) kræver et enkelt boolsk resultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Udfører forespørgsel på ukendt header: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9001,15 +9134,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Mislykkedes med at tolke gpg-tips for brugerid."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Mislykkedes med at tolke gpg-løsen."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9018,27 +9151,27 @@ msgstr ""
 "Du skal bruge et gpg-løsen for at låse nøglen op\n"
 "for brugeren: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Afbrudt."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Mislykkedes med at oplåse hemmelig nøgle: 3 forkerte løsener angivet."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Mislykkedes med at kryptere: ingen gyldige modtagere angivet."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9049,87 +9182,67 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Mislykkedes med at GPG'e %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 kunne ikke udføres: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 kunne ikke udføres."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Kan ikke verificere meddelelsesignatur: kunne ikke oprette temporær fil: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikke verificere meddelelsesignatur: kunne ikke oprette temporær fil: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt underskrevet brevdel"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indeksér meddelelsers indhold"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikke hente besked fra redigering"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kunne ikke bygge kanal for låsehjælper: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan ikke forgrene låsehjælper: %s"
-
-#: 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 "Kunne ikke låse '%s': protokolfejl med låsehjælper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunne ikke låse '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9150,6 +9263,26 @@ msgstr "Fejl under låsning ved brug af fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Fejl under låsning ved brug af flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunne ikke bygge kanal for låsehjælper: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan ikke forgrene låsehjælper: %s"
+
+#: 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 "Kunne ikke låse '%s': protokolfejl med låsehjælper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunne ikke låse '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9396,7 +9529,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Ugyldigt svar på autenticering fra server."
 
@@ -9596,7 +9729,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Certifikat-ID:"
 
 #: camel/camel-smime-context.c:360
@@ -9613,7 +9746,7 @@ msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
 msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Mislykkedes med godkendelse.\n"
@@ -9684,99 +9817,99 @@ msgstr "Finder ikke mappe: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Kan ikke hente meddelelse %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Certifikatsignaturfejl"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Redigér signatur"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Type: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP-kommando mislykkedes: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Kunne ikke finde certifikat for \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Kunne ikke finde en normal bulk-algoritme."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Kunne ikke oprette S/MIME-afkodningskontekst."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Tilslutning til LDAP-serveren mislykkedes"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Kommando ikke implementeret"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9793,16 +9926,26 @@ msgstr "Finder ikke mappe: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke oprette mappe: Ugyldig operation på dette lager"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Affald"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9924,7 +10067,7 @@ msgstr "Nøgleanvendelse understøtter ikke certifikatsignering"
 msgid "Error in application verification"
 msgstr "Fejl i programverifikation"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9937,11 +10080,11 @@ msgstr ""
 "Fingeraftryk:      %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "DÅRLIG"
 
@@ -9965,7 +10108,7 @@ msgstr ""
 "Vil du acceptere alligevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9980,7 +10123,7 @@ msgstr ""
 "\n"
 "Vil du acceptere?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9989,7 +10132,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9998,7 +10141,7 @@ msgstr ""
 "Fejlagtigt certifikatdomæne: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10007,7 +10150,7 @@ msgstr ""
 "Certifikatet er udløbet: %s\n"
 "Udsteder: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10021,17 +10164,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunne ikke tolke URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fejl ved lagring af \"%s\": %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen sådan besked %s i %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 
@@ -10040,11 +10183,6 @@ msgstr "Kan ikke kopiere eller flytte meddelelser til en virtuel mappe"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10061,10 +10199,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Ser efter nye beskeder"
 
 #: 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 "Se efter nye beskeder i alle mapper"
@@ -10098,6 +10238,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10119,26 +10260,324 @@ msgstr ""
 msgid "Checklist"
 msgstr "Tyk tåge"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventet svar fra IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %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 "Server koblet fra uventet: %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 "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan ikke hente besked: %s fra mappe %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 ""
+"Kan ikke hente besked: %s fra mappe %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikke tilføje besked i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikke tilføje besked i mh-mappe: %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 ""
+"Kan ikke hente besked: %s fra mappe %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 ""
+"Kan ikke hente besked: %s fra mappe %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 ""
+"Kan ikke hente besked: %s fra mappe %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 ""
+"Kan ikke hente besked: %s fra mappe %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 "Mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Vis kun abonnerede mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Tilsidesæt servers navneområde for mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Navneområde"
+
+#: 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 "For læsning og lagring af e-post på IMAP-servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Dette valg vil lade dig koble til en IMAP-server ved at bruge en klartekst-"
+"adgangskode."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, 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: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/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 "Kunne ikke koble til %s (port %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilkobling afbrudt"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Ukendt fejl"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kan ikke tilslutte POP-servern %s: Ingen understøttelse for ønskede "
+"godkendelsesmekanisme."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIndtast venligst SMTP-adgangskode for %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Godkendelse mislykkedes på POP-serveren %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Firma"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan ikke slette mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan ikke ændre navn på mappe: %s: Ugyldig operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Finder ikke mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Uventet svar fra IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Ingen opgaver"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operation afbrudt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server koblet fra uventet: %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:1089
-msgid "Unknown error"
-msgstr "Ukendt fejl"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10183,21 +10622,21 @@ msgstr "Kan ikke oprette katalog %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke indlæse sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen blev ødelagt og genskabt på serveren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Søger efter ændrede beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente meddelelse: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10213,25 +10652,25 @@ msgstr ""
 "Kan ikke hente besked: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Ingen sådan besked"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Denne besked er ikke tilgængelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformation for nye beskeder"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finde beskedens indhold i FETCH-svar."
 
@@ -10273,23 +10712,6 @@ msgstr "Tilslutning til LDAP-serveren mislykkedes"
 msgid "Command:"
 msgstr "Firma"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Vis kun abonnerede mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Tilsidesæt servers navneområde for mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Navneområde"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Brug filtre for nye beskeder i INDBAKKE på denne server"
@@ -10312,86 +10734,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-tjeneste for %s på %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Kunne ikke koble til %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS er ikke tilgængelig"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilkobling afbrudt"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandlinger mislykkedes"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Du indtastede ikke en adgangskode."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10402,25 +10781,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappnavnet \"%s\" er ugyldigt eftersom det indeholder tegnet \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ophavsmappen tillades ikke at have undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10428,7 +10800,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukendt forældermappe: %s"
@@ -10533,58 +10905,58 @@ msgstr ""
 "Til at læse og gemme lokal post i eksterne standard mbox kø-filer.\n"
 "Kan også anvendes til at læse et træ mapper i Elm-, Pine- eller Mutt-format."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrod %s er ikke en absolut sti"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrod %s er ikke et normalt katalog"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Finder ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en indbakke"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke ændre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke skifte navn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kunne ikke slette sammendragsfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kunne ikke slette indeksfil for mappe `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10650,7 +11022,7 @@ msgstr "Kunne ikke slette mappe `%s': %s"
 msgid "not a maildir directory"
 msgstr "ikke et maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10987,7 +11359,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10996,8 +11368,8 @@ msgid "User cancelled"
 msgstr "Brugeren afbrød"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11006,48 +11378,48 @@ msgstr "Brugeren afbrød"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente meddelelse %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Fejl under autogemning af besked: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Kunne ikke lukke midlertidig mappe: %s"
@@ -11174,7 +11546,7 @@ msgstr "Kunne ikke hente gruppe: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Kunne ikke sende beskeden: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11227,8 +11599,8 @@ msgstr "Ingen besked med uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Henter POP-besked %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Ukendt anledning"
 
@@ -11682,7 +12054,7 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "bilag"
 
@@ -11726,6 +12098,101 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Foreslå automatisk visning af bilag"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Altid signér udgående beskeder når denne konto bruges"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Altid signér udgående beskeder når denne konto bruges"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kan ikke åbne besked"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikke hente besked fra redigering"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Besked uden titel)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Åbn fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatisk genereret"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: 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.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 "Skriv en besked"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Kunne ikke oprette vindue:\n"
+"adresseudvælgelses-kontrol kunne ikke aktiveres."
+
+#: 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 ""
+"Kunne ikke oprette redigerervinduet:\n"
+"Kan ikke aktivere HTML-redigeringskomponenten.\n"
+"Verficér at du har de rette versioner af\n"
+"gtkhtml og libgtkhtml installeret.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Kunne ikke oprette vindue:\n"
+"En komponent i HTML tekstbehandler kunne ikke aktiveres."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
+"ikke kan redigeres.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postdestination"
@@ -11808,210 +12275,135 @@ msgstr "<klik her for at vælge en mappe>"
 msgid "Attach file(s)"
 msgstr "Vedhæft fil(er)"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "_Altid signér udgående beskeder når denne konto bruges"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Kan ikke åbne besked"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikke hente besked fra redigering"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Besked uden titel)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Åbn fil"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatisk genereret"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Skriv en besked"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Vedlæg en fil til beskeden"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Kunne ikke oprette vindue:\n"
-"adresseudvælgelses-kontrol kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Kunne ikke oprette redigerervinduet:\n"
-"Kan ikke aktivere HTML-redigeringskomponenten.\n"
-"Verficér at du har de rette versioner af\n"
-"gtkhtml og libgtkhtml installeret.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Kunne ikke oprette vindue:\n"
-"En komponent i HTML tekstbehandler kunne ikke aktiveres."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Redigeringsværktøjet indeholder et meddelelse som ikke er text og som "
-"ikke kan redigeres.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Næste _ulæste meddelelse"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vil du gemme ændringene?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Kunne ikke oprette kanal: %s"
+msgid "Don't Recover"
+msgstr "Fjern ikke"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kunne ikke gemme signaturfilen: %s"
+msgid "Recover"
+msgstr "Fjern"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kunne ikke gemme signaturfilen: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Forkast ændringer"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vil du gemme ændringene?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Fejl ved gemning af genveje."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Fjern ikke"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Advarsel: Ændret besked"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Fejl ved gemning af genveje."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Er du sikker på at du vil slette denne aftale uden titel?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Fjern"
+msgid "Discard Changes"
+msgstr "_Forkast ændringer"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Gem besked som..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Kunne ikke oprette kanal: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Næste _ulæste meddelelse"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Kunne ikke gemme signaturfilen: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Advarsel: Ændret besked"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Vedlæg en fil til beskeden"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12142,7 +12534,8 @@ msgstr ""
 "En fil med samme navn eksisterer allerede.\n"
 "Overskriv den?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Overskriv fil?"
 
@@ -12319,81 +12712,97 @@ msgstr "Vælg en tid at sammenligne med"
 msgid "_Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Fejl i regulært udtryk '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Mødeopdatering"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Du skal vælge en dato."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Distinguished _name:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Du skal angive et filnavn."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Fjerner mappe %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Tildeling"
+msgid "Missing folder."
+msgstr "Fjerner mappe %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Du skal angive en mappe."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Ingen server er valgt"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Fejl i regulært udtryk '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Du skal vælge en dato."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Tildeling"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Du skal give navn til dette filter."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Du skal give navn til denne vfolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Du skal angive et filnavn."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Du skal angive en mappe."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ingen server er valgt"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12406,66 +12815,11 @@ msgstr "Vælg en fil"
 msgid "<b>Then</b>"
 msgstr "<b>Udføres inden:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Vælg mappe"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Vigtig"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "At-gøre"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Senere"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Regelnavn: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Uden navn"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Udføres inden:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Udfør handlinger"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "hvis alle kriterier er mødt"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "hvis nogen betingelser er opfyldt"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "indkommende"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "udgående"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12558,6 +12912,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Senere"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Regelnavn: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Udføres inden:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "hvis alle kriterier er mødt"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "hvis nogen betingelser er opfyldt"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Udfør handlinger"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegeret"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Modtagere"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Svaret til"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Inkludér:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "indkommende"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "udgående"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12688,7 +13113,7 @@ msgstr "er ikke markeret med flag"
 msgid "Junk Test"
 msgstr "Juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12728,7 +13153,7 @@ msgstr "Afslut programmet"
 msgid "Play Sound"
 msgstr "Afspil lyd"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Læs"
 
@@ -12798,9 +13223,9 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stop behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12863,104 +13288,62 @@ msgstr "Emne indeholder ikke"
 msgid "Virtual _Folders"
 msgstr "Virtuelle mapper"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Tilføj"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Kilde for virtuel mappe"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigererindstillinger"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
-"hér"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurér dine e-post-konti her"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-post-kontoopsætnings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-post-komponent"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-post-redigering"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-post-redigereropsætnings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisning"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-post-indstillings-styreelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-post-konti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-post-indstillinger"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Kontonavn"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Navnløs"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Sprog"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Tilføj signatur"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Videresendt besked"
+
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Opret _virtuel mappe fra søgning..."
 
@@ -12998,274 +13381,454 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificér hvor mappen skal oprettes:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Virtuelle mapper "
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Indbakke"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Indlæser..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Flyt"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Annullér opgave"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vælg mappe"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopier"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Opret en ny mappe"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Ændr navn på mappe \"%s\" til:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Ændr navn på mappe"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Åbn i nyt vindue"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Flyt"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Omdøb"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "Virtuelle mapper "
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Indbakke"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_edigér som ny besked..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "S_kriv ud"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Føl_g op..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Marker færdi_ge med flag"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Neutralis_er flag"
 
-#: mail/em-folder-view.c:787 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 "Mar_kér som læst"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Markér som uvi_gtig"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulæst"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markér som v_igtig"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Fortryd sletning"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Fl_yt til mappe..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiér til mappe..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Tilføj afsenderen til adresse_bogen"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Anvend filtre"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filterregler"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Ska_b regel fra meddelelse"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Virtuel mappe for e_mnet"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Virtuel mappe for afse_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Virtuel mappe for modtage_re"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Virtuel mappe på e-post-_liste"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "Virtuel mappe for afse_nder"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på em_ne"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrér på afsen_der"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrér på modta_gere"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrér på e-_postliste"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtrér på afsen_der"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Udskriv besked"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiér henvisning"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik for at tilføje en opgave"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Fra"
+
+#: 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 "Svar-til"
+
+#: 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 "Til"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s-bilag"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Et ikke understøttet skema"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Kan ikke verificere bladsignatur"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan ikke verificere bladsignatur"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Klik for at tilføje en opgave"
+msgid "Retrieving `%s'"
+msgstr "Henter besked %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tildelt"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Redigér signatur"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Redigér signatur"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Afbrudt"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "Kryptér med PGP"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Fejludformet del for ekstern-krop."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Peger til FTP-server (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Peger til lokal fil (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Peger til eksterne data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Flytter beskeder"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. 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 ""
+
+#. 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
@@ -13273,282 +13836,126 @@ msgstr "Klik for at tilføje en opgave"
 msgid "Matches: %d"
 msgstr "Træffere:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Tildelt"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Redigér signatur"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Redigér signatur"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Afbrudt"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "Kryptér med PGP"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikatet er ikke gyldigt endnu"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Overskredet:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d. %B %Y %H:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Vis indlejret"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Skjul"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d af %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Henter besked %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Fejludformet del for ekstern-krop."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Peger til FTP-server (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Peger til lokal fil (%s) gyldig på netsted \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Peger til lokal fil (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Peger til eksterne data (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Peger til ukendt ekstern data (\"%s\"-type)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Flytter beskeder"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Fra"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc:"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilag"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunne ikke læse MIME-besked. Viser ren beskedstekst."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Et ikke understøttet skema"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Kan ikke verificere bladsignatur"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Kan ikke verificere bladsignatur"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Hver år"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_En dag"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "_En uge"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "E_n måned"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13556,26 +13963,58 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Kunne ikke cache %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Finder ikke mappe: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Kunne ikke cache %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Kan ikke kopiere filhandtag: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, 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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
 
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Gem som..."
@@ -13585,99 +14024,83 @@ msgstr "Gem som..."
 msgid "untitled_image.%s"
 msgstr "Besked uden titel"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til sender"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Åbn henvisning i netlæser"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Send _besked til liste..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Tilføj afsenderen i adressebogen"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Åbn i %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Denne server understøtter ikke LDAPv3-schemainformation"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:637 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 "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Venligst vælg en server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Ingen server er valgt"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Vis ikke denne besked igen."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Videresendt besked"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d kl. %H:%M skrev %%s:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Besked"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gem besked som..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "E-post fra %s"
@@ -13697,11 +14120,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13814,164 +14237,165 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "E-post-konti"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "E-post-konti"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Udfør handlinger"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Standardprioritet:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Notifikation om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Notifikation om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "_Spørg når HTML-meddelelser sendes til kontakter som ikke vil have dem"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Spørg når der sendes meddelelser kun med blindkopimodtagere"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14027,8 +14451,9 @@ msgid "Spell check inline"
 msgstr "Stave_kontrol"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Standardprioritet:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14171,33 +14596,64 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importér"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution elm-importering"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape-Mail-importering"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Redigererindstillinger"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook-Express-4-importering"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurér e-post-indstillinger, inklusive sikkerhed og meddelelsesvisning, "
+"hér"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importering"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfigurér stavekontrol, signaturer, og meddelelseredigeringen hér"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importering"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfigurér dine e-post-konti her"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-post-kontoopsætnings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolutions e-post-komponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-post-redigering"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-post-redigereropsætnings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-post-indstillings-styreelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-post-konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "E-post-indstillinger"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_E-post"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14205,15 +14661,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Venligst vent"
 
@@ -14245,19 +14701,47 @@ msgid "Select folder to import into"
 msgstr "Vælg importør"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importerer"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importerer filer"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution elm-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape-Mail-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook-Express-4-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importering"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Søger i %s"
@@ -14267,7 +14751,7 @@ msgstr "Søger i %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14293,7 +14777,7 @@ msgstr ""
 "Kontroller de importerede filtre for at sikre dig at\n"
 "alting stadigvæk fungerer som tiltænkt."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14305,7 +14789,7 @@ msgstr ""
 "tråd\", som ikke understøttes i Evolution.\n"
 "Disse filtre vil blive forkastet."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14319,24 +14803,24 @@ msgstr ""
 "ændredes til at teste hvorvidt strengen findes\n"
 "eller ikke findes i meddelelseteksten."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importerer dine gamle data fra Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-post-filtre"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14370,128 +14854,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Kontoredigering for Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Vært:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Bruger_navn:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "S_ti:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "E-post til %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post fra %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s e-post-liste"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Svaret til"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Tilføj filterregel"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d valgte"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d usendte"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Skitser"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sendte"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendte"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d usendte"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d valgte"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Ny e-post-besked"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Send _besked"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-post-meddelelse"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-post-filtre"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Opret en ny mappe"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URIen som kalenderen skal vise"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Tjekker tjeneste"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Kobler til server..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14501,12 +14996,12 @@ msgstr ""
 "nedenfor er ikke obligatoriske, medmindre du ønsker at inkludere "
 "informationen i den e-post du sender."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Modtager post"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14515,15 +15010,15 @@ msgstr ""
 "ikke er sikker bør du spørge din systemadministrator eller "
 "Internetleverandør."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Venligst vælg mellem følgende alternativer"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Sender post"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14531,11 +15026,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Håndtering af konti"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14548,14 +15043,6 @@ msgstr ""
 "angav samles til en Evolution-epostkonto. Angiv et navn for denne konto "
 "nedenfor. Dette navn anvendes kun til visning."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Tjekker tjeneste"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Kobler til server..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14874,7 +15361,8 @@ msgid "Execute Command..."
 msgstr "Kør kommando..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Fast _bredde:"
 
 #: mail/mail-config.glade.h:82
@@ -15202,350 +15690,455 @@ msgstr "farve"
 msgid "description"
 msgstr "beskrivelse"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autenticering"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP-serveren %s understøtter ikke den ønskede godkendelsestype %s."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil slette denne konto?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Fjern alle slettede beskeder fra alle mapper permanent"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Du sender et HTML-formaterat brev. Sørg for at følgende\n"
+"modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
+msgid "_Send"
+msgstr "Send"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Er du sikker på at du vil sende alle %d beskederne igen?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikke kopiere mappe: %s"
+msgid "Use default drafts folder?"
+msgstr "Åbner standardopgavemappen"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Finder ikke mappe: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Kunne ikke åbne skitse-mappen for denne konto.\n"
+"Vil du bruge standard skitse-mappe?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Kunne ikke oprette midlertidigt katalog: %s"
+msgid "Use _Default"
+msgstr "Standard"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Kan ikke oprette kataloget\n"
-"%s\n"
-"Fejl: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Er du sikker på at du vil åbne alle %d beskeder i separate vinduer?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Kunne ikke slette mappe:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
+msgid "_Expunge"
+msgstr "_Fjern slettede beskeder"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Mappen `%s' eksisterer ikke."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Fjern alle slettede beskeder fra alle mapper permanent"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikke flytte mappe: %s"
+msgid "_Empty Trash"
+msgstr "_Tøm affaldskurven"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Kunne ikke åbne den delte mappe: %s."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Kunne ikke åbne den delte mappe: %s."
+msgid "Error while {0}."
+msgstr ""
+"Fejl under '%s':\n"
+"%s"
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan ikke åbne besked"
+msgid "Error while performing operation."
+msgstr ""
+"Fejl under udførsel af operation:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
+msgid "Enter password."
+msgstr "Indtast adgangskode"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Fejl under indlæsning af filter-information:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan ikke oprette katalog %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Kan ikke gemme til \"%s\":\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Tilføj signatur"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Kan ikke oprette kataloget\n"
+"%s\n"
+"Fejl: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Kunne ikke gemme signaturfilen: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Slet \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Slet valgte kontakter"
+msgid "Cannot create temporary save directory."
+msgstr "Kunne ikke oprette midlertidigt katalog: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Forkast ændringer"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Vil du gemme ændringene?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Slet ikke"
+msgid "File exists but cannot overwrite it."
+msgstr "Filen eksisterer, overskriv?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Indtast adgangskode"
+msgid "File exists but is not a regular file."
+msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Fejl under indlæsning af filter-information:\n"
+"Kunne ikke slette mappe:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Fejl under udførsel af operation:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan ikke slette mappe: %s: Ingen sådan mappe"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Fejl under '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Filen eksisterer, overskriv?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan ikke ændre navn på mappe: %s: Ingen sådan mappe"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Filen \"%s\" findes ikke eller er ingen almindelig fil."
+msgid "Delete \"{0}\"?"
+msgstr "Slet \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Skal mappen \"%s\" virkelig fjernes?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autenticering"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kan ikke flytte mappe: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Kunne ikke åbne den delte mappe: %s."
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Kan ikke åbne besked"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Kan ikke kopiere mappe: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Du sender et HTML-formaterat brev. Sørg for at følgende\n"
-"modtagere ønsker, og kan modtage, HTML-formateret e-post:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Finder ikke mappe: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Skal mappen \"%s\" virkelig fjernes?"
+msgid "Cannot open source \"{1}\""
+msgstr "Kunne ikke åbne den delte mappe: %s."
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Du har ikke udfyldt al nødvendig information."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Du kan ikke oprette to konti med samme navn."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Slet valgte kontakter"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil slette denne konto?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Følgende vFolder(e):\n"
-"%sBrugte fjernet mappe:\n"
-"    '%s'\n"
-"Og er blevet opdateret."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Slet ikke"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Følgende vFolder(e):\n"
-"%sBrugte fjernet mappe:\n"
-"    '%s'\n"
-"Og er blevet opdateret."
+msgid "Could not save signature file."
+msgstr "Kunne ikke gemme signaturfilen: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Tilføj signatur"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Forkast ændringer"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP-serveren %s understøtter ikke den ønskede godkendelsestype %s."
+msgid "Do you wish to save your changes?"
+msgstr "Vil du gemme ændringene?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15553,85 +16146,97 @@ msgstr ""
 "\n"
 "Vil du gemme ændringene?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kunne ikke åbne skitse-mappen for denne konto.\n"
-"Vil du bruge standard skitse-mappe?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Standard"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Forkast ændringer"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Åbner standardopgavemappen"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Du har ikke udfyldt al nødvendig information."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har usendte meddelelser, vil du afslutte alligevel?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Du kan ikke oprette to konti med samme navn."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Mappen `%s' eksisterer ikke."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Forkast ændringer"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "_Tøm affaldskurven"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Følgende vFolder(e):\n"
+"%sBrugte fjernet mappe:\n"
+"    '%s'\n"
+"Og er blevet opdateret."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Fjern slettede beskeder"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Send"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Følgende vFolder(e):\n"
+"%sBrugte fjernet mappe:\n"
+"    '%s'\n"
+"Og er blevet opdateret."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Overskriv"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -15640,135 +16245,135 @@ msgstr "Pinger %s"
 msgid "Working"
 msgstr "Arbejder"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrerer mappe"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Henter e-post"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Kunne ikke gemme post i midlertidig fil %s: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender besked %d af %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Kunne ikke afkode besked."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Fuldført."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gemmer besked til mappe"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flytter beskeder til %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer beskeder til %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanner mapper i \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Videresendte beskeder"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Åbner lager %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjerner mappe %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Gemmer mappe '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Opfrisker mappe"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Fjerner slettede beskeder fra mappe"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importerer %s som %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Henter besked %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15777,7 +16382,7 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15786,11 +16391,11 @@ msgstr ""
 "Fejl under gemning af beskeder til: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Gemmer bilag"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15799,17 +16404,17 @@ msgstr ""
 "Kunne ikke oprette uddatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kan ikke skrive data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kobler fra %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Kobler til %s igen"
@@ -15874,24 +16479,24 @@ msgstr "Opdaterer..."
 msgid "Waiting..."
 msgstr "Venter..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Operation afbrudt af bruger."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Indtast adgangskode for %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Indtast adgangskode"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "Husk denne adgangs_kode"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Husk denne adgangskode for resten af denne session"
 
@@ -15933,89 +16538,94 @@ msgstr "Videresendt besked"
 msgid "Invalid folder: `%s'"
 msgstr "Åbner mappe %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Opsætter vmappe: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Opdaterer vfoldere for URI: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Opdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Rediger Virtuel mappe"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Ny Virtuel mappe"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Ulæst"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Læst"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Besvaret"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Flere ulæste beskeder"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Flere beskeder"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Højere"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Højest"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "I dag %H:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "I går %H:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Genererer beskedsliste"
 
@@ -16047,43 +16657,43 @@ msgstr "Modtaget"
 msgid "Size"
 msgstr "Størrelse"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Videresend ikke"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Følg op"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "For information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Videresend"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Intet svar krævet"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 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 "Svar til alle"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Gennemse"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag at følge op"
 
@@ -16128,20 +16738,6 @@ msgstr "_Abonnér"
 msgid "_Unsubscribe"
 msgstr "_Fjern abonnement"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution skallen"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolutions testkomponent"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16149,111 +16745,55 @@ msgstr "380"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Omdøb denne genvejsgruppe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Slå visning af mappelinjen fra/til"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Skjul genvejslinjen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolution e-post-opsætningsgrænseflade"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Markér bilaget til at blive vist indlejret som standard."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Åbner standardopgavemappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Åbner standardopgavemappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Åbner standardopgavemappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Åbner standardopgavemappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Slå visning af mappelinjen fra/til"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Slå visning af genvejslinjen fra/til"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-post"
@@ -16262,6 +16802,32 @@ msgstr "E-post"
 msgid "Brought to you by"
 msgstr "Bragt til dig af"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Ukendt fejl"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Ugyldige argumenter"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Kan ikke registrere i OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatabase ikke fundet"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generisk fejl"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Uden navn)"
@@ -16402,11 +16968,11 @@ msgstr "gpg kunne ikke udføres."
 msgid "_Import"
 msgstr "Importér"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Lukker forbindelser..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Indstillinger for Evolution"
 
@@ -16443,12 +17009,34 @@ msgstr "Mappenavn kan ikke indeholde følgende tegn \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' og '..' er reserverede mappenavne."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-post til %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Fejl under kørsel af %s."
@@ -16462,14 +17050,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke køres."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Om Ximian Evolution..."
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Arbejd tilkoblet"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Ar_bejd frakoblet"
 
@@ -16477,46 +17066,6 @@ msgstr "Ar_bejd frakoblet"
 msgid "Work Offline"
 msgstr "Arbejd frakoblet"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution er i færd med at koble fra."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Ugyldige argumenter"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Kan ikke registrere i OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatabase ikke fundet"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generisk fejl"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Afkrydsningsboks"
@@ -16590,6 +17139,43 @@ msgstr "Aktive opkoblinger"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik o.k. for at lukke disse forbindelser og gå frakoblet"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakter: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_E-post:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Opgaver:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Mappe_type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Åbn en anden brugers mappe"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mappenavn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Bruger:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Opsætningsassistent for Evolution"
@@ -16632,6 +17218,20 @@ msgstr ""
 "\n"
 "Klik på knappen \"Afslut\" for at gemme dine indstillinger. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skallen"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolutions testkomponent"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Importér\" for at starte import af filen til Evolution."
@@ -16696,13 +17296,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16735,58 +17335,49 @@ msgstr ""
 "vi\n"
 "venter med spænding på dine bidrag!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Tack\n"
 "Ximians Evolution-hold\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Fortæl mig det ikke igen"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Kan ikke tilgå Ximian Evolution-skallen."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Start i frakoblet tilstand"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Start i opkoblet tilstand"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Gennemtving opgradering af konfigurationsfiler fra Evolution 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Send fejlsøgingsudskrift for alle komponenterne til en fil."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16795,14 +17386,80 @@ msgstr ""
 "%s: --online og --offline kan ikke bruges sammen.\n"
 "  Brug %s --help for mere information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Kan ikke tilgå Ximian Evolution-skallen."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution kontoassistent"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
@@ -17055,12 +17712,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kort-ID eksisterer allerede"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17280,6 +17931,12 @@ msgstr "Emne er %s"
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfejl"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kort-ID eksisterer allerede"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17321,12 +17978,12 @@ msgstr "Standard-emne for beskeden"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kunne ikke udføre '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Lukker %s (%s) ned\n"
@@ -17390,7 +18047,8 @@ msgid "Select all contacts"
 msgstr "Vælg alle kontakter"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Send en besked til valgte kontakter."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17422,8 +18080,8 @@ msgstr "Vis den aktuelle kontakt"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "H_andlinger"
@@ -17441,7 +18099,8 @@ msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindue"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Gem _som VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17572,11 +18231,21 @@ msgstr "Vis den aktuelle kontakt"
 msgid "Week"
 msgstr "Uge"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Arbejdsuge"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Møde"
 
+#: 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 "_Luk"
+
 #: 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
@@ -17899,6 +18568,16 @@ 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
+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
+msgid "_Close"
+msgstr "L_uk"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18145,7 +18824,8 @@ msgid "Open the selected message in a new window"
 msgstr "Åbn valgt besked i et nyt vindue"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Åbn valgt besked i redigeringsvinduet for at sende den igen"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18263,58 +18943,46 @@ msgstr "Virtuel mappe for e_mne..."
 msgid "_Attached"
 msgstr "_Vedlagt"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiér til mappe"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Opret filter fra besked"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inlejret"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Beskedsvisning"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Flyt til mappe"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Næste meddelelse"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Åbn besked"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Foregående meddelelse"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citeret"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Send igen..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Værktøjer"
@@ -18323,16 +18991,6 @@ msgstr "_Værktøjer"
 msgid "_Undelete"
 msgstr "Fortryd sletning"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "L_uk"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Vedlæg"
@@ -18730,6 +19388,11 @@ msgstr "E-post-indstillinger"
 msgid "_Send / Receive"
 msgstr "_Send / modtag"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Søg nu"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Efter _firma"
@@ -18803,10 +19466,6 @@ msgstr "Fær_dig-dato:"
 msgid "With _Status"
 msgstr "Sæt status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Opgaver"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18966,6 +19625,34 @@ msgstr "Andre..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution fejl"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution e-post"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Mødeinformation"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution sammenfatning"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Sendte beskeder og udkast"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19085,6 +19772,35 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Find nu "
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 eksisterer allerede\n"
+"Vil du overskrive den?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Kan ikke gemme til \"%s\":\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Kan ikke gemme til \"%s\":\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19095,9 +19811,132 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fuldført)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution adressebog - mappevisning"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Adressebog"
+#~ msgid "Address 2:"
+#~ msgstr "Adresse _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bologna"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution kalendervisning"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution opgavevisning"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Kunne ikke initiere gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Kunne ikke åbne mappen i \"%s\""
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URIen som kalenderen skal vise"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Typen af visning der skal bruges"
+
+#~ msgid "Display a message"
+#~ msgstr "Vis en besked"
+
+#~ msgid "Alerts"
+#~ msgstr "Advarsler"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "_General"
+#~ msgstr "_Generelt"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Vælg importør"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalender"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Opgaveliste"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalenderfilen kunne ikke opdateres!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URIen til opgavemappen, der skal vises"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Kunne ikke indlæse opgaverne i `%s'"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution e-post-mappevisning"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "Virtuel mappe for afse_nder"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrér på afsen_der"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Kunne ikke cache %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Kunne ikke cache %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Mislykkedes med at oprette rør til \"%s\": %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URIen som kalenderen skal vise"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Omdøb denne genvejsgruppe"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Skjul genvejslinjen"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Åbner standardopgavemappen"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Åbner standardopgavemappen"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Åbner standardopgavemappen"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Åbner standardopgavemappen"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Slå visning af mappelinjen fra/til"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Slå visning af genvejslinjen fra/til"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Kan ikke initiere Ximian Evolution-skallen: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Send igen..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19281,9 +20120,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "S_pouse:"
 #~ msgstr "Ægte_fælle:"
 
-#~ msgid "_Add"
-#~ msgstr "_Tilføj"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Arbejde"
@@ -19408,18 +20244,6 @@ msgstr "%s (%d%% fuldført)"
 #~ "finde\n"
 #~ "denne information."
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Sta_rt dato:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "Fær_dig-dato:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioritet:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19451,13 +20275,6 @@ msgstr "%s (%d%% fuldført)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikke kopiere filhandtag: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19606,10 +20423,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Forhåndsviser kalenderen som skal skrives ud"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Indtast adgangskode for %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Opgaveliste"
 
@@ -19668,30 +20481,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Kan ikke oprette den angivne delte mappe."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alender:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_E-post:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Opgaver:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Mappe_type:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Åbn en anden brugers mappe"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mappenavn:"
-
-#~ msgid "_User:"
-#~ msgstr "_Bruger:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Opret en ny mødeindkaldelse"
@@ -20001,9 +20790,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Assistent"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Følgende forbindelser er aktive:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Søg efter kontakter"
 
@@ -20237,9 +21023,6 @@ msgstr "%s (%d%% fuldført)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "Denne besked er digitalt signeret, men kan ikke findes autentisk."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution fejl"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20369,18 +21152,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgstr "Kalenderinformation"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Påmindelser"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Begynder:</b>"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Kalenderinformation"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klassificering"
 
@@ -21426,9 +22197,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Konfigurér udseendet af Evolution-sammenfatningerne."
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolution sammenfatning"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolution sammenfatningskomponent."
 
@@ -21831,9 +22599,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Asia"
 #~ msgstr "Asien"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22884,9 +23649,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22950,9 +23712,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25935,9 +26694,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28742,9 +29498,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Shown"
 #~ msgstr "Viste"
 
-#~ msgid "No tasks"
-#~ msgstr "Ingen opgaver"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Ingen beskrivelse)"
 
@@ -29831,9 +30584,6 @@ msgstr "%s (%d%% fuldført)"
 #~ msgid "Delete news feed"
 #~ msgstr "Fjern nyhedskilde"
 
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-
 #~ msgid "_Weather"
 #~ msgstr "_Vejr"
 
diff --git a/po/de.po b/po/de.po
index 00f568782e..44db5f67b4 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -31,6 +31,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution-Adressbuch"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakte: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution-Alarm"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -55,16 +65,6 @@ msgstr "Karten"
 msgid " card"
 msgstr "Karten"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakte: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution-Alarm"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Voreingestellte Synchronisierungsadresse:"
@@ -79,63 +79,20 @@ msgstr "Adressbuch konnte nicht geladen werden"
 msgid "Could not read pilot's Address application block"
 msgstr "Adress-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Auto-Vervollständigung"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Zertifikate"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution-Adressbuch"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adress-Popup-Fenster des Evolution-Adressbuchs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-Adressbuch-Adressbetrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution-Adressbuch-Komponente"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-Adressbuch-Ordnerbetrachter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution-S/MIME-Bedienelement zur Zertifikatverwaltung"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonymer Zugriff auf LDAP-Server"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-Ordnern"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Legitimation gescheitert.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Hier können Sie Ihre S/MIME-Zertifikate verwalten"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPasswort für %s (Benutzer %s) eingeben"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -176,41 +133,45 @@ msgstr "_Kontakte:"
 msgid "Create a new contacts group"
 msgstr "Eine neue Verknüpfungsgruppe anlegen"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Fehler beim Abrufen der Schemainformationen"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrationsvorgang..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "»%s« wird migriert:"
@@ -218,8 +179,8 @@ msgstr "»%s« wird migriert:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Auf diesem Computer"
 
@@ -227,7 +188,7 @@ msgstr "Auf diesem Computer"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Persönlich"
@@ -293,20 +254,44 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonymer Zugriff auf LDAP-Server"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Legitimation gescheitert.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Neues Adressbuch"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sPasswort für %s (Benutzer %s) eingeben"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -328,6 +313,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI des zuletzt im Namenswähler verwendeten Ordners"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Auto-Vervollständigung"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Zertifikate"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Hier können Sie die Auto-Vervollständigung konfigurieren"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution-Adressbuch"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adress-Popup-Fenster des Evolution-Adressbuchs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-Adressbuch-Adressbetrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-Adressbuch-Minikarten-Betrachter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution-Adressbuch-Komponente"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution-S/MIME-Bedienelement zur Zertifikatverwaltung"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-Ordnern"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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"
@@ -349,6 +389,7 @@ msgstr "  Unterstützte Basen _anzeigen"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -421,7 +462,7 @@ msgstr "_Kontakte:"
 msgid "Address Book Properties"
 msgstr "Adressbucheigenschaften"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Immer"
@@ -436,108 +477,98 @@ msgid "Basic"
 msgstr "Grundlegend"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Farben"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Eindeutiger _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Eindeutiger _Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Download-Begrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Unterstützte Suchbasen"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allgemein"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nie"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Eins"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Eine Farbe auswählen"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Suchb_ereich: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Suchbasis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Suchbasis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Suchb_ereich: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Suchen"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -547,7 +578,7 @@ msgstr ""
 "mit Ihrem\n"
 "LDAP-Server her, falls dieser SSL oder TLS unterstützt."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -564,7 +595,7 @@ msgstr ""
 "Ihre Verbindung bereits\n"
 "sicher ist."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -578,19 +609,19 @@ msgstr ""
 "Sie anfällig\n"
 "für Sicherheitslücken sind. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Unterstützte Suchbasen"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -602,7 +633,7 @@ msgstr ""
 "Wenn Sie dieses Feld leer lassen, beginnt die Suche an der Wurzel des "
 "Verzeichnisbaums."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -618,7 +649,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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -626,7 +657,7 @@ msgstr ""
 "Dies ist der vollständige Name des LDAP-Servers. Zum Beispiel: »ldap."
 "meinefirma.de«."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -636,7 +667,7 @@ 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:63
+#: 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 "
@@ -646,7 +677,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -656,7 +687,7 @@ msgstr ""
 "angezeigt wird.\n"
 "Er dient lediglich zu Anzeigezwecken. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -668,128 +699,135 @@ msgstr ""
 "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:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Zeitformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TSL verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Eindeutigen Namen (EN) verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "E-Mail-Adresse verwenden"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Immer, wenn möglich"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Download-Begrenzung:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-Mail-Adresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Anmeldemethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Port-Nummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Priorität:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Such_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Servername:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Zeitüberschreitung (Minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Sichere Verbindung (_SSL) verwenden:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "Karten"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "Minuten"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Alle Entfernen"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Entfernen"
 
+#: 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 "Name"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Alle Entfernen"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Kontaktliste anzeigen"
@@ -812,22 +850,15 @@ msgstr "Zu Kontakten hinzufügen"
 msgid "Unnamed Contact"
 msgstr "Namenloser Kontakt"
 
-#: 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
-msgid "Name"
-msgstr "Name"
-
 #: 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
 msgid "Source"
 msgstr "Quelle"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Oberfläche zur Auswahl eines Namens für Evolution-Adressbücher"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -894,143 +925,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresse _2"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Jahrestag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Geburtstag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Stadt:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Befehl:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontakteditor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Abteilung:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Verfügbarkeitsadresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Voller Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Privat"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN-Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-Mail-Adresse"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "S_pitzname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Notizen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: 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:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Weitere"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postfach:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1058,9 +1089,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Geschäftlich"
@@ -1093,23 +1124,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Sind Sie sicher, dass Sie\n"
+"diese Kontakte löschen wollen?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sind Sie sicher, dass Sie\n"
+"diesen Kontakt löschen wollen?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Editierbar"
 
@@ -2082,92 +2129,110 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Simbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL-Instant-Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo-Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Dienst"
-
-#: 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
-msgid "Location"
-msgstr "Ort"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Benutzername"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Quellbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Zielbuch"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Ist neuer Kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Beschreibbare Felder"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Geändert"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Dieser Kontakt gehört in folgende Kategorien:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
+
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL-Instant-Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo-Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Dienst"
+
+#: 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
+msgid "Location"
+msgstr "Ort"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Benutzername"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakt schnell hinzufügen"
@@ -2185,22 +2250,6 @@ msgstr "_Voller Name:"
 msgid "E-_mail:"
 msgstr "E-_Mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Sind Sie sicher, dass Sie\n"
-"diese Kontakte löschen wollen?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sind Sie sicher, dass Sie\n"
-"diesen Kontakt löschen wollen?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2"
@@ -2351,8 +2400,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Buch"
 
@@ -2414,6 +2463,451 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Komplexe Suche"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Listenmitglieder"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "E-Mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Beschreibung"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#, fuzzy
+msgid "Video Conferencing"
+msgstr "V_ideokonforenz-URL:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Autotelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Geschäftlich"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Persönlich"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Notiz"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Tätigkeit"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-Mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Homepage"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Erfolg"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Erlaubnis verweigert"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kontakt nicht gefunden"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Kontaktkennung existiert bereits"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protokoll nicht unterstützt"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Abgesagt"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Legitimation gescheitert"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Legitimation erforderlich"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Nachricht existiert nicht"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Anderer Fehler"
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
+"Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
+"erreichbar ist."
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
+"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
+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 ""
+"Ihre Abfrage führte zu mehr Treffern als dieser Server übertragen\n"
+"oder Evolution anzeigen darf. Bitte präzisieren Sie Ihre Suche\n"
+"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
+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 ""
+"Die für das Ausführen der Abfrage erforderliche Zeit hat das Zeitlimit des\n"
+"Servers oder das von Ihnen für dieses Adressbuch festgelegte überschritten.\n"
+"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
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Fehler beim Hinzufügen eines Kontakts"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Fehler beim Ändern einer Liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Fehler beim Ändern eines Kontakts"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Fehler beim Entfernen eines Kontakts"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"Das Öffnen von %d Kontakten würde dazu führen, dass %d\n"
+"zusätzliche Fenster geöffnet werden.\n"
+"Wollen Sie wirklich all diese Kontakte anzeigen?"
+
+# CHECK der Kontakt -> diesen?
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s existiert bereits\n"
+"Möchten Sie diesen überschreiben?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "Liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Kontakt verschieben nach"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Kontakt kopieren nach"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Kontakt verschieben nach"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Kontakte kopieren nach"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Kontakte aus dem Adressbuch wählen"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Mehrere VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard für %s"
+
+#.
+#. * 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 "(keine)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "E-Mail, primär"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-Mail 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-Mail 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Eine Aktion wählen"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Einen neuen Kontakt »%s« anlegen"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adresse zu bestehendem Kontakt »%s« hinzufügen"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Anfrage beim Adressbuch..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Kontaktinfo bearbeiten"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "E-Mail-Adresse einfließen lassen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "und eine weitere Karte."
+msgstr[1] "und eine weitere Karte."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Gesamte VCard anzeigen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Kompakt-VCard anzeigen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "In Adressbuch speichern"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Keine Kontake"
@@ -2428,8 +2922,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Abfrage"
 
@@ -2483,9 +2977,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Als VCard speichern"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2553,7 +3048,7 @@ msgid "Cut"
 msgstr "Ausschneiden"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2564,18 +3059,8 @@ msgstr "Kopieren"
 msgid "Paste"
 msgstr "Einfügen"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Löschen"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktuelle Ansicht"
 
@@ -2592,7 +3077,7 @@ msgstr ""
 "können"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Beliebige Kategorie"
@@ -2633,21 +3118,6 @@ msgstr "Kategorien"
 msgid "Company Phone"
 msgstr "Firmentelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-Mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-Mail 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-Mail 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Familienname"
@@ -2684,29 +3154,14 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Vorgesetzter"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Spitzname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Notiz"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Büro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisation"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Weiteres Fax"
@@ -2759,21 +3214,29 @@ msgstr "Einheit"
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Breite"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Höhe"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Hat Fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Gewählt"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Hat Cursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Feld"
@@ -2790,10 +3253,6 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximale Länge des Feldnamens"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Spaltenbreite"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2822,425 +3281,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Gewählt"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Hat Cursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Listenmitglieder"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "E-Mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Beschreibung"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Gruppe"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#, fuzzy
-msgid "Video Conferencing"
-msgstr "V_ideokonforenz-URL:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Autotelefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Geschäftlich"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Persönlich"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Tätigkeit"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Homepage"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Erfolg"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adressbuch existiert nicht"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Erlaubnis verweigert"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kontakt nicht gefunden"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Kontaktkennung existiert bereits"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokoll nicht unterstützt"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Abgesagt"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Legitimation gescheitert"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Legitimation erforderlich"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nachricht existiert nicht"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Anderer Fehler"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
-"Sie eine falschen URI eingegeben haben, oder dass der LDAP-Server nicht "
-"erreichbar ist."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Dieses Adressbuch konnte nicht geöffnet werden. Dies bedeutet entweder, dass "
-"Sie eine falsche URI eingegeben haben, oder dass der Server nicht erreichbar "
-"ist."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Das Adressbuch konnte nicht geöffnet werden"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Ihre Abfrage führte zu mehr Treffern als dieser Server übertragen\n"
-"oder Evolution anzeigen darf. Bitte präzisieren Sie Ihre Suche\n"
-"oder erhöhen Sie das Zeitlimit in den Einstellungen des\n"
-"Verzeichnis-Servers für dieses Adressbuch."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Die für das Ausführen der Abfrage erforderliche Zeit hat das Zeitlimit des\n"
-"Servers oder das von Ihnen für dieses Adressbuch festgelegte überschritten.\n"
-"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:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Diese Abfrage konnte nicht erfolgreich ausgeführt werden"
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
-
-# CHECK
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Verwerfen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Fehler beim Hinzufügen einer Liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Fehler beim Hinzufügen eines Kontakts"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Fehler beim Ändern einer Liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Fehler beim Ändern eines Kontakts"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Fehler beim Entfernen einer Liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Fehler beim Entfernen eines Kontakts"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Das Öffnen von %d Kontakten würde dazu führen, dass %d\n"
-"zusätzliche Fenster geöffnet werden.\n"
-"Wollen Sie wirklich all diese Kontakte anzeigen?"
-
-# CHECK der Kontakt -> diesen?
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s existiert bereits\n"
-"Möchten Sie diesen überschreiben?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Überschreiben"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "Liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Kontakt verschieben nach"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Kontakt kopieren nach"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Kontakt verschieben nach"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Kontakte kopieren nach"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Kontakte aus dem Adressbuch wählen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Mehrere VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard für %s"
-
-#.
-#. * 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 "(keine)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "E-Mail, primär"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Eine Aktion wählen"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Einen neuen Kontakt »%s« anlegen"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adresse zu bestehendem Kontakt »%s« hinzufügen"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Anfrage beim Adressbuch..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Kontaktinfo bearbeiten"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-Mail-Adresse einfließen lassen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "und eine weitere Karte."
-msgstr[1] "und eine weitere Karte."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Gesamte VCard anzeigen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Kompakt-VCard anzeigen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "In Adressbuch speichern"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Spaltenbreite"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3287,11 +3330,6 @@ msgstr "Evolution-vCalendar-Importeur"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Umschlag drucken"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Kontakte drucken"
@@ -3301,6 +3339,11 @@ msgstr "Kontakte drucken"
 msgid "Print contact"
 msgstr "Kontakt drucken"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Umschlag drucken"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 Punkt Tahoma"
@@ -3485,16 +3528,6 @@ msgstr "Kontaktdrucktest"
 msgid "This should test the contact print code"
 msgstr "Dies sollte die Kontaktdruck-Anwendungsroutinen testen"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Die angegebene Ausgabedatei statt der Standardausgabe verwenden"
@@ -3552,6 +3585,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fehler beim Laden des voreingestellten Adressbuchs."
@@ -3564,11 +3607,12 @@ msgstr "Eingabedatei"
 msgid "No filename provided."
 msgstr "Kein Dateiname angegeben."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Namenlose Liste"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
@@ -3600,120 +3644,56 @@ msgstr "Vorgabepriorität:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "ToDo-Anwendungsblock des Pilot konnte nicht gelesen werden"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
-"konfigurieren"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalender und Aufgaben"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Terminplan-Nachrichtenbetrachter des Evolution-Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-Kalenderbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-Kalender-/Aufgabeneditor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-Aufgabenbetrachter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution-Kalenderkomponente"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution-Aufgabenkomponente"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Aufgaben"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Beginnt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Endet:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution-Alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm am %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "S_chließen"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Schlummer"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Schlummerzeit (Minuten)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "Termin _bearbeiten"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Schlummer"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Öffnen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Keine Beschreibung verfügbar."
 
 # CHECK
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3725,12 +3705,12 @@ msgstr ""
 "%sBeginnt um %s\n"
 "Endet um %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Warnung"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3743,7 +3723,7 @@ msgstr ""
 "Evolution wird stattdessen ein normales\n"
 "Erinnerungsdialogfenster anzeigen."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3760,19 +3740,19 @@ msgstr ""
 "\n"
 "Sind Sie sicher, dass Sie dieses Programm ausführen wollen?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Nicht mehr nach diesem Programm fragen."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-Kalender-Alarmbenachrichtigungsdienst"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo konnte nicht initialisiert werden"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs konnte nicht initialisiert werden"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Fabrik für Alarmbenachrichtigungsdienst konnte nicht erstellt werden"
 
@@ -3883,58 +3863,42 @@ msgid "Weekday the week starts on"
 msgstr "Wochentag, mit dem die Woche beginnt"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Beim Löschen von Terminen rückfragen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Beim Säubern eines Ordners rückfragen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Abgeschlossene Aufgaben verbergen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Eine Vorgaberinnerung für Ereignisse festlegen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Zeiten im 24-Stunden- und nicht im »AM/PM«-Format anzeigen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Wochennummern im Datumsnavigator anzeigen"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Zusammenfassung enthält"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Beschreibung enthält"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Kommentar enthält"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Beschreibung enthält"
-
-# CHECK
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Nicht einsortiert"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3943,122 +3907,132 @@ msgstr ""
 "Dieser Vorgang löscht alle Ereignisse, die älter als der angegebene Zeitraum "
 "sind. Falls Sie fortfahren, können Sie diese Aufgaben nicht wiederherstellen."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Ereignisse löschen älter als"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "Tage"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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. %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Der Kalender »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
 "fortfahren möchten?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Eigenschaften..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Kalender wird geladen..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Der Kalender »%s« konnte nicht zum Anlegen von Ereignissen und Treffen "
 "geöffnet werden"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Es ist kein Kalender zum Anlegen von Ereignissen und Treffen verfügbar"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Neuer Termin"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Einen neuen Termin anlegen"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Besprechung"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Eine neue Besprechungsanfrage anlegen"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Neuer Ganztagstermin"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Ganztagstermin"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Einen neuen ganztätigen Termin anlegen"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Neuer Kalender"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "Ka_lender"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Einen neuen Kalender anlegen"
 
@@ -4088,15 +4062,37 @@ msgstr "Wochenansicht"
 msgid "Month View"
 msgstr "Monatsansicht"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Zusammenfassung enthält"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Beschreibung enthält"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Kommentar enthält"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Beschreibung enthält"
+
+# CHECK
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Nicht einsortiert"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fehler beim Öffnen des Kalenders"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Methode beim Öffnen des Kalenders nicht unterstützt"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 
@@ -4105,19 +4101,6 @@ msgstr "Erlaubnis zum Öffnen des Kalenders verweigert"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "Der URI, den der Kalender anzeigen wird"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Typ der anzuzeigenden Ansicht"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Audio-Alarmeinstellungen"
@@ -4183,7 +4166,7 @@ msgstr "weitere Male alle"
 msgid "hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Aktion/Auslöser"
 
@@ -4202,14 +4185,14 @@ msgstr "Grundlegend"
 msgid "Date/Time:"
 msgstr "Datum/Zeit:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Eine Nachricht anzeigen"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Einen Klang abspielen"
 
+#: 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 "Erinnerung"
@@ -4224,6 +4207,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
 msgid "Summary:"
 msgstr "Zusammenfassung:"
@@ -4262,10 +4246,107 @@ msgstr "Minute(n)"
 msgid "start of appointment"
 msgstr "Beginn des Termins"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Die Gruppe »%s« ist entfernt. Sie müssen einen Ort angeben, von dem der "
+"Kalender abgerufen werden soll"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Neuen Kalender hinzufügen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Aufgabenlistengruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Neuen Kalender hinzufügen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "Wochen"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Aktiv"
 
@@ -4279,19 +4360,19 @@ msgstr "Nicht entfernen"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Deaktivieren"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aktivieren"
 
@@ -4316,162 +4397,176 @@ msgid "60 minutes"
 msgstr "60 Minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alarme"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Fällig:</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Fällig:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Aufgabenlisteneinstellungen</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Fällig:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Fällig:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- und Aufgaben-Einstellungen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Farbe für überfällige Aufgaben"
 
-#: 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 "Farbe für heute fällige Aufgaben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Tag _endet:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Tage"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Anzeigen"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Aktivieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Freitag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Montag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Samstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Eine _Erinnerung anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "_Wochennummern im Datumsnavigator anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Sonntag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Heute fällige _Aufgaben:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "D_o"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Aufgabenliste"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Donnerstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Zeit"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Zeit_zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Zeitformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Dienstag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "W_oche beginnt:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Mittwoch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Arbeitswoche"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Arbeitstage:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 Stunden (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 Stunden"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "URL _hinzufügen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Beim _Löschen von Objekten rückfragen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Wochenenden in Monatsansicht _komprimieren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Tag beginnt:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Anzeigen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4481,142 +4576,46 @@ msgstr "_Anzeigen"
 msgid "_Edit"
 msgstr "_Bearbeiten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Verfügbarkeitsinformationen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Fr"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Allgemein"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Erledigte Aufgaben _verbergen nach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Mo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Überfällige Aufgaben:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "S_a"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Endzeiten von Terminen in Wochen- und Monatsansichten anzeigen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Zeit-_Unterteilungen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Di"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "M_i"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "vor jedem Termin"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Der Quellort »%s« ist nicht wohlgeformt."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Die Gruppe »%s« ist entfernt. Sie müssen einen Ort angeben, von dem der "
-"Kalender abgerufen werden soll"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Neuen Kalender hinzufügen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Aufgabenlistengruppe"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendereigenschaften"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Neuen Kalender hinzufügen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Typ:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "Wochen"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4703,81 +4702,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Sie haben keine Änderungen vorgenommen, den Editor aktualisieren?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validierungsfehler: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " bis "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Abgeschlossen "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Fällig am "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Fällig am "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Objekt konnte nicht aktualisiert werden"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Termin bearbeiten"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Aufgabe - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaleintrag - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Keine Zusammenfassung"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Speichern unter..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "An diesem Objekt vorgenommene Änderungen verfallen möglicherweise, sobald "
 "Aktualisierungen eintreffen"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Aktuelle Version konnte nicht verwendet werden!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validierungsfehler: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " bis "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Abgeschlossen "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Fällig am "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Fällig am "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4909,27 +4908,27 @@ msgstr "Delegieren an:"
 msgid "Enter Delegate"
 msgstr "Delegaten eingeben"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Erinnerung"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Wiederholung"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Planung"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Besprechung"
 
@@ -4942,7 +4941,7 @@ msgstr "Das Fälligkeitsdatum liegt vor dem Anfangsdatum!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Das Anfangsdatum ist falsch"
 
@@ -5028,10 +5027,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5050,15 +5049,15 @@ msgstr "Es ist ein Organisator erforderlich."
 msgid "At least one attendee is required."
 msgstr "Es ist mindestens ein Teilnehmer erforderlich."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegieren an..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5337,28 +5336,20 @@ msgstr "Änderungen _verwerfen"
 msgid "Save Event"
 msgstr "Ereignis speichern"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-#, fuzzy
-msgid "Select source"
-msgstr "Wählen Sie einen Importeur"
-
 # CHECK
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Wählen Sie eine Zielquelle"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalender"
+msgid "_Destination"
+msgstr "_Entwurfsordner:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Neue Aufgabenliste"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Aufgabenliste"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5391,38 +5382,44 @@ msgid "% _Complete"
 msgstr "% _abgeschlossen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Abgeschlossen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Hoch"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "In Bearbeitung"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Niedrig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nicht begonnen"
 
@@ -5458,11 +5455,11 @@ msgstr "_Website:"
 msgid "Assignment"
 msgstr "Arbeitsauftrag"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Das Fälligkeitsdatum ist falsch"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
@@ -5471,8 +5468,9 @@ msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
 msgid "Con_fidential"
 msgstr "_Vertraulich"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Beschreibung:"
@@ -5619,102 +5617,53 @@ msgstr "%s um %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s für einen unbekannten Auslösertyp."
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Öffentlich"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Vertraulich"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Anfangsdatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Zusammenfassung"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Frei"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Beschäftigt"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Klicken Sie hier, um %s zu öffnen"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Namenlos"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "O"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Anfangsdatum:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Fällig am:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Die geographische Position muss in diesem Format eingegeben werden: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Priorität:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nein"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Website:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unbekannt"
+#: 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 "Öffentlich"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Wiederkehrend"
+#: 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 "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Zugewiesen"
+#: 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 "Vertraulich"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5760,17 +5709,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Frei"
+
+#: 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 "Beschäftigt"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Gewählte Objekte werden gelöscht"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "Ö_ffnen"
 
@@ -5779,41 +5737,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Drucken..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "E_infügen"
 
@@ -5871,79 +5830,159 @@ msgstr "Priorität"
 msgid "Start date"
 msgstr "Anfangsdatum"
 
+#: 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 "Zusammenfassung"
+
 # CHECK
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Aufgabensortierung"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Neuer _Termin..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Neues _ganztägiges Ereignis"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Neue Besprechung"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "_Thread auswählen"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Auswählen..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Ver_fügbarkeitsinformationen veröffentlichen"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "In Ordner kopieren..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "In Ordner _verschieben..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Besprechung _ansetzen..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Als i_Calendar weiterleiten..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Diesen _Treffer löschen"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "_Alle Treffer löschen"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Zum _heutigen Tag"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Gehe zu Datum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Einstellungen..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Datum"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Unbekannt"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Wiederkehrend"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nein"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "O"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Die geographische Position muss in diesem Format eingegeben werden: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5967,36 +6006,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i Minuten-Unterteilungen"
+#. 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 "AM"
+
+#. 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 "PM"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "AM"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "PM"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i Minuten-Unterteilungen"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6107,10 +6146,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Keine</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6140,7 +6175,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6353,67 +6388,63 @@ msgstr "Die Anlage enthält keine gültige Kalendernachricht"
 msgid "The attachment has no viewable calendar items"
 msgstr "Die Anlage hat keine anzeigbaren Kalendereinträge"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Aktualisierung abgeschlossen\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objekt konnte nicht gefunden werden\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Teilnahmestatus aktualisiert\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Teilnehmerstatus konnte nicht aktualisiert werden!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Entfernen abgeschlossen"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Eintrag verschickt!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Der Eintrag konnte nicht verschickt werden!\n"
 
@@ -6530,28 +6561,6 @@ msgstr "Delegiert"
 msgid "In Process"
 msgstr "In Bearbeitung"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nicht im Büro"
@@ -6612,7 +6621,34 @@ msgstr "_Anfangszeit der Besprechung:"
 msgid "Meeting _end time:"
 msgstr "_Endzeit der Besprechung:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d. %B %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.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, %d.%m.%Y"
+
+#. 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 "%d.%m.%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+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
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6621,24 +6657,22 @@ msgstr ""
 "Fehler bei %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Aufgaben unter %s werden geöffnet"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6647,38 +6681,47 @@ msgstr ""
 "Fehler beim Öffnen von %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Aufgaben werden abgeschlossen..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Gewählte Objekte werden gelöscht..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Wird gesäubert"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Aufgaben"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Aufgaben werden geladen"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "%s wird geöffnet..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6686,18 +6729,62 @@ msgstr ""
 "%s\n"
 " ist abgestürzt."
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Das Task-Backend für\n"
-"%s\n"
-" ist abgestürzt."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Säuberungsvorgang"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Hier können Sie Ihre Zeitzone, den Kalender und die Aufgabenliste "
+"konfigurieren"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalender und Aufgaben"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Terminplan-Nachrichtenbetrachter des Evolution-Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-Kalender-/Aufgabeneditor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution-Kalenderkomponente"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution-Aufgabenkomponente"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Aufgaben"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6844,6 +6931,23 @@ msgstr "Geburts- und Jahrestage"
 msgid "On The Web"
 msgstr "Im Web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Der Kalender »%s« konnte nicht geöffnet werden."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Aufgaben in »%s« konnten nicht geöffnet werden."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7063,7 +7167,7 @@ msgid "Contacts: "
 msgstr "Kontakte: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Druckvorschau"
 
@@ -7075,71 +7179,81 @@ msgstr "Eintrag drucken"
 msgid "Print Setup"
 msgstr "Druckeinstellungen"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Neue Aufgabenliste"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Gelöscht"
+msgstr[1] "Gelöscht"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Aufgaben werden geladen"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 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:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Aufgabe"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Neue Aufgabe"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Aufgabenlistengruppe"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Eine neue Aufgabe anlegen"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Der URI des anzuzeigenden Aufgabenordners"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Die Aufgaben in »%s« konnten nicht geladen werden"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7152,11 +7266,11 @@ msgstr ""
 "\n"
 "Sollen die Aufgaben wirklich entfernt werden?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Nicht mehr rückfragen."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Aufgaben drucken"
 
@@ -8805,7 +8919,7 @@ msgstr "Den Ordnerinhalt lokal zum Arbeiten im Offline-Modus kopieren"
 msgid "Downloading new messages for offline mode"
 msgstr "Neue Nachrichten werden für Offline-Modus abgerufen"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Ordner »%s« wird für den Offline-Modus vorbereitet"
@@ -8898,34 +9012,6 @@ msgstr "Ungültige Argumente bei (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fehler beim Ausführen einer Filtersuche: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Syntax des Suchausdrucks konnte nicht analysiert werden: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fehler beim Ausführen eines Suchausdrucks: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-"(match-all) macht einen einzelnen Boole'schen Wert als Ergebnis erforderlich"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8957,7 +9043,55 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Neue Nachricht(en) wird/werden gefiltert"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Syntax des Suchausdrucks konnte nicht analysiert werden: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Fehler beim Ausführen eines Suchausdrucks: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr ""
+"(match-all) macht einen einzelnen Boole'schen Wert als Ergebnis erforderlich"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, 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
+#, 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
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Abfrage wird auf unbekannte Kopfzeile ausgeführt: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8968,18 +9102,18 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 "Die Syntax des gpg-Wink auf die Benutzerkennung konnte nicht analysiert "
 "werden."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 "Die Syntax des gpg-Winks auf das Passwort konnte nicht analysiert werden."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8988,31 +9122,31 @@ msgstr ""
 "Für das Entsperren des Schlüssels für den\n"
 "Benutzer %s ist ein Passwort erforderlich."
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Abgesagt."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Geheimschlüssel konnte nicht entsperrt werden: 3 falsche Passwörter "
 "eingegeben."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unerwartete GnuPG-Antwort: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Nachricht konnte nicht verschlüsselt werden: keine gültigen Empfänger "
 "angegeben."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9023,85 +9157,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s gescheitert: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Signaturdaten konnten nicht erzeugt werden: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 konnte nicht ausgeführt werden: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 konnte nicht ausgeführt werden."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Dies ist ein digital signierter Nachrichtenteil"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 ""
 "Nachrichtensignatur konnte nicht verifiziert werden: Nachrichtenformat "
 "fehlerhaft"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Die Nachrichtensignatur konnte nicht verifiziert werden: Temporäre Datei "
 "konnte nicht erstellt werden: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Verschlüsselungsdaten konnten nicht erzeugt werden: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Dies ist ein digital verschlüsselter Nachrichtenteil"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Verschlüsselter Inhalt"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Syntax des Nachrichteninhalts konnte nicht analysiert werden"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Weiterleitung an Sperrhilfsprogramm konnte nicht angelegt werden: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
-
-#: 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 "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "»%s« konnte nicht gesperrt werden"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9124,6 +9238,26 @@ msgstr "fcntl(2)-Sperre konnte nicht erhalten werden: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)-Sperre konnte nicht erhalten werden: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Weiterleitung an Sperrhilfsprogramm konnte nicht angelegt werden: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Sperrhilfsprogramm konnte nicht abgespalten werden: %s"
+
+#: 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 "»%s« konnte nicht gesperrt werden: Protokollfehler mit lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "»%s« konnte nicht gesperrt werden"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9394,7 +9528,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Fehlerhafte Legitimationsantwort vom Server."
 
@@ -9600,7 +9734,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Verschlüsselungszertifikat:"
 
 #: camel/camel-smime-context.c:360
@@ -9617,7 +9751,7 @@ msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Legitimation gescheitert.\n"
@@ -9682,98 +9816,98 @@ msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Nachricht %s konnte nicht abgerufen werden: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Zertifikatsignatur fehlerhaft"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Gültige Signatur"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Unterzeichner: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP-Befehl gescheitert: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "_Regel aus Nachricht anlegen"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Ordnersperre auf %s konnte nicht erzeugt werden: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Benutzername konnte nicht an Server übermittelt werden"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Befehl nicht implementiert"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9793,16 +9927,26 @@ 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Müll"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Unerwünscht"
@@ -9925,7 +10069,7 @@ msgstr "Schlüsselverwendung unterstützt das Signieren von Zertifikaten nicht"
 msgid "Error in application verification"
 msgstr "Fehler bei der Anwendungsüberprüfung"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9938,11 +10082,11 @@ msgstr ""
 "Fingerabdruck:       %s\n"
 "Signatur:                %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GUT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "SCHLECHT"
 
@@ -9966,7 +10110,7 @@ msgstr ""
 "Möchten Sie es dennoch akzeptieren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9981,7 +10125,7 @@ msgstr ""
 "\n"
 "Möchten Sie akzeptieren?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9990,7 +10134,7 @@ msgstr ""
 "Zertifikatproblem: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9999,7 +10143,7 @@ msgstr ""
 "Fehlerhafte Zertifikatdomäne: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10008,7 +10152,7 @@ msgstr ""
 "Zertifikat nicht mehr gültig: %s\n"
 "Aussteller: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10022,17 +10166,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Syntax der Adresse »%s« konnte nicht analysiert werden"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fehler beim Speichern von »%s«: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nachricht %s existiert nicht in %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nachrichten können nicht in virtuelle Ordner kopiert oder verschoben werden"
@@ -10042,11 +10186,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10063,10 +10202,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Nachrichten können nicht aus NNTP-Ordnern kopiert werden!"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Nach neuen E-Mails sehen"
 
 #: 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 "In allen Ordnern nach neuen E-Mails sehen"
@@ -10099,6 +10240,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Zum Zugriff auf Novell Groupwise-Server"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10120,26 +10262,323 @@ msgstr ""
 msgid "Checklist"
 msgstr "Liste"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unerwartete Antwort von IMAP-Server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ordner konnte nicht abgerufen werden: %s: %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 "Server-Verbindung unerwartet getrennt: %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 "Ordner konnte nicht abgerufen werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ordner konnte nicht abgerufen werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nachricht konnte nicht an mh-Ordner angehängt werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nachricht konnte nicht an mh-Ordner angehängt werden: %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 ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\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 ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\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 ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\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 ""
+"Nachricht %s konnte nicht aus Ordner %s abgerufen werden\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 "Ordner"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Nur abonnierte Ordner anzeigen"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Über vom Server vorgegebenen Ordner-Namensraum hinwegsetzen"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Namensraum"
+
+#: 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 "Zum Lesen und Speichern von E-Mails auf IMAP-Servern."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Dies stellt unter Verwendung eines unverschlüsselten Passworts eine "
+"Verbindung mit dem IMAP-Server her."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-Dienst für %s auf %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:140
+#: 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 "Verbindung mit %s (Port %d) gescheitert: %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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Verbindung abgebrochen"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Unbekannter Fehler"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Verbindung mit POP-Server %s konnte nicht hergestellt werden: Der "
+"erforderliche Legitimationsmechanismus wird nicht unterstützt."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sBitte geben Sie das SMTP-Passwort für %s@%s ein"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Legitimation am POP-Server %s gescheitert: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Befehl:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ungültiger Vorgang"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ordner konnte nicht umbenannt werden: %s: Ungültiger Vorgang"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unerwartete Antwort von IMAP-Server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Keine Daten angegeben"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Vorgang abgebrochen"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server-Verbindung unerwartet getrennt: %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:1089
-msgid "Unknown error"
-msgstr "Unbekannter Fehler"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10184,21 +10623,21 @@ msgstr "Verzeichnis %s konnte nicht angelegt werden: %s"
 msgid "Could not load summary for %s"
 msgstr "Zusammenfassung für %s konnte nicht geladen werden"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Der Ordner wurde zerstört und auf dem Serverneu angelegt."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Nach geänderten Nachrichten suchen"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nachricht konnte nicht abgerufen werden: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10214,25 +10653,25 @@ msgstr ""
 "Nachricht konnte nicht abgerufen werden: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nachricht existiert nicht"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Diese Nachricht ist derzeit nicht verfügbar"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Zusammenfassungsinformationen für neue Nachrichten werden abgerufen"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nachrichtenrumpf in Antwort auf FETCH konnte nicht gefunden werden."
 
@@ -10271,23 +10710,6 @@ msgstr "Benutzerdefinierten Befehl für die Server-Verbindung verwenden"
 msgid "Command:"
 msgstr "Befehl:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Ordner"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Nur abonnierte Ordner anzeigen"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Über vom Server vorgegebenen Ordner-Namensraum hinwegsetzen"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namensraum"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Filter auf neue Nachrichten in INBOX dieses Servers anwenden"
@@ -10310,85 +10732,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-Server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-Dienst für %s auf %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Verbindung mit %s (Port %d) gescheitert: %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nicht verfügbar"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Verbindung abgebrochen"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-»Verhandlungen« gescheitert"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Sie haben kein Passwort eingegeben."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10399,25 +10779,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Ordner %s existiert nicht"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Der Ordnername »%s« ist ungültig, da er das Zeichen »%c« enthält"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Der Elternordner darf keine Unterordner enthalten"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10425,7 +10798,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unbekannter Elternerdner: %s"
@@ -10535,58 +10908,58 @@ msgstr ""
 "Kann außerdem zum Einlesen eines Baums mit Elm-, Pine- oder Mutt-Ordnern "
 "verwendet werden."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Speicherwurzel %s ist kein absoluter Pfad"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Speicherwurzel »%s« ist kein reguläres Verzeichnis."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Ordner konnte nicht abgerufen werden: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokale Speicher haben keinen Eingangsordner"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokale E-Mail-Datei %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ordner %s konnte nicht in %s umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "»%s« konnte nicht umbenannt werden: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Ordner-Zusammenfassungsdatei »%s« konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Ordner-Indexdatei »%s« konnte nicht gelöscht werden: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10654,7 +11027,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10992,7 +11365,7 @@ 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:258
+#: 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
@@ -11001,8 +11374,8 @@ msgid "User cancelled"
 msgstr "Benutzer hat abgebrochen"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11011,53 +11384,53 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Interner Fehler: UID-Format ungültig: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nachrichten können nicht aus NNTP-Ordnern kopiert werden!"
 
@@ -11181,7 +11554,8 @@ msgid "Could not get group: %s"
 msgstr "Gruppe konnte nicht ermittelt werden: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Nachrichten konnten nicht abgerufen werden: unbekannter Fehler"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11234,8 +11608,8 @@ msgstr "Keine Nachricht mit UID %s"
 msgid "Retrieving POP message %d"
 msgstr "POP-Nachricht %d wird abgerufen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
@@ -11701,7 +12075,7 @@ msgstr "%.0f MB"
 msgid "%.0fG"
 msgstr "%.0f GB"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anlage"
 
@@ -11745,6 +12119,105 @@ msgstr "MIME-Typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Automatische Anzeige der Anlage vorschlagen"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
+"für Absenderkonto festgelegt"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
+"Verschlüsselungszertifikat für Absenderkonto festgelegt"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Datei konnte nicht geöffnet werden"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mehrere Nachrichten"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Datei öffnen"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatisch erzeugt"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Datei beigelegt"
+msgstr[1] "<b>%d</b> Dateien beigelegt"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "A_nlagenleiste verbergen (legen Sie Anlagen hier ab)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "A_nlagenleiste anzeigen (legen Sie Anlagen hier ab)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Eine Nachricht verfassen"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Das Editorfenster konnte nicht erzeugt werden:\n"
+"Bedienelement »Auswähler« konnte nicht aktiviert werden."
+
+#: 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 ""
+"Das Editorfenster konnte nicht erzeugt werden:\n"
+"HTML-Editorkomponente konnte nicht aktiviert werden.\n"
+"Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
+"libgtkhtml-Version installiert ist.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Das Editorfenster konnte nicht erzeugt werden:\n"
+"HTML-Editorkomponente konnte nicht aktiviert werden."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
+"bearbeitet werden kann.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Zielordner"
@@ -11826,214 +12299,136 @@ msgstr "Klicken Sie hier, um die Veröffentlichungsordner zu wählen"
 msgid "Attach file(s)"
 msgstr "Datei(en) beilegen"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Ausgehende Nachricht konnte nicht signiert werden: Kein Signaturzertifikat "
-"für Absenderkonto festgelegt"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Ausgehende Nachricht konnte nicht verschlüsselt werden: Kein "
-"Verschlüsselungszertifikat für Absenderkonto festgelegt"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Datei konnte nicht geöffnet werden"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nachricht konnte nicht vom Editor abgerufen werden"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Mehrere Nachrichten"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Datei öffnen"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatisch erzeugt"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> Datei beigelegt"
-msgstr[1] "<b>%d</b> Dateien beigelegt"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "A_nlagenleiste verbergen (legen Sie Anlagen hier ab)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "A_nlagenleiste anzeigen (legen Sie Anlagen hier ab)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Eine Nachricht verfassen"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Der Nachricht eine Datei beilegen"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Das Editorfenster konnte nicht erzeugt werden:\n"
-"Bedienelement »Auswähler« konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Das Editorfenster konnte nicht erzeugt werden:\n"
-"HTML-Editorkomponente konnte nicht aktiviert werden.\n"
-"Bitte stellen Sie sicher, dass die korrekte gtkhtml- und\n"
-"libgtkhtml-Version installiert ist.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Das Editorfenster konnte nicht erzeugt werden:\n"
-"HTML-Editorkomponente konnte nicht aktiviert werden."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Der Editor enthält einen nicht-Text Nachrichtenrumpf, der nicht "
-"bearbeitet werden kann.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Ungelesene Nachrichten"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Wollen Sie die Änderungen speichern?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Weiterleitung konnte nicht angelegt werden: %s"
+msgid "Don't Recover"
+msgstr "Nicht entfernen"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
+msgid "Recover"
+msgstr "Entfernen"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-# CHECK
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "Änderungen _verwerfen"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Wollen Sie die Änderungen speichern?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Fehler beim Speichern von Verknüpfungen."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Nicht entfernen"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Warnung: Geänderte Nachricht"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Fehler beim Speichern von Verknüpfungen."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Sind Sie sicher, dass Sie diesen unbenannten Termin löschen wollen?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+# CHECK
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Entfernen"
+msgid "Discard Changes"
+msgstr "Änderungen _verwerfen"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Nachricht speichern..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Weiterleitung konnte nicht angelegt werden: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Ungelesene Nachrichten"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Warnung: Geänderte Nachricht"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Der Nachricht eine Datei beilegen"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Sie müssen ein Konto einrichten, bevor Sie E-Mails verfassen können."
 
@@ -12168,7 +12563,8 @@ msgstr ""
 "Es existiert bereits eine Datei mit diesem Namen.\n"
 "Überschreiben?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Datei überschreiben?"
 
@@ -12345,81 +12741,97 @@ msgstr "Wählen Sie eine Vergleichszeit"
 msgid "_Filter Rules"
 msgstr "Filterregeln"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Fehler im regulären Ausdruck »%s«:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Datei »%s« existiert nicht oder ist keine reguläre Datei"
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Besprechungsaktualisierung"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Sie müssen ein Datum wählen."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Eindeutiger _Name:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Sie müssen einen Dateinamen angeben."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Ordner %s wird entfernt"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Datei »%s« existiert nicht oder ist keine reguläre Datei"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Arbeitsauftrag"
+msgid "Missing folder."
+msgstr "Ordner %s wird entfernt"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Sie müssen einen Ordner angeben"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Es wurde kein Server gewählt"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Fehler im regulären Ausdruck »%s«:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Sie müssen ein Datum wählen."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Arbeitsauftrag"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Der Filter muss benannt werden."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Der VOrdner muss benannt werden."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Sie müssen einen Dateinamen angeben."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Sie müssen einen Ordner angeben"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Es wurde kein Server gewählt"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12432,66 +12844,11 @@ msgstr "Eine Datei wählen"
 msgid "<b>Then</b>"
 msgstr "<b>Fällig:</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Ordner wählen"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Wichtig"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Zu erledigen"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Später"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Regelname: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Namenlos"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Fällig:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Aktionen ausführen"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "falls alle Kriterien zutreffen"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "falls irgendein Kriterium zutreffen"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "Eingang"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "Ausgang"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12584,6 +12941,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Später"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Regelname: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Fällig:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "falls alle Kriterien zutreffen"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "falls irgendein Kriterium zutreffen"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Aktionen ausführen"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegiert"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Empfänger"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Antwort auf %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Dazunehmen:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "Eingang"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "Ausgang"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12713,7 +13141,7 @@ msgstr "ist nicht markiert"
 msgid "Junk Test"
 msgstr "Unerwünscht-Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Beschriftung"
@@ -12751,7 +13179,7 @@ msgstr "Das Programm beenden"
 msgid "Play Sound"
 msgstr "Klang abspielen"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Gelesen"
 
@@ -12821,9 +13249,9 @@ msgstr "beginnt mit"
 msgid "Stop Processing"
 msgstr "Verarbeitung stoppen"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12886,106 +13314,60 @@ msgstr "Betreff enthält nicht"
 msgid "Virtual _Folders"
 msgstr "Virtuelle Ordner"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Hinzufügen"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VOrdner-Quelle"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Editoreinstellungen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
-"der Anzeige von Nachrichten festlegen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
-"Nachrichteneditor konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution-E-Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution-E-Mail-Komponente"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution-E-Mail-Editor"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution-E-Mail-Ordnerbetrachter"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-E-Mail-Einstellungsbedienelement"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-Mail-Konten"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-Mail-Einstellungen"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Vorgabe]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Kontoname"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Namenlose"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Sprache(n)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Signatur _hinzufügen"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signatur(en)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Weitergeleitete Nachricht --------"
+
+#: mail/em-composer-utils.c:1499
+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
+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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuellen Ordner aus Suche anlegen..."
 
@@ -13019,267 +13401,445 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Ordner anlegen"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Ordner_name:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VOrdner"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Eingang"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Ladevorgang..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Verschieben"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Aufgabe absagen"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Ordner wählen"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopieren"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Ordner anlegen"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Den Ordner »%s« umbenennen in:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Ordner umbenennen"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Ansicht"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "In _neuem Fenster öffnen"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Verschieben"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "Ordner a_nlegen..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Umbenennen"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VOrdner"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Eingang"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Als neue Nachricht _bearbeiten..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Drucken"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Antwort an _Liste"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Antwort an a_lle"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Weiterleiten"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Als abgeschlossen _markieren"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Markierung _löschen"
 
-#: mail/em-folder-view.c:787 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 "Als gelesen mar_kieren"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Als _ungelesen markieren"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Als _wichtig markieren"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Als unwichtig _markieren"
 
-#: mail/em-folder-view.c:791 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 "Als u_nerwünscht markieren"
 
-#: mail/em-folder-view.c:792 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 "Als _nicht unerwünscht markieren"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Lösche_n rückgängig"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "In Ordner _verschieben..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "In Ordner _kopieren..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Absender zum Adress_buch hinzufügen"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Filter _anwenden"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filterregeln"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Regel aus Nachricht anlegen"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VOrdner über _Betreff"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VOrdner über Abse_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VOrdner über _Empfänger"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VOrdner über Mailing_liste"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VOrdner über Thread"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter über _Betreff"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter über _Absender"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter über _Empfänger"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter über _Mailingliste"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filter über Thread"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Vorgabe"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Nachricht drucken"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "Link-Ziel _kopieren"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klicken Sie hier, um eine E-Mail an %s zu verfassen"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Von"
+
+#: 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 "Antwort an"
+
+#: 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 "An"
+
+#: 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 "Kopie"
+
+#: 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 "Blindkopie"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Klicken Sie hier, um %s zu öffnen"
+msgid "%s attachment"
+msgstr "%s-Anlage"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr ""
+"Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
+"Fehler"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
+"als Quelltext angezeigt."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nicht unterstütztes Signaturformat"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "»%s« wird abgerufen"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Unsigniert"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Gültige Signatur"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Ungültige Signatur"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Gültige Signatur, Absender konnte nicht verifiziert werden"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Nicht verschlüsselt"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Schwach verschlüsselt"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Verschlüsselt"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Stark verschlüsselt"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Fehlerhaft formatierter external-body-Teil."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Zeiger auf FTP-Site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Zeiger auf lokale Datei (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Zeiger auf entfernte Daten (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Nachricht wird formatiert"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Mailer"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13287,11 +13847,7 @@ msgstr "Klicken Sie hier, um %s zu öffnen"
 msgid "Matches: %d"
 msgstr "Passt auf: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Unsigniert"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13300,12 +13856,8 @@ msgstr ""
 "Diese Nachricht ist nicht signiert. Die Authentizität des Absenders ist "
 "daher nicht sichergestellt."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Gültige Signatur"
-
 # CHECK
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13314,11 +13866,7 @@ msgstr ""
 "Diese Nachricht ist signiert und gültig. Es ist daher sehr wahrscheinlich, "
 "dass der Absender der ist, der er vorgibt zu sein."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Ungültige Signatur"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13326,11 +13874,11 @@ msgstr ""
 "Die Signatur dieser Nachricht konnte nicht verifiziert werden. "
 "Möglicherweise wurde sie bei der Übertragung verändert."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Gültige Signatur, Absender konnte nicht verifiziert werden"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13338,12 +13886,8 @@ msgstr ""
 "Diese Nachricht wurde mit einer gültigen Signatur signiert, der Absender der "
 "Nachricht konnte jedoch nicht verifiziert werden."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Nicht verschlüsselt"
-
 # CHECK
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13352,12 +13896,8 @@ msgstr ""
 "Diese Nachricht ist nicht verschlüsselt. Daher wurde ihr Inhalt "
 "möglicherweise bei der Übertragung über das Internet ausgespäht."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Schwach verschlüsselt"
-
 # CHECK
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13367,11 +13907,7 @@ msgstr ""
 "jedoch schwach. Daher können dritte ihren inhalt zwar nur schwerlich, jedoch "
 "nicht unmöglich innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Verschlüsselt"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13379,11 +13915,7 @@ msgstr ""
 "Diese Nachricht ist verschlüsselt. Daher können dritte ihren Inhalt nur "
 "schwerlich ausspähen."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Stark verschlüsselt"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13393,187 +13925,64 @@ msgstr ""
 "verschlüsselt. Daher können dritte ihren inhalt nur sehr schwerlich "
 "innerhalb eines praktikablen Zeitraums ausspähen."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Zertifikat anzeigen"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Dieses Zertifikat kann nicht angezeigt werden"
 
 # CHECK
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Fertiggestellt am %d. %B %Y, %R"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Überfällig:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "am %d. %b, %k:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "An _Ort und Stelle anzeigen"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Seite %d von %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "»%s« wird abgerufen"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Fehlerhaft formatierter external-body-Teil."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Zeiger auf FTP-Site (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Zeiger auf lokale Datei (%s) gültig auf Site »%s«"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Zeiger auf lokale Datei (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Zeiger auf entfernte Daten (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Zeiger auf unbekannte externe Daten (Typ »%s«)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Nachricht wird formatiert"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Von"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Antwort an"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "An"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Kopie"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Blindkopie"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s-Anlage"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr ""
-"Die Syntax der S/MIME-Nachricht konnte nicht analysiert werden: Unbekannter "
-"Fehler"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-"Die Syntax der MIME-Nachricht konnte nicht analysiert werden und wird daher "
-"als Quelltext angezeigt."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Nicht unterstütztes Signaturformat"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Unbekannter Fehler beim Verifizieren der Signatur"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spam-Assassin (eingebaut)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Jährlich"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Wöchentlich"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "monatlich"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13585,25 +13994,55 @@ msgstr ""
 "\n"
 "Bitte haben Sie etwas Geduld. Evolution migriert Ihre Ordner..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "POP3-UID-Zwischenspeicher konnten nicht migriert werden: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Ordner-Ausklappstatus konnte nicht migriert werden: %s"
+#: mail/em-migrate.c:1532
+#, 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:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, 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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Öffnen von Speicher für »%s« fehlgeschlagen: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, 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
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13614,89 +14053,75 @@ msgstr "Speichern unter..."
 msgid "untitled_image.%s"
 msgstr "namenloses_bild.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Zum _Hintergrund machen"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Antwort an Absender"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "Link im Browser ö_ffnen"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "_Nachricht schicken an..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Zum Adressbuch _hinzufügen"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "In %s öffnen..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Dieser Speicher unterstütz keine Abonnements oder sie sind nicht aktiviert."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Abonniert"
 
-#: mail/em-subscribe-editor.c:637 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 "Ordner"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Bitte wählen Sie einen Server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Es wurde kein Server gewählt"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Diese Meldung nicht mehr anzeigen."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Weitergeleitete Nachricht --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "Nachricht"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Nachricht speichern..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Adresse hinzufügen"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "E-Mail von %s"
@@ -13714,11 +14139,13 @@ msgid "Check incoming mail being junk"
 msgstr "Eingehende E-Mails daraufhin überprüfen, ob sie unerwünscht sind"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Hervorhebungsfarbe für Zitate"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Hervorhebungsfarbe für Zitate."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13830,14 +14257,20 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Liste mit Beschriftungen und den assoziierten Farben"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Kontenliste"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Kontenliste"
+
+#: 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."
@@ -13846,32 +14279,37 @@ msgstr ""
 "enthält Zeichenketten, die Unterverzeichnisse relativ zu »/apps«/evolution/"
 "mail/accounts« angeben."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 "Liste der benutzerdefinierten Kopfzeilen und ihres Aktivierungszustands."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Liste der Beschriftungen, die Evolutions E-Mail-Komponenete bekannt sind. "
 "Die Liste enthält Zeichenketten der Form Name:Farbe, wobei die Farbe als "
 "HTML-Hextriplet anzugeben ist."
 
 # CHECK
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste der MIME-Typen, die auf Bonobo-Komponentebetrachter hin überprüft "
 "werden sollen"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Bilder von HTML-Nachrichten per HTTP laden"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13880,93 +14318,93 @@ msgstr ""
 "Bilder von HTML-Nachrichten per HTTP(S) laden. Zulässige Werte: 0 "
 "(keinesfalls), 1 (falls Absender im Adressbuch), 2 (immer)"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Filteraktionen protokollieren"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Filteraktionen in der angegebenen Protokolldatei protokollieren."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Protokolldatei für Filteraktionen"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Protokolldatei für Filteraktionen."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Nach angegebenem Intervall als gelesen markieren"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Nach angegebenem Intervall als gelesen markieren."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zitate in der Nachrichtenvorschau kenzeichnen"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zitate in der Nachrichtenvorschau kenzeichnen."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Voreingestellte Fensterhöhe"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Stil der Nachrichtenanzeige. Zulässige Werte: »normal« (normal), »full "
 "headers« (alle Kopfzeilen), »source« (Quelltext)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Klangdatei zur Benachrichtigung bei neuen E-Mails"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Benachrichtigungstyp bei neuen E-Mails"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Bei leerem Betreff rückfragen"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Rückfragen, falls ein Benutzer versucht, einen Ordner zu säubern."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Beim Säubern rückfragen"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Rückfragen, falls der Benutzer nur das Blindkopie-Feld ausfüllt"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13974,36 +14412,28 @@ msgstr ""
 "Beim Verschicken von HTML-Nachrichten an Kontakte, die keine wollen, "
 "rückfragen."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Rückfragen, falls der Benutzer versucht, nicht erwünschtes HTML zu "
 "verschicken"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Links im Text erkennen und ersetzen."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Smileys im Text erkennen und durch Bilder ersetzen."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Unerwünscht-Test auf eingehende E-Mails anwenden"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "G3h31m-0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "G3h31m-0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Per Vorgabe HTML-E-Mails verschicken?"
@@ -14052,8 +14482,9 @@ msgid "Spell check inline"
 msgstr "Rechtschreibprüfung an Ort und Stelle"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Voreingestellte Fensterhöhe"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14197,33 +14628,67 @@ msgstr "Port zum Ausführen des vom Benutzer ausgeführten spamd"
 msgid "spamd port"
 msgstr "spamd-Port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution-Elm-Importeur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution-Netscape-E-Mail-Importeur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Editoreinstellungen"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution-Outlook Express 4-Importeur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier können Sie die E-Mail-Einstellungen einschließlich der Sicherheit und "
+"der Anzeige von Nachrichten festlegen"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution-Pine-Importeur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier können Sie die Rechtschreibprüfung, Signaturen sowie den "
+"Nachrichteneditor konfigurieren"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution-MBox-Importeur"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Hier können Sie Ihre E-Mail-Konten konfigurieren"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution-E-Mail"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Bedienelement zur Konfiguration von Evolution-E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution-E-Mail-Komponente"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution-E-Mail-Editor"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Bedienelement zur Konfiguration des Evolution-E-Mail-Editors"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-E-Mail-Einstellungsbedienelement"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-Mail-Konten"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "E-Mail-Einstellungen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_E-Mail:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14231,15 +14696,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Bitte warten"
 
@@ -14271,19 +14736,47 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importieren"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Dateien werden importiert"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution-Elm-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-Netscape-E-Mail-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution-Outlook Express 4-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution-Pine-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution-MBox-Importeur"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wird eingelesen"
@@ -14293,7 +14786,7 @@ msgstr "%s wird eingelesen"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritätsfilter »%s«"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14322,7 +14815,7 @@ msgstr ""
 "Überprüfen Sie die importierten Filter, um sicherzustellen,\n"
 "dass alles erwartungsgemäß funktioniert."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14335,7 +14828,7 @@ msgstr ""
 "unterstützt.\n"
 "Diese Filter gehen verloren."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14350,24 +14843,24 @@ msgstr ""
 "sie nun prüfen, ob diese Zeichenfolge im\n"
 "Nachrichtenrumpf enthalten ist oder nicht."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importiert Ihre alten Netscape-Daten"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-Mail-Filter"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14401,127 +14894,140 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution-Konteneditor"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+# CHECK gibt's ne Übersetzung für diese Methode?
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Key-Agreement"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Rechner:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Benutzername:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Pfad:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "E-Mail an %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Betreff ist %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-Mail von %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "Mailingliste %s"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Antwort auf %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Filterregel hinzufügen"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Gelöscht"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d Tage"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d Sekunden"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d Sekunden"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d Kontakte"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Gelöscht"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Neue E-Mail-Nachricht"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "E-_Mail-Nachricht"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Eine neue E-Mail-Nachricht verfassen"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Neuer VOrdner"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-Mail-Filter"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Einen neuen Kalender anlegen"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "URI der E-Mail-Quelle, die diese Ansicht anzeigt"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Dienst wird überprüft"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Verbindung mit Server wird hergestellt..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identität"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14532,12 +15038,12 @@ msgstr ""
 "ausgefüllt werden, es sei denn, Sie wollen diese Informationen in von Ihnen "
 "verschickten E-Mails einschließen."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Abrufen von E-Mails"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14546,15 +15052,15 @@ msgstr ""
 "Falls Sie nicht sich sicher sind, wenden Sie sich bitte an Ihren "
 "Systemadministrator oder Internet-Provider."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Bitte wählen Sie aus den folgenden Optionen"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Verschicken von E-Mails"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14563,11 +15069,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontenverwaltung"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14583,14 +15089,6 @@ msgstr ""
 "Namen für dieses Konto ein.\n"
 "Dieser Name wird nur zur Anzeige auf dem Bildschirm verwendet."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Dienst wird überprüft"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Verbindung mit Server wird hergestellt..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14913,7 +15411,8 @@ msgid "Execute Command..."
 msgstr "Befehl ausführen..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Dicktengleich:"
 
 #: mail/mail-config.glade.h:82
@@ -15245,443 +15744,560 @@ msgstr "Farbe"
 msgid "description"
 msgstr "Beschreibung"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
-"anderen Namen."
+msgid "Invalid authentication"
+msgstr "Legitimation"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"SMTP-Server %s unterstützt den erforderlichen Legitimationstypen %s nicht."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?"
-
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
+#. 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-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
+"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-errors.xml.in.h:6
+#. 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 "Sind Sie sicher, dass Sie diese URL entfernen wollen?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
+"dass die folgenden Empfänger HTML-E-Mails abrufen können und wollen:\n"
+"%s verschicken?"
 
-#: mail/mail-errors.xml.in.h:8
+#: 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 "Abschicken"
+
+#. 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 ""
 "Rückfragen, falls ein Benutzer versucht, eine Nachricht ohne Betreff zu "
 "verschicken."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Beim Verschicken von Nachrichten ohne An- und Kopie-Feld rückfragen."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ordner konnte nicht kopiert werden: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ordner konnte nicht angelegt werden: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
+msgid "Use default drafts folder?"
+msgstr "Pfad zum Vorgabe-Kontaktordner"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Ordner konnte nicht gelöscht werden:\n"
-"%s"
+"Der Entwurfsordner für dieses Konto konnte nicht geöffnet werden.\n"
+"Möchten Sie den voreingestellten Entwurfsordner verwenden?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
+msgid "Use _Default"
+msgstr "Vorgabe"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Ordner »%s« existiert nicht."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Alle gelöschten Nachrichten auf Dauer aus diesem Ordner entfernen"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ordner konnte nicht verschoben werden: %s"
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "»%s« konnte nicht geöffnet werden: %s"
+msgid "_Expunge"
+msgstr "_Säubern"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "»%s« konnte nicht geöffnet werden: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Alle gelöschten Nachrichten auf Dauer aus allen Ordnern entfernen"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Nachricht konnte nicht geöffnet werden"
+msgid "_Empty Trash"
+msgstr "_Müll leeren"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"In »%s« konnte nicht gespeichert werden:\n"
-"  %s"
 
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Signatur _hinzufügen"
-
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "»%s« löschen"
+msgid "Error while {0}."
+msgstr ""
+"Fehler bei folgendem Vorgang:\n"
+"  %s:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Die gewählten Kontakte löschen"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-# CHECK
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "Änderungen verwerfen"
+msgid "Error while performing operation."
+msgstr ""
+"Fehler bei folgendem Vorgang:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Wollen Sie die Änderungen speichern?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Nicht löschen"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Passwort eingeben"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Fehler beim Laden von Filterinformationen:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Fehler bei folgendem Vorgang:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Fehler bei folgendem Vorgang:\n"
-"  %s:\n"
-"%s"
+"In »%s« konnte nicht gespeichert werden:\n"
+"  %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Datei existiert, überschreiben?"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Verzeichnis »%s« konnte nicht angelegt werden: %s."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Datei »%s« existiert nicht oder ist keine reguläre Datei"
-
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgid "Cannot create temporary save directory."
+msgstr "Temporäres Verzeichnis konnte nicht angelegt werden: %s"
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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/mail-errors.xml.in.h:47
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Legitimation"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:49
-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 ""
+msgid "File exists but cannot overwrite it."
+msgstr "Datei existiert, überschreiben?"
 
-#: mail/mail-errors.xml.in.h:50
-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:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "Datei »%s« existiert nicht oder ist keine reguläre Datei"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Sie verschicken eine HTML-formatierte Nachricht. Bitte stellen Sie sicher,\n"
-"dass die folgenden Empfänger HTML-E-Mails abrufen können und wollen:\n"
-"%s verschicken?"
+"Ordner konnte nicht gelöscht werden:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Ordner »%s« und alle Unterordner wirklich löschen?"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ordner konnte nicht gelöscht werden: %s: Ordner existiert nicht"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ordner konnte umbenannt werden: %s: Ordner existiert nicht"
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"Der bzw. die folgende(n) vOrdner:\n"
-"%sverwenden den gelöschten Ordner:\n"
-"   »%s«\n"
-"Und wurden aktualisiert."
+msgid "Delete \"{0}\"?"
+msgstr "»%s« löschen"
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Der bzw. die folgende(n) vOrdner:\n"
-"%sverwenden den gelöschten Ordner:\n"
-"   »%s«\n"
-"Und wurden aktualisiert."
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Ordner »%s« und alle Unterordner wirklich löschen?"
 
-#: mail/mail-errors.xml.in.h:57
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. 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 ""
+"Es existiert bereits ein Ordner namens »%s«. Bitte verwenden Sie einen "
+"anderen Namen."
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"SMTP-Server %s unterstützt den erforderlichen Legitimationstypen %s nicht."
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ordner konnte nicht verschoben werden: %s"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Diese Signatur wurde geändert, aber nicht gespeichert.\n"
-"\n"
-"Möchten Sie Ihre Änderungen speichern?"
+msgid "Cannot open source \"{2}\"."
+msgstr "»%s« konnte nicht geöffnet werden: %s"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Der Entwurfsordner für dieses Konto konnte nicht geöffnet werden.\n"
-"Möchten Sie den voreingestellten Entwurfsordner verwenden?"
+msgid "Cannot open target \"{2}\"."
+msgstr "Nachricht konnte nicht geöffnet werden"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid "Use _Default"
-msgstr "Vorgabe"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Ordner konnte nicht kopiert werden: %s"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Pfad zum Vorgabe-Kontaktordner"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ordner konnte nicht angelegt werden: %s: %s"
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "»%s« konnte nicht geöffnet werden: %s"
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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-errors.xml.in.h:68
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Sie haben nicht alle erforderlichen Felder ausgefüllt."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
 msgid "You may not create two accounts with the same name."
 msgstr "Sie können keine zwei Konten mit dem selben Namen anlegen."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Die gewählten Kontakte löschen"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Sind Sie sicher, dass Sie dieses Konto löschen wollen?"
+
+#. 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-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Nicht löschen"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Signaturdatei konnte nicht gespeichert werden: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr ""
+
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Signatur _hinzufügen"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
 # CHECK
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
 msgstr "Änderungen verwerfen"
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "_Müll leeren"
+msgid "Do you wish to save your changes?"
+msgstr "Wollen Sie die Änderungen speichern?"
 
-#: mail/mail-errors.xml.in.h:73
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Säubern"
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Diese Signatur wurde geändert, aber nicht gespeichert.\n"
+"\n"
+"Möchten Sie Ihre Änderungen speichern?"
+
+# CHECK
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "Änderungen verwerfen"
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Send"
-msgstr "Abschicken"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Ordner »%s« existiert nicht."
 
-#: mail/mail-errors.xml.in.h:75
+#. 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."
+msgstr ""
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Der bzw. die folgende(n) vOrdner:\n"
+"%sverwenden den gelöschten Ordner:\n"
+"   »%s«\n"
+"Und wurden aktualisiert."
+
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Der bzw. die folgende(n) vOrdner:\n"
+"%sverwenden den gelöschten Ordner:\n"
+"   »%s«\n"
+"Und wurden aktualisiert."
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Überschreiben"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Abschicken"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping zu %s wird ermittelt"
@@ -15690,20 +16306,20 @@ msgstr "Ping zu %s wird ermittelt"
 msgid "Working"
 msgstr "Arbeitet"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Ordner wird gefiltert"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "E-Mail wird abgerufen"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ausgangsfilter konnten nicht angewandt werden: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15712,115 +16328,115 @@ msgstr ""
 "Anhängen an %s gescheitert: %s\n"
 "Stattdessen wird versucht, an den lokalen »Verschicken«-Ordner anzuhängen."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Anhängen an lokalen »Verschickt«-Ordner gescheitert: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Nachricht %d von %d wird verschickt"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Fehlgeschlagen bei Nachricht %d von %d"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Abgeschlossen."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Nachricht wird in Ordner gespeichert"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Nachrichten werden nach %s verschoben"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Nachrichten werden nach %s kopiert"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Ordner in »%s« werden eingelesen"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Weitergeleitete Nachrichten"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ordner %s wird geöffnet"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Speicher %s wird geöffnet"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ordner %s wird entfernt"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ordner »%s« wird gespeichert"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Ordner wird aufgefrischt"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Ordner wird gesäubert"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Müll in »%s« wird geleert"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokale Ordner"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Nachricht %s wird abgerufen"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15829,7 +16445,7 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15838,11 +16454,11 @@ msgstr ""
 "Fehler beim Speichern der Nachrichten in: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Anlage wird gespeichert"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15851,17 +16467,17 @@ msgstr ""
 "Ausgabedatei konnte nicht angelegt werden: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Daten konnten nicht geschrieben werden: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbindung mit %s wird getrennt"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Verbindung mit %s wird erneut hergestellt"
@@ -15925,24 +16541,24 @@ msgstr "Aktualisieren..."
 msgid "Waiting..."
 msgstr "Warten..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Benutzer hat Vorgang abgebrochen."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Passwort für %s eingeben"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Geben Sie das Passwort ein"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "An dieses Passwort _erinnern"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "Für den Rest dieser Sitzung an dieses Passwort _erinnern"
 
@@ -15984,89 +16600,94 @@ msgstr "Weitergeleitete Nachricht"
 msgid "Invalid folder: `%s'"
 msgstr "Ungültiger Ordner: »%s«"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vOrdner wird eingerichtet: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "vOrdner werden aktualisiert für URI: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "vOrdner werden aktualisiert für URI: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vOrdner"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "VOrdner bearbeiten"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Neuer VOrdner"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Ungelesen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Gelesen"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Beantwortet"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Mehrere ungelesene Nachrichten"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Mehrere Nachrichten"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Am niedrigsten"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Niedriger"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Höher"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Am höchsten"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Heute %I:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Gestern %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Nachrichtenliste wird erzeugt"
 
@@ -16098,44 +16719,44 @@ msgstr "Erhalten"
 msgid "Size"
 msgstr "Größe"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Anrufen"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Nicht weiterleiten"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Folgenachricht"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Zu Ihrer Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Weiterleiten"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Keine Antwort erforderlich"
 
 # CHECK
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Antwort verfassen"
 
-#: mail/message-tag-followup.c:70 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 "Antwort an alle"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Überprüfen"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Als Folgenachricht markieren"
 
@@ -16182,53 +16803,33 @@ msgstr "_Abonnieren"
 msgid "_Unsubscribe"
 msgstr "Ab_bestellen"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-Bedienoberfläche"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution-Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution-Testkomponente"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Vorgabe-Verknüpfungsgruppe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Vorgabebreite des Ordnerleistenfelds"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Vorgabebreite des Verknüpfungsleistenfelds"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Voreingestellte Fensterhöhe"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Voreingestellte Fensterbreite"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Evolution-Konfigurationsversion"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 "Kennung oder Alias der Komponente, die per Vorgabe beim Start angezeigt "
 "werden soll."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -16236,7 +16837,7 @@ msgstr ""
 "Falls dieser Schlüssel wahr ist, wird Evolution im Offline- statt im Online-"
 "Modus gestartet."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -16245,62 +16846,22 @@ msgstr ""
 "Warndialog angezeigt."
 
 # CHECK
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Liste der Pfade, mit denen die Ordner im Offline-Modus auf der Platte "
 "synchronisiert werden sollen"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Pfad zum Vorgabe-Kalenderordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Pfad zum Vorgabe-Kontaktordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Pfad zum E-Mail-Vorgabeordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Pfad zum Vorgabe-Aufgabenordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Physische URI zum Vorgabe-Kalenderordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Physische URI zum Vorgabe-Kontaktordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Physische URI zum E-Mail-Vorgabeordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Physische URI zum Vorgabe-Aufgabenordner"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution im Offline-Modus starten"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Die Ordnerleiste anzeigen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Die Verknüpfungsleiste anzeigen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Den Entwickler-Warndialog nicht anzeigen"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "E-Mail"
 
@@ -16308,6 +16869,32 @@ msgstr "E-Mail"
 msgid "Brought to you by"
 msgstr "Das Team:"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d. %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Unbekannter Fehler"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Ungültige Argumente"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Registrierung bei OAF konnte nicht stattfinden"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatenbank nicht gefunden"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Allgemeiner Fehler"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namenlos)"
@@ -16448,11 +17035,11 @@ msgstr "gpg konnte nicht ausgeführt werden."
 msgid "_Import"
 msgstr "_Importieren"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Verbindungen werden geschlossen..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution-Einstellungen "
 
@@ -16494,13 +17081,37 @@ msgstr "Ordnername darf das Raute-Zeichen »#« nicht enthalten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' und '..' sind reservierte Ordnernamen."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution geht gerade offline."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-Mail an %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Fehler beim Ausführen von %s."
@@ -16514,14 +17125,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug-Buddy konnte nicht gestartet werden."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Info zu Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Online arbeiten"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Offline arbeiten"
 
@@ -16529,52 +17141,6 @@ msgstr "_Offline arbeiten"
 msgid "Work Offline"
 msgstr "Offline arbeiten"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution geht gerade offline."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Warnung: Evolution konnte nicht Ihre gesamten Daten von Version %d.%d.%d "
-"aktualisieren.\n"
-"Die Daten wurden nicht gelöscht, sind jedoch mit dieser Evolution-Version "
-"nicht zugänglich.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Ungültige Argumente"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Registrierung bei OAF konnte nicht stattfinden"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatenbank nicht gefunden"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Allgemeiner Fehler"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kontrollkästchen"
@@ -16646,6 +17212,43 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klicken Sie auf OK, um diese Verbindungen zu schließen und offline zu gehen"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "Ka_lender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakte: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_E-Mail:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Aufgaben:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Ordner_typ:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Den Ordner eines anderen Benutzers öffnen"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Ordnername:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Benutzer:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution-Einrichtungsassistent"
@@ -16688,6 +17291,18 @@ msgstr ""
 "\n"
 "Klicken Sie auf »Anwenden«, um Ihre Einstellungen zu speichern."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution-Bedienoberfläche"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution-Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution-Testkomponente"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16754,13 +17369,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kann Daten aus den folgenden Dateien importieren:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16797,59 +17412,48 @@ msgstr ""
 "Wir hoffen, dass Ihnen das Ergebnis unsrer harten Arbeit\n"
 "gefällt und freuen uns auf Ihren Beitrag zu diesem Projekt!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Vielen Dank\n"
 "Das Ximian Evolution-Team\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nicht mehr anzeigen"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-"Auf die Ximian-Evolution-Bedienoberfläche konnte nicht zugegriffen werden."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-"Die Ximian-Evolution-Bedienoberfläche konnte nicht initialisiert werden: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Beim Start von Evolution die angegebene Komponente aktivieren"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Im Offline-Modus starten"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Im Online-Modus starten"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Alle Evolution-Komponenten dazu zwingen, herunterzufahren"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Die Diagnoseausgabe aller Komponenten in eine Datei umleiten."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16858,13 +17462,80 @@ msgstr ""
 "%s: --online und --offline können nicht gemeinsam übergeben werden.\n"
 " Verwenden Sie %s --help, um weitere Informationen zu erhalten.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Verbindung wird hergestellt"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr ""
+"Auf die Ximian-Evolution-Bedienoberfläche konnte nicht zugegriffen werden."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution-Kontoassistent"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Zertifikatname"
 
@@ -17102,11 +17773,6 @@ msgstr "Sie haben Zertifikate, die folgende Personen identifizieren:"
 msgid "Your Certificates"
 msgstr "Ihre Zertifikate"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Zertifikat existiert bereits"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17299,6 +17965,11 @@ msgstr "Eindeutige Empfängerkennung"
 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
+msgid "Certificate already exists"
+msgstr "Zertifikat existiert bereits"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12-Dateipasswort"
@@ -17338,12 +18009,12 @@ msgstr "Vorgabebetreff für die Nachricht."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "»%s« konnte nicht ausgeführt werden: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s wird heruntergefahren (%s)\n"
@@ -17407,7 +18078,8 @@ msgid "Select all contacts"
 msgstr "Alle Kontakte auswählen"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Eine Nachricht an die gewählten Kontakte schicken."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17438,8 +18110,8 @@ msgstr "Den aktuellen Kontakt anzeigen"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "A_ktionen"
@@ -17457,7 +18129,8 @@ msgid "_Preview Pane"
 msgstr "_Vorschaufläche"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Als VCard _speichern"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17584,10 +18257,20 @@ msgstr "Den aktuellen Termin anzeigen"
 msgid "Week"
 msgstr "Woche"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Arbeitswoche"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "Termin ö_ffnen"
 
+#: 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 "S_chließen"
+
 #: 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
@@ -17907,6 +18590,16 @@ msgstr "Auswahl _umkehren"
 msgid "_Threaded Message List"
 msgstr "Nachrichtenliste nach _Threads sortieren"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "S_chließen"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18148,7 +18841,8 @@ msgid "Open the selected message in a new window"
 msgstr "Die gewählte Nachricht in einem neuen Fenster öffnen"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 "Die gewählte Nachrichte im E-Mail-Editor öffnen, um sie nochmals zu "
 "verschicken"
@@ -18265,58 +18959,46 @@ msgstr "VOrdner über _Betreff..."
 msgid "_Attached"
 msgstr "_Beigelegt"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "In Ordner _kopieren"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Filter aus Nachricht erzeugen"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gehe zu"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "An _Ort und Stelle"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Größer"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Nachrichtenanzeige"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "In Ordner _verschieben"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Nächste Nachricht"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal anzeigen"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Nachricht ö_ffnen"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Vorherige Nachricht"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Zitiert"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "E_rneut verschicken..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Werkzeuge"
@@ -18325,16 +19007,6 @@ msgstr "_Werkzeuge"
 msgid "_Undelete"
 msgstr "Löschen _rückgängig"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "S_chließen"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Beilegen"
@@ -18728,6 +19400,11 @@ msgstr "E-Mail-Einstellungen"
 msgid "_Send / Receive"
 msgstr "_Verschicken/Abrufen"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Fenster"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Nach _Firma"
@@ -18795,10 +19472,6 @@ msgstr "_Fällig am:"
 msgid "With _Status"
 msgstr "Status setzen:"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Aufgaben"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18958,6 +19631,34 @@ msgstr "Weitere..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution-Fehler"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution-E-Mail"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Besprechungsinformationen"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution-Test"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Nachrichten in »Verschickt« und »Entwürfe«"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Ausgeklappt"
@@ -19075,6 +19776,36 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "_Jetzt suchen"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+# CHECK der Kontakt -> diesen?
+#. 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 existiert bereits\n"
+"Möchten Sie diesen überschreiben?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"In »%s« konnte nicht gespeichert werden:\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"In »%s« konnte nicht gespeichert werden:\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19085,16 +19816,158 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zu %d%% abgeschlossen)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution-Adressbuch-Ordnerbetrachter"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adresse _2"
+
 #, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution-Kalenderbetrachter"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution-Aufgabenbetrachter"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "gnome-vfs konnte nicht initialisiert werden"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Der Ordner in »%s« konnte nicht geöffnet werden"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "Der URI, den der Kalender anzeigen wird"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Typ der anzuzeigenden Ansicht"
+
+#~ msgid "Display a message"
+#~ msgstr "Eine Nachricht anzeigen"
+
+#~ msgid "Alerts"
+#~ msgstr "Alarme"
+
+#~ msgid "Time"
+#~ msgstr "Zeit"
+
+#~ msgid "_General"
+#~ msgstr "_Allgemein"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Wählen Sie einen Importeur"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalender"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Neue Aufgabenliste"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalenderdatei konnte nicht aktualisiert werden!\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
 #~ msgstr ""
-#~ "Das Adressbuch »%s« wird hiermit entfernt. Sind Sie sicher, dass Sie "
-#~ "fortfahren möchten?"
+#~ "Das Task-Backend für\n"
+#~ "%s\n"
+#~ " ist abgestürzt."
 
-#, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Neues Adressbuch"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Der URI des anzuzeigenden Aufgabenordners"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Die Aufgaben in »%s« konnten nicht geladen werden"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution-E-Mail-Ordnerbetrachter"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VOrdner über Thread"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter über Thread"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "POP3-UID-Zwischenspeicher konnten nicht migriert werden: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Ordner-Ausklappstatus konnte nicht migriert werden: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Öffnen von Speicher für »%s« fehlgeschlagen: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "G3h31m-0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "G3h31m-0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI der E-Mail-Quelle, die diese Ansicht anzeigt"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Vorgabe-Verknüpfungsgruppe"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Vorgabebreite des Verknüpfungsleistenfelds"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Pfad zum Vorgabe-Kalenderordner"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Pfad zum Vorgabe-Kontaktordner"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Pfad zum E-Mail-Vorgabeordner"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Pfad zum Vorgabe-Aufgabenordner"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Physische URI zum Vorgabe-Kalenderordner"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Physische URI zum Vorgabe-Kontaktordner"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Physische URI zum E-Mail-Vorgabeordner"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Physische URI zum Vorgabe-Aufgabenordner"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Die Ordnerleiste anzeigen"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Die Verknüpfungsleiste anzeigen"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Warnung: Evolution konnte nicht Ihre gesamten Daten von Version %d.%d.%d "
+#~ "aktualisieren.\n"
+#~ "Die Daten wurden nicht gelöscht, sind jedoch mit dieser Evolution-Version "
+#~ "nicht zugänglich.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr ""
+#~ "Die Ximian-Evolution-Bedienoberfläche konnte nicht initialisiert werden: %"
+#~ "s"
+
+#~ msgid "_Resend..."
+#~ msgstr "E_rneut verschicken..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "UID der Kontaktquelle, die diese Ansicht anzeigt"
@@ -19274,9 +20147,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "S_pouse:"
 #~ msgstr "E_hepartner:"
 
-#~ msgid "_Add"
-#~ msgstr "_Hinzufügen"
-
 #~ msgid "_Business:"
 #~ msgstr "_Geschäftlich:"
 
@@ -19404,15 +20274,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Das Fälligkeitsdatum liegt vor dem Anfangsdatum!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Anfangsdatum:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Fällig am:"
-
-#~ msgid "Priority:"
-#~ msgstr "Priorität:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19444,13 +20305,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Dateideskriptor %s konnte nicht kopiert werden:\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19598,9 +20452,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Die Ansicht, die anzeigt, wann der Kalender beginnt"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Geben Sie das Passwort für %s ein"
-
 #~ msgid "New task list"
 #~ msgstr "Neue Aufgabenliste"
 
@@ -19657,30 +20508,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Der angegebene Gemeinschaftsordner konnte nicht gefunden werden."
 
-#~ msgid "C_alendar:"
-#~ msgstr "Ka_lender:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_E-Mail:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Aufgaben:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Ordner_typ:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Den Ordner eines anderen Benutzers öffnen"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Ordnername:"
-
-#~ msgid "_User:"
-#~ msgstr "_Benutzer:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Ein neues Fenster öffnen"
 
@@ -19986,9 +20813,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Assistenten beenden"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Die folgenden Verbindungen sind zur Zeit aktiv:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Nach Kontakten _suchen"
 
@@ -20004,9 +20828,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ msgid "Addressbook Sources"
 #~ msgstr "Adressbuchquellen"
 
-#~ msgid "No data provided"
-#~ msgstr "Keine Daten angegeben"
-
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
@@ -20239,9 +21060,6 @@ msgstr "%s (zu %d%% abgeschlossen)"
 #~ "Diese Nachricht ist digital signiert, konnte jedoch nicht als authentisch "
 #~ "nachgewiesen werden."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution-Fehler"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
diff --git a/po/el.po b/po/el.po
index abce5251c9..8154b5be28 100644
--- a/po/el.po
+++ b/po/el.po
@@ -34,7 +34,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: el\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -52,6 +52,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Βιβλίου Διευθύνσεων του Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Επαφές: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Συναγερμός Evolution "
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -76,16 +86,6 @@ msgstr "κάρτες"
 msgid " card"
 msgstr "κάρτες"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Επαφές: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Συναγερμός Evolution "
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Προεπιλεγμένη διεύθυνση συγχρονισμού:"
@@ -101,63 +101,20 @@ msgid "Could not read pilot's Address application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανάγνωση του τμήματος Διεύθυνσης του υπολογιστή Παλάμης"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Αυτόματη συμπλήρωση"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Πιστοποιητικά"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Επαφές"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Έλεγχος Διαχείρισης Πιστοποιητικών S/Mime του Evolution"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Έλεγχος ρυθμίσεων φακέλου του Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Διαχείριση των πιστοποιητικών  S/Mime εδώ"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -198,41 +155,45 @@ msgstr "Ε_παφές:"
 msgid "Create a new contacts group"
 msgstr "Δημιουργία νέας ομάδας συντομεύσεων"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση στο διακομιστή  LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Αδύνατη η δημιουργία ερωτήματος στο Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Ο διακομιστής αποκρίθηκε χωρίς υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Αυτός ο διακομιστής δεν υποστηρίζει σχήμα πληροφοριών LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Σφάλμα ανάκτησης σχήματος πληροφοριών"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Εισαγωγή..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Εισαγωγή  `%s':"
@@ -240,8 +201,8 @@ msgstr "Εισαγωγή  `%s':"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Σε αυτό τον υπολογιστή"
 
@@ -249,7 +210,7 @@ msgstr "Σε αυτό τον υπολογιστή"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Προσωπικό"
@@ -315,20 +276,42 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το  Evolution να εισάγει τους φακέλους σας..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Ανώνυμη πρόσβαση διακομιστή  LDAP"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+"Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Νέο Βιβλίο Διευθύνσεων"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sΕισάγετε κωδικό πρόσβασης για %s (χρήστης %s)"
+#: 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
+#: 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
+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
+#: 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 "Επαφές"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -352,6 +335,61 @@ msgstr ""
 "URI για τον φάκελο που χρησιμοποιήθηκε τελευταία στον διάλογο επιλογής "
 "ονομάτων"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Αυτόματη συμπλήρωση"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Επαφές"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Πιστοποιητικά"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Ρυθμίστε εδώ την αυτόματη συμπλήρωση"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Προβολή μίνι-κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Εφαρμογή προβολής διευθύνσεων του Βιβλίου Διευθύνσεων"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Εφαρμογή προβολής κάρτας του Βιβλίου Διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Στοιχείο βιβλίου διευθύνσεων του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Έλεγχος Διαχείρισης Πιστοποιητικών S/Mime του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Έλεγχος ρυθμίσεων φακέλου του Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Διαχείριση των πιστοποιητικών  S/Mime εδώ"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
@@ -373,6 +411,7 @@ msgstr "Ε_μφάνιση υποστηριζόμενων βάσεων"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -444,7 +483,7 @@ msgstr "Ε_παφές:"
 msgid "Address Book Properties"
 msgstr "Ιδιότητες Βιβλίου Διευθύνσεων"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Πάντοτε"
@@ -459,109 +498,99 @@ msgid "Basic"
 msgstr "Βασικό"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Χ_ρώματα"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Σύνδεση"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Διακεκριμένο ό_νομα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Διακεκριμένο ό_νομα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Το Evolution θα χρησιμοποίηση αυτήν τη διεύθυνση για την πιστοποίησή σας στο "
 "διακομιστή"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Γενικά"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Ποτέ"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Ένα"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Διαλέξτε χρώμα"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Βάθος ανα_ζήτησης: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Βάση  αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Βάση  αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Βάθος ανα_ζήτησης: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Γίνεται αναζήτηση"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -571,7 +600,7 @@ msgstr ""
 "διακομιστή LDAP\n"
 "μόνο αν ο διακομιστής υποστηρίζει SSL ή TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -589,7 +618,7 @@ msgstr ""
 "σύνδεση σας είναι ήδη\n"
 "ασφαλής."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -603,19 +632,19 @@ msgstr ""
 "τρύπες \n"
 "ασφαλείας."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Υποστηριζόμενες βάσεις αναζήτησης"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -627,7 +656,7 @@ msgstr ""
 "αναζητήσεις σας. Αν αφήσετε αυτό κενό, η αναζήτηση θα ξεκινά από τον ριζικό "
 "κατάλογο του δέντρου. "
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -643,7 +672,7 @@ msgstr ""
 "Μια αναζήτηση με \"ένα\"  θα περιλαμβάνει μόνο τις καταχωρήσεις που "
 "βρίσκονται μόνο ένα επίπεδο κάτω.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -651,7 +680,7 @@ msgstr ""
 "Αυτό είναι το πλήρες όνομα του διακομιστή ldap. Για παράδειγμα , \"ldap."
 "mycompany.com\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -661,7 +690,7 @@ msgstr ""
 "μεγάλου αριθμού \n"
 "θα κάνει αργό το ευρετήριο διευθύνσεων σας."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -671,7 +700,7 @@ msgstr ""
 "σας.Σημειώστε ότι η ρύθμιση σε \"Διεύθυνση Email\" απαιτεί ανώνυμη πρόσβαση "
 "στο διακομιστή ldap."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -681,7 +710,7 @@ msgstr ""
 "του Evolution.\n"
 " Είναι μόνο για λόγους εμφάνισης."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -694,129 +723,136 @@ msgstr ""
 "συστήματος σας\n"
 "για το ποιά θύρα θα χρησιμοποιήσετε."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Μορφή ώρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "_Χρήση SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Χρήση διακεκριμένου ονόματος (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Χρήση  διεύθυνσης ταχυδρομείου"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Όταν είναι δυνατό"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Ε_παφές:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Όριο _μεταφόρτωσης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Διεύθυνση Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Μέθοδος _πιστοποίησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Όνομα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Αριθμός _Θύρας:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Προτεραιότητα:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Βάση  _αναζήτησης:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Όνομα _διακομιστή:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Εξ_υπηρετητής:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Χρόνος λήξης (λεπτά):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Χρήση ασφαλούς σύνδεσης (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "κάρτες"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "στήλη-σύνδεσης"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "στήλη-γενικών"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "λεπτά"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "στήλη-αναζήτησης"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Αφαίρεση Όλων"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Αφαίρεση Όλων"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Προβολή Λίστας Επαφών"
@@ -839,22 +875,15 @@ msgstr "Προσθήκη στις Επαφές"
 msgid "Unnamed Contact"
 msgstr "Επαφή Χωρίς Τίτλο"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Πηγή"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Επιλογή Επαφών από το Βιβλίο Διευθύνσεων"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Διασύνδεση επιλογής ονομάτων του Βιβλίου Διευθύνσεων του Evolution."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -921,141 +950,141 @@ msgid "<b>Work</b>"
 msgstr "<b>Λήγει:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Διεύθυνση _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Διεύθυνση:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Επέ_τειος:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Βοηθός"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Γενέ_θλια:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Ημερολόγιο:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Πόλη:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Εντολή:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Επεξεργαστής Επαφών"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Χώρα:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Τ_μήμα:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Διεύθυνση κοινοποίησης διαθεσιμότητας:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Πλήρες Ό_νομα..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Οικία"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Διεύθυνση E-Mail "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Διευθυντής"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Ψευδώνυμο:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Ση_μειώσεις:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Άλλα"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Ταχ.Θυρίδα:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1083,9 +1112,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Εργασία"
@@ -1118,23 +1147,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Είστε βέβαιοι ότι θέλετε\n"
+"να διαγραφούν αυτές οι επαφές?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Επεξεργάσιμο"
 
@@ -2106,91 +2151,109 @@ msgstr "Ζάμπια"
 msgid "Zimbabwe"
 msgstr "Ζιμπάμπουε"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr "Τοποθεσία"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Όνομα Χρήστη:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Πηγαίο βιβλίο"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Βιβλίο στόχου"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Είναι νέα επαφή"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Εγγράψιμα Πεδία"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Αλλάχθηκε"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Ο επεξεργαστής κατηγορίας δεν είναι διαθέσιμος."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Αυτή η επαφή ανήκει στις κατηγορίες:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Νίγηρας"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 "Δε βρέθηκε συστατικό για το πεδίο: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+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
+msgid "Location"
+msgstr "Τοποθεσία"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Όνομα Χρήστη:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Γρήγορη Προσθήκη Επαφής"
@@ -2208,22 +2271,6 @@ msgstr "Π_λήρες Όνομα:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφούν αυτές οι επαφές?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Είστε βέβαιοι ότι θέλετε\n"
-"να διαγραφεί η επαφή;"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Διεύθυνση _2:"
@@ -2373,8 +2420,8 @@ msgstr "επεξεργαστής-λίστας-επαφών"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Βιβλίο"
 
@@ -2435,6 +2482,437 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Προχωρημένη Αναζήτηση"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(χάρτης)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "χάρτης"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Μέλη λίστας"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Οργανισμός"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Θέση"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Τηλεδιάσκεψη"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Τηλέφωνο"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Φαξ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "εργασία"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Κινητό Τηλέφωνο"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "προσωπικό"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Σημείωση"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Τίτλος εργασίας:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Αρχική σελίδα"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Επιτυχία"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Αρχείο φύλαξης εκτός δικτύου"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Δεν επιτρέπεται η πρόσβαση"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Η επαφή δεν βρέθηκε"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Το αναγνωριστικό επαφής υπάρχει ήδη"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Ακυρώθηκε"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Η πιστοποίηση απέτυχε."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Απαιτείται πιστοποίηση"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Δεν υπάρχει τέτοιο μήνυμα"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Άλλο σφάλμα"
+
+#: 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 ""
+"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Παρακαλώ ελέγξτε αν η "
+"διαδρομή υπάρχει και ότι έχετε το δικαίωμα πρόσβασης σε αυτό."
+
+#: 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 ""
+"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Αυτό σημαίνει ότι έχετε "
+"εισαγάγει  λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι εκτός λειτουργίας."
+
+#: 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 ""
+"Το Evolution δε διαθέτει στη σύνθεσή του υποστήριξη LDAP. Αν θέλετε να "
+"κάνετε χρήση LDAP  στο Evolution θα πρέπει να συνθέσετε το πρόγραμμα από τις "
+"πηγές CVS αφού κάνετελήψη του OpenLDAP από τον παρακάτω σύνδεσμο."
+
+#: 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 ""
+"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων. Αυτό σημαίνει ότι έχετε "
+"εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής είναι εκτός λειτουργίας."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"Βρέθηκαν περισσότερες κάρτες από όσες ο διακομιστής ή το Evolution\n"
+"έχει ρυθμιστεί να εμφανίζει. Κάνετε την αναζήτηση σας πιό συγκεκριμένη\n"
+"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
+"για αυτό το ευρετήριο διευθύνσεων."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο "
+"του διακομιστή ή το\n"
+"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων. Κάνετε την αναζήτηση σας "
+"πιό συγκεκριμένη\n"
+"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
+"για αυτό το ευρετήριο διευθύνσεων. "
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
+"ερώτημα."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
+"ερώτημα."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "Σφάλμα προσθήκης λίστας"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Σφάλμα προσθήκης επαφής"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Σφάλμα τροποποίησης λίστας"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Σφάλμα τροποποίησης επαφής"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Σφάλμα κατάργησης λίστας"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Σφάλμα αφαίρεσης επαφής"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"Το άνοιγμα %d επαφών θα ανοίξει και %d νέα παράθυρα.\n"
+"Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις επαφές?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"Το %s υπάρχει ήδη.\n"
+"Θέλετε να αντικατασταθεί;"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "λίστα"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Μετακίνηση επαφής σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Αντιγραφή επαφής σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Μετακίνηση επαφών σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Αντιγραφή επαφών σε"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Επιλογή βιβλίου διευθύνσεων στόχου"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Πολλαπλές Εκάρτες"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard για %s"
+
+#.
+#. * 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 "Πρωτεύον Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 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
+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 "Συγχώνευση Διεύθυνσης E-mail"
+
+#: 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
+msgid "Show Full VCard"
+msgstr "Εμφάνιση πλήρους VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+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
 msgid "No contacts"
 msgstr "Όχι επαφές"
@@ -2449,8 +2927,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Ερώτημα"
 
@@ -2504,9 +2982,10 @@ msgstr "Βιβλίο Διευθύνσεων"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Αποθήκευση ως (VCard)"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2571,7 +3050,7 @@ msgid "Cut"
 msgstr "Αποκοπή"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2582,18 +3061,8 @@ msgstr "Αντιγραφή"
 msgid "Paste"
 msgstr "Επικόλληση"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Διαγραφή"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Τρέχουσα Προβολή"
 
@@ -2610,7 +3079,7 @@ msgstr ""
 "ξαναχρησιμοποιήσετε"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Κάθε Κατηγορία"
@@ -2651,21 +3120,6 @@ msgstr "Κατηγορίες"
 msgid "Company Phone"
 msgstr "Τηλέφωνο Εταιρείας"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Οικογενειακό Όνομα"
@@ -2702,29 +3156,14 @@ msgstr "Ημερήσια καταγραφή"
 msgid "Manager"
 msgstr "Διευθυντής"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Κινητό Τηλέφωνο"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Ψευδώνυμο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Σημείωση"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Γραφείο"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Οργανισμός"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Άλλο Φαξ"
@@ -2776,21 +3215,29 @@ msgstr "Μονάδα"
 msgid "Web Site"
 msgstr "Ιστοσελίδα"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Πλάτος"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Ύψος"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "Πεδίο"
@@ -2807,10 +3254,6 @@ msgstr "Μοντέλο Κειμένου"
 msgid "Max field name length"
 msgstr "Μέγιστο μάκρος ονόματος πεδίου"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Πλάτος στήλης"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2839,411 +3282,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(χάρτης)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "χάρτης"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Μέλη λίστας"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Θέση"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Τηλεδιάσκεψη"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Τηλέφωνο"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Φαξ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "εργασία"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "προσωπικό"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Τίτλος εργασίας:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Αρχική σελίδα"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Επιτυχία"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Αρχείο φύλαξης εκτός δικτύου"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Το ευρετήριο διευθύνσεων δεν υπάρχει"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Δεν επιτρέπεται η πρόσβαση"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Η επαφή δεν βρέθηκε"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Το αναγνωριστικό επαφής υπάρχει ήδη"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Δεν υποστηρίζεται το πρωτόκολλο"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Ακυρώθηκε"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Η πιστοποίηση απέτυχε."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Απαιτείται πιστοποίηση"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS δεν είναι διαθέσιμο"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Δεν υπάρχει τέτοιο μήνυμα"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Άλλο σφάλμα"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων.  Αυτό σημαίνει ότι έχετε "
-"εισαγάγει  λάθος URI, ή ότι ο εξυπηρετητής LDAP είναι εκτός λειτουργίας."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"Το Evolution δε διαθέτει στη σύνθεσή του υποστήριξη LDAP. Αν θέλετε να "
-"κάνετε χρήση LDAP  στο Evolution θα πρέπει να συνθέσετε το πρόγραμμα από τις "
-"πηγές CVS αφού κάνετελήψη του OpenLDAP από τον παρακάτω σύνδεσμο."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων. Αυτό σημαίνει ότι έχετε "
-"εισαγάγει λάθος URI, ή ότι ο εξυπηρετητής είναι εκτός λειτουργίας."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Δεν ήταν δυνατό το άνοιγμα του Βιβλίου Διευθύνσεων"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Βρέθηκαν περισσότερες κάρτες από όσες ο διακομιστής ή το Evolution\n"
-"έχει ρυθμιστεί να εμφανίζει. Κάνετε την αναζήτηση σας πιό συγκεκριμένη\n"
-"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
-"για αυτό το ευρετήριο διευθύνσεων."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Η χρονική διάρκεια για την εκτέλεση αυτού του ερωτήματος ξεπέρασε το όριο "
-"του διακομιστή ή το\n"
-"όριο που έχετε καθορίσει στο ευρετήριο διευθύνσεων. Κάνετε την αναζήτηση σας "
-"πιό συγκεκριμένη\n"
-"ή αυξήστε το όριο αποτελεσμάτων στις προτιμήσεις διακομιστή καταλόγου\n"
-"για αυτό το ευρετήριο διευθύνσεων. "
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"Το backend για αυτό το ευρετήριο διευθύνσεων αδυνατεί να αναλύσει αυτό το "
-"ερώτημα."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"Το backend για αυτό το ευρετήριο διευθύνσεων αρνήθηκε να αναλύσει αυτό το "
-"ερώτημα."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Αυτό το ερώτημα δεν ολοκληρώθηκε επιτυχώς."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "Α_πόρριψη"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Σφάλμα προσθήκης λίστας"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Σφάλμα προσθήκης επαφής"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Σφάλμα τροποποίησης λίστας"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Σφάλμα τροποποίησης επαφής"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Σφάλμα κατάργησης λίστας"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Σφάλμα αφαίρεσης επαφής"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Το άνοιγμα %d επαφών θα ανοίξει και %d νέα παράθυρα.\n"
-"Θέλετε πραγματικά να εμφανίσετε όλες αυτές τις επαφές?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"Το %s υπάρχει ήδη.\n"
-"Θέλετε να αντικατασταθεί;"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Αντικατάσταση"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Σφάλμα αποθήκευσης  %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "λίστα"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Μετακίνηση επαφής σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Αντιγραφή επαφής σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Μετακίνηση επαφών σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Αντιγραφή επαφών σε"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Επιλογή βιβλίου διευθύνσεων στόχου"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Πολλαπλές Εκάρτες"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard για %s"
-
-#.
-#. * 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 "Πρωτεύον Email"
-
-#: 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
-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 "Συγχώνευση Διεύθυνσης E-mail"
-
-#: 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
-msgid "Show Full VCard"
-msgstr "Εμφάνιση πλήρους VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Εμφάνιση μικρής VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-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"
@@ -3287,11 +3328,6 @@ msgstr "Εισαγωγέας VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: 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.c:998
 msgid "Print contacts"
 msgstr "Εκτύπωση επαφών"
@@ -3301,6 +3337,11 @@ msgstr "Εκτύπωση επαφών"
 msgid "Print contact"
 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"
 msgstr "10 pt. Tahoma"
@@ -3486,16 +3527,6 @@ msgstr "Δοκιμή εκτύπωσης επαφής"
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Καθορίστε το αρχείο αποτελέσματος αντί για το καθορισμένο αποτέλεσμα"
@@ -3554,6 +3585,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Σφάλμα κατά την φόρτωση του βιβλίου διευθύνσεων."
@@ -3566,11 +3607,12 @@ msgstr "Εισαγωγή Αρχείου"
 msgid "No filename provided."
 msgstr "Δεν έχετε δώσει όνομα αρχείου."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Λίστα Χωρίς Τίτλο"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Εισάγετε κωδικό"
 
@@ -3604,117 +3646,55 @@ msgid "Could not read pilot's ToDo application block"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση του τμήματος Εκκρεμοτήτων του Υπολογιστή Παλάμης"
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Ημερολόγια"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Ρυθμίστε εδώ την Ζώνη ώρας, Ημερολόγιο και Λίστα Εργασιών σας."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Ημερολόγιο και Εργασίες του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Έλεγχος ρυθμίσεων του Ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Εφαρμογή προβολής μηνυμάτων ραντεβού του ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Εφαρμογή προβολής Ημερολογίου Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Επεξεργαστής Ημερολογίου/Εργασιών του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Εφαρμογή προβολής Εργασιών του Evolution "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Στοιχείο Ημερολογίου του Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Στοιχείο Εργασιών του Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Εργασίες"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του Ημερολογίου του Evolution"
-
-#: 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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Συναγερμός Evolution "
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "_Κλείσιμο"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Χρονική _Μετάθεση Υπενθύμισης"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Χρόνος της χρονική μετάθεσης (λεπτά)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Επεξεργασία ραντεβού"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Απαλλαγή"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Απαλλαγή όλων"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Δεν υπάρχει διαθέσιμη περιγραφή."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3727,12 +3707,12 @@ msgstr ""
 "Ξεκινάει στις %s\n"
 "Τελειώνει στις %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3744,7 +3724,7 @@ msgstr ""
 "αποστολή e-mail το Evolution θα εμφανίσει ένα παράθυρο\n"
 "διαλόγου με μια κανονική υπενθύμιση."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3761,19 +3741,19 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την εκτέλεση του προγράμματος;"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Υπηρεσία υπενθύμισης ειδοποίησης του Ημερολογίου του Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Δεν ήταν δυνατή η αρχικοποίηση του Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Δεν ήταν δυνατή η προετοιμασία του gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Δεν ήταν δυνατή η δημιουργία του εργοστασίου της υπηρεσίας ειδοποίησης"
 
@@ -3883,57 +3863,42 @@ 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Ερώτηση επαλήθευσης για την διαγραφή ραντεβού"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Ερώτηση επαλήθευσης όταν διαγράφεται ένας φάκελος"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Αν θα γίνεται απόκρυψη ολοκληρωμένων εργασιών"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Αν θα εμφανίζεται η ώρα σε 24ώρη μορφή αντί για μμ/πμ"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Αν θα εμφανίζονται οι αριθμοί εβδομάδων στον περιηγητή ημερολογίου"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Η περίληψη περιέχει"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Η περιγραφή περιέχει"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Το σχόλιο περιέχει"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Η περιγραφή περιέχει"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Αταίριαστο"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Ημερολόγιο"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3943,122 +3908,132 @@ msgstr ""
 "παλαιότερααπό την επιλεγμένη ημερομηνία. Αν συνεχίσετε, δεν θα μπορέσετε να "
 "τα ανακτήσετε."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Εκκαθάριση γεγονότων παλαιότερων από"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "ημέρες"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%d %a %b"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Το ημερολόγιο '%s' θα διαγραφεί.Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Νέο Ημερολόγιο"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Ιδιότητες..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Φόρτωση Ημερολογίου..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Αδυναμία ανοίγματος του ημερολογίου  '%s' για την δημιουργία γεγονότων και "
 "συναντήσεων"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία γεγονότων και συναντήσεων"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Ημερολόγια"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Νέο Ραντεβού"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "Ρ_αντεβού"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Δημιουργία νέου ραντεβού"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Νέα συνάντηση"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Συ_νάντηση"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Δημιουργία νέας αίτησης συνάντησης"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Νέο ολοήμερο ραντεβού"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "All _Day Ραντεβού"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Δημιουργία ένος νέου ολοήμερου ραντεβού"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Νέη ημερολόγιο"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "Η_μερολόγιο"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Δημιουργία νέου ημερολογίου"
 
@@ -4088,15 +4063,36 @@ msgstr "Προβολή Εβδομάδας"
 msgid "Month View"
 msgstr "Προβολή Μήνα"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Η περίληψη περιέχει"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Η περιγραφή περιέχει"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Το σχόλιο περιέχει"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Η περιγραφή περιέχει"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Αταίριαστο"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Σφάλμα κατά το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Η μέθοδος δεν υποστηρίζεται κατά το άνοιγμα του ημερολογίου"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγμα του ημερολογίου"
 
@@ -4105,19 +4101,6 @@ msgstr "Δεν επιτρέπεται η πρόσβαση για το άνοιγ
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Ο τύπος της προβολής για εμφάνιση"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Επιλογές Ηχητικής Ειδοποίησης"
@@ -4183,7 +4166,7 @@ msgstr "επιπλέον φορές κάθε"
 msgid "hours"
 msgstr "ώρες"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Ενέργεια/Trigger"
 
@@ -4202,14 +4185,14 @@ msgstr "Βασικά"
 msgid "Date/Time:"
 msgstr "Ημερομηνία/Ώρα:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Εμφάνιση μηνύματος"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Εκτέλεση ήχου"
 
+#: 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 "Υπενθυμίσεις"
@@ -4224,6 +4207,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
 msgid "Summary:"
 msgstr "Περίληψη:"
@@ -4262,10 +4246,108 @@ msgstr "λεπτό(ά)"
 msgid "start of appointment"
 msgstr "αρχή ραντεβού"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+"Θα πρέπει να καθορίσετε μια τοποθεσία από την οποία θα γίνει η λήψη του "
+"ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Η τοποθεσία πηγής '%s' δεν είναι σωστά διατυπωμένη"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Η τοποθεσία πηγής '%s' δεν είναι πηγή webcal "
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Η πηγή  με το όνομα  '%s' υπάρχει ήδη στην επιλεγμένη ομάδα"
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Η ομάδα '%s' είναι απομακρυσμένη. Θα πρέπει να καθορίσετε μια τοποθεσία από "
+"την οποία θα γίνει η λήψη του ημερολογίου"
+
+#: 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
+msgid "Calendar Properties"
+msgstr "Ιδιότητες ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Προσθήκη νέου ημερολογίου"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Τύπος:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Ενεργοποίηση"
 
@@ -4279,19 +4361,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Ενεργοποίηση"
 
@@ -4316,162 +4398,176 @@ msgid "60 minutes"
 msgstr "60 λεπτά"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Ειδοποιήσεις"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Λήγει:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Λήγει:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Επιλογές λίστας εργασιών</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 "<b>Λήγει:</b> "
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Εμφάνιση"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Ενεργοποίηση"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "Παρασκευή"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Ώρες"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Λεπτά"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Δευτέρα"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Κυρ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Σάββατο"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Εμ_φάνιση υπενθύμισης"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Κυριακή"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Ερ_γασίες που λήγουν σήμερα:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Πέμ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Λίστα Εργασιών"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Πέμπτη"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Χρόνος"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "_Ζώνη αλλαγής ώρας:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Μορφή ώρας:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Τρίτη"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Ε_βδομάδα ξεκινάει:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Τετάρτη"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Εργάσιμη Εβδομάδα"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Ημέρες εργασίας:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "12 Ώρες (ΠΜ/ΜΜ)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 ώρες"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Προσθήκη URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Συμπίεση σαββατοκύριακων στη μηνιαία προβολή"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Η _μέρα αρχίζει στις :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Εμφάνιση"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4481,143 +4577,46 @@ msgstr "_Εμφάνιση"
 msgid "_Edit"
 msgstr "_Επεξεργασία"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "Γνωστοποίηση _διαθεσιμότητας"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Παρ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Γενικά"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Απόκρυψη ολοκληρωμένων εργασιών μετά"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Δευ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Εργασίες που έχουν λή_ξει:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Σάβ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Διαιρέσεις ώρας:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "Τ_ρίτη"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Τετ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "πριν από κάθε ραντεβού"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-"Θα πρέπει να καθορίσετε μια τοποθεσία από την οποία θα γίνει η λήψη του "
-"ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Η τοποθεσία πηγής '%s' δεν είναι σωστά διατυπωμένη"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Η τοποθεσία πηγής '%s' δεν είναι πηγή webcal "
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Η πηγή  με το όνομα  '%s' υπάρχει ήδη στην επιλεγμένη ομάδα"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Η ομάδα '%s' είναι απομακρυσμένη. Θα πρέπει να καθορίσετε μια τοποθεσία από "
-"την οποία θα γίνει η λήψη του ημερολογίου"
-
-#: 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:5
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Προσθήκη νέου ημερολογίου"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Τύπος:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "εβδομάδες"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4704,81 +4703,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Δεν έχετε κάνει αλλαγές. Να ανανεωθεί ο επεξεργαστής;"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Σφάλμα πιστοποίησης: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " με "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Ολοκληρωμένο"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Ολοκληρωμένο "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr "(Λήξη"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Λήξη "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Δεν ήταν δυνατή η ενημέρωση του αντικειμένου"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Επεξεργασία Ραντεβού"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Χωρίς περίληψη"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Αποθήκευση ως..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Δεν ήταν δυνατή η εκτέλεση της τρέχουσας έκδοση!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Σφάλμα πιστοποίησης: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " με "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Ολοκληρωμένο"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Ολοκληρωμένο "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr "(Λήξη"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Λήξη "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
@@ -4901,27 +4900,27 @@ msgstr "Εξουσιοδότηση Σε:"
 msgid "Enter Delegate"
 msgstr "Εισαγωγή Αντιπροσώπου"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Ραντεβού"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Υπενθύμιση"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Επανεμφάνιση"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Συνάντηση"
 
@@ -4934,7 +4933,7 @@ msgstr "Η ημερομηνία λήξης είναι πριν από την η�
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Η ημερομηνία έναρξης είναι λανθασμένη"
 
@@ -5020,10 +5019,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5042,15 +5041,15 @@ msgstr "Χρειάζεται ένας διοργανωτής."
 msgid "At least one attendee is required."
 msgstr "Απαιτείται τουλάχιστον ένας παρευρισκόμενος."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Εξουσιοδότηση Σε..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5326,25 +5325,19 @@ msgstr "Α_πόρριψη Αλλαγών"
 msgid "Save Event"
 msgstr "Αποθήκευση Γεγονότος"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Επιλογή εισαγωγής"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Επιλογή προορισμού %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "ημερολόγιο"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Φάκελος προορισμού:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "λίστα εργασιών"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Λίστα Εργασιών"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5375,38 +5368,44 @@ msgid "% _Complete"
 msgstr "% _Ολοκληρωμένο"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Υψηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Χαμηλή"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Κανονική"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Δεν έχει ξεκινήσει"
 
@@ -5442,11 +5441,11 @@ msgstr "Ιστοσε_λίδα:"
 msgid "Assignment"
 msgstr "Εργασία"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Η ημερομηνία λήξης είναι λανθασμένη"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιών στο '%s'."
@@ -5455,8 +5454,9 @@ msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιώ�
 msgid "Con_fidential"
 msgstr "_Εμπιστευτικό"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Περιγραφή:"
@@ -5602,102 +5602,53 @@ msgstr "%s στις %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s για άγνωστο τύπο ενεργοποίησης"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Δημόσιο"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Ιδιωτικό"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Εμπιστευτικό"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Ημερομηνία"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Ημερομηνία Έναρξης"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Περίληψη"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Διαθέσιμη"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Απασχολημένη"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Β"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Κλικ για άνοιγμα %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ν"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Χωρίς τίτλο"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "Α"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Ημερομηνία Έναρξης:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Δ"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Ημερομηνία Λήξης:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Η γεωγραφική θέση πρέπει να έχει την παρακάτω μορφή: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Κατάσταση:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Προτεραιότητα:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Όχι"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Ιστοσε_λίδα:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5743,17 +5694,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Αναβάθμιση Αντικειμένων"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Άνοιγμα"
 
@@ -5762,41 +5722,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Επι_κόλληση"
 
@@ -5854,78 +5815,158 @@ msgstr "Προτεραιότητα"
 msgid "Start date"
 msgstr "Ημερομηνία Έναρξης"
 
+#: 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:11
 msgid "Task sort"
 msgstr "Ταξινόμηση Εργασιών"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Νέο Ρ_αντεβού..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Νέο _Γεγονός Ολόκληρης της Ημέρας"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Νέα Συνάντηση"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Νέα Εργασία"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Επιλογή _Θέματος"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Επιλο_γή..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Δημο_σίευση πληροφοριών Διαθεσιμότητας"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Αντιγραφή σε Φάκελο..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Με_τακίνηση στο Φάκελο..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Προγραμματισμός _Συνάντησης..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Προώ_θηση ως iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Διαγραφή αυτής της _Εμφάνισης"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Διαγραφή Ό_λων των Εμφανίσεων"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Μετάβαση στο _Σήμερα"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Μετάβαση στην Ημερομηνία..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Ρυθμίσεις..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Ημερομηνία"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -5949,36 +5990,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i τμήματα λεπτών"
+#. 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 "πμ"
+
+#. 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 "μμ"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "πμ"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "μμ"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i τμήματα λεπτών"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6087,10 +6128,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Κανένα</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Κατάσταση:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6120,7 +6157,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ΟΚ"
 
@@ -6334,64 +6371,60 @@ msgid "The attachment has no viewable calendar items"
 msgstr ""
 "Το επισυναπτόμενο αρχείο περιέχει στοιχεία που δεν μπορούν να προβληθούν"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Η ανανέωση ολοκληρώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων επειδή το στοιχείο "
 "δεν υπάρχει πλέον"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Το αντικείμενο δεν είναι έγκυρο και δεν μπορεί να ενημερωθεί\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Αυτή η απάντηση δεν είναι από ένα τρέχοντα παρευρισκόμενο. Να προστεθεί?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Δεν ήταν δυνατή η ανανεωθεί της κατάστασης παρευρισκομένων λόγο μιας μη "
 "έγκυρης κατάστασης\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Υπήρξε σφάλμα στο σύστημα CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Δεν ήταν εύρεση του αντικειμένου\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Δεν έχετε τα απαραίτητα δικαιώματα για να ενημερώσετε το ημερολόγιο\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Η κατάσταση παρευρισκομένων ανανεώθηκε\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Δεν ήταν δυνατή η ανανέωση της κατάστασης παρευρισκομένων\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Η Αφαίρεση Ολοκληρώθηκε"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Το στοιχείο στάλθηκε!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Δεν ήταν δυνατή η αποστολή του στοιχείου!\n"
 
@@ -6508,28 +6541,6 @@ msgstr "Εξουσιοδοτήθηκε"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Εκτός Γραφείου"
@@ -6590,7 +6601,34 @@ msgstr "Χρόνος έ_ναρξης συνάντησης:"
 msgid "Meeting _end time:"
 msgstr "Χρόνος _περάτωσης συνάντησης:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B, %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Εισάγετε κωδικό πρόσβασης για %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6599,24 +6637,22 @@ msgstr ""
 "Σφάλμα στο  %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Άνοιγμα ενεργειών στο %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6625,38 +6661,47 @@ msgstr ""
 "Σφάλμα ανοίγματος %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Φόρτωση εργασιών"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Ολοκλήρωση εργασιών..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Διαγραφή επιλεγμένων αντικειμένων..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Εξάλειψη"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Εργασίες"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Φόρτωση ραντεβού σε %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Φόρτωση εργασιών σε %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Άνοιγμα %s."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6664,18 +6709,60 @@ msgstr ""
 "%s\n"
 " has crashed."
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Εκκαθάριση"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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 "Ημερολόγιο και Εργασίες του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Έλεγχος ρυθμίσεων του Ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Εφαρμογή προβολής μηνυμάτων ραντεβού του ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Επεξεργαστής Ημερολογίου/Εργασιών του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Στοιχείο Ημερολογίου του Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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 "Απρίλιος"
@@ -6821,6 +6908,23 @@ msgstr "Γενέθλια και επέτειοι"
 msgid "On The Web"
 msgstr "Στον δικτυακό ιστό"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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'."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Δεν ήταν δυνατό το άνοιγμα  των εργασιών στο '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1η"
@@ -7040,7 +7144,7 @@ msgid "Contacts: "
 msgstr "Επαφές: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Προεπισκόπηση Εκτύπωσης"
 
@@ -7052,71 +7156,81 @@ msgstr "Εκτύπωση Στοιχείου"
 msgid "Print Setup"
 msgstr "Ρυθμίσεις Εκτύπωσης"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Η λίστα εργασιών '%s' θα απομακρυνθεί. Είστε σίγουροι ότι θέλετε να "
 "συνεχίσετε?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Νέα λίστα εργασιών"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Διαγραμμένα"
+msgstr[1] "Διαγραμμένα"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Φόρτωση εργασιών"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Αδυναμία ανοίγματος της λίστας εργασιών '%s' για την δημιουργία γεγονότων "
 "και συναντήσεων"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "δεν υπάρχει διαθέσιμο ημερολόγιο για την δημιουργία εργασιών"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Νέα εργασία"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Εργασία"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Δημιουργία νέας εργασίας"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Νέα εργασία"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Ομάδα λίστας εργασιών"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Δημιουργία νέας εργασίας"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Το URI του φακέλου ενεργειών προς εμφάνιση"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Αδύνατη η φόρτωση ενεργειών στο `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7129,11 +7243,11 @@ msgstr ""
 "\n"
 "Είστε βέβαιοι για την διαγραφή των μηνυμάτων;"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Να μην ξαναγίνει η ερώτηση."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Εργασίες Εκτύπωσης"
 
@@ -8781,7 +8895,7 @@ msgstr "Αντιγραφή περιεχομένων φακέλου τοπικά
 msgid "Downloading new messages for offline mode"
 msgstr "Μεταφόρτωση νέων μηνυμάτων για εργασία χωρίς σύνδεση"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Προετοιμασία φακέλου  '%s' για εργασία χωρίς σύνδεση"
@@ -8875,33 +8989,6 @@ msgstr "Μη έγκυρη παράμετρος σε (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Σφάλμα στην εκτέλεση αναζήτησης φίλτρου: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Αδυναμία ανάλυσης έκφρασης αναζήτησης: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Σφάλμα στην εκτέλεση έκφρασης αναζήτησης: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8934,7 +9021,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Φιλτράρισμα νέων μηνυμάτων"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Αδυναμία ανάλυσης έκφρασης αναζήτησης: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Σφάλμα στην εκτέλεση έκφρασης αναζήτησης: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(ταίρισμα-όλων) απαιτεί ένα single bool result"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Γίνεται επερώτηση σε άγνωστη επικεφαλίδα: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8945,15 +9077,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Αποτυχία ανάλυσης gpg userid hint."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Αποτυχία ανάλυσης gpg passphrase request."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8962,29 +9094,29 @@ msgstr ""
 "Χρειάζεστε μια φράση εισόδου για το ξεκλείδωμα του κλειδιού για\n"
 "χρήστη: \"%s\" "
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ακυρώθηκε."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Αποτυχία ξεκλειδώματος μυστικού κλειδιού: Δόθηκαν 3 εσφαλμένες φράσεις "
 "εισόδου."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Αναπάντεχη απάντηση από GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Δεν ήταν δυνατή η κρυπτογράφηση: δεν έχουν οριστεί έγκυροι παραλήπτες"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8995,85 +9127,64 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Αποτυχία GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Δεν ήταν δυνατή η υπογραφή δεδομένων:%s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Αυτό το σημείο του μηνύματος είναι ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Δεν ήταν δυνατή η επαλήθευση υπογραφής μηνύματος: δεν ήταν δυνατή η "
 "δημιουργία προσωρινού αρχείου: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Δεν ήταν δυνατή η δημιουργία κρυπτογραφημένων δεδομένων: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Αυτό το μέρος του μηνύματος είναι  ψηφιακά υπογεγραμμένο"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Κρυπτογραφημένο περιεχόμενο"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Αδύνατη η ανάλυση του περιεχομένου του μηνύματος"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Αδύνατη η κατασκευή σωλήνωσης με βοήθημα κλειδωμάτων: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμάτων: %s"
-
-#: 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 ""
-"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Δεν ήταν δυνατό το κλείδωμα του %s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9095,6 +9206,27 @@ msgstr "Αποτυχία κλειδώματος με χρήση fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Αποτυχία κλειδώματος με χρήση flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Αδύνατη η κατασκευή σωλήνωσης με βοήθημα κλειδωμάτων: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Αδύνατη η δικράνωση βοηθήματος κλειδωμάτων: %s"
+
+#: 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 ""
+"Δεν ήταν δυνατό να κλειδωθεί το %s: σφάλμα πρωτοκόλλου με βοήθημα κλειδωμάτων"
+
+#: 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"
@@ -9356,7 +9488,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Εσφαλμένη απάντηση πιστοποίησης από τον διακομιστή"
 
@@ -9561,7 +9693,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Πιστοποιητικό κρ_υπτογράφησης:"
 
 #: camel/camel-smime-context.c:360
@@ -9578,7 +9710,7 @@ msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου
 msgid "Failed to add data to CMS encoder"
 msgstr "Αποτυχία προσθήκης στον φάκελο 'Απεσταλμένα': %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Δεν ήταν δυνατή η πιστοποίηση.\n"
@@ -9643,98 +9775,98 @@ msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: %
 msgid "Cannot set message digests"
 msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Αποτυχία υπογραφής πιστοποιητικού"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Έγκυρη υπογραφή"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Υπογράφων: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Η εντολή IMAP απέτυχε: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Δεν ήταν δυνατό το κλείδωμα του φακέλου στο %s: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Αποτυχία σποστολής ονόματος χρήστη στον διακομιστή"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Η εντολή δεν έχει ενσωματωθεί"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9753,16 +9885,26 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Δεν είναι δυνατό να δημιουργηθεί ο φακέλος: Μη έγκυρη σε αυτή την αποθήκη"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου`%s': ο φάκελος υπάρχει"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Άκυρη λειτουργία"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Απορρίμματα"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ανεπιθύμητη αλληλογραφία"
@@ -9883,7 +10025,7 @@ msgstr "Η χρήση κλειδιού δεν υποστηρίζει υπογρ�
 msgid "Error in application verification"
 msgstr "Σφάλμα στην επαλήθευση εφαρμογής"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9896,11 +10038,11 @@ msgstr ""
 "Αποτύπωμα:       %s\n"
 "Υπογραφή:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "ΚΑΛΟ"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "ΚΑΚΟ"
 
@@ -9924,7 +10066,7 @@ msgstr ""
 "Θέλετε να το δεχτείτε ούτως ή άλλως;"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9939,7 +10081,7 @@ msgstr ""
 "\n"
 "Θέλετε να το αποδεχθείτε;"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9948,7 +10090,7 @@ msgstr ""
 "Πρόβλημα Πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9957,7 +10099,7 @@ msgstr ""
 "Εσφαλμένος τομέας πιστοποιητικού: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9966,7 +10108,7 @@ msgstr ""
 "Το πιστοποιητικό έχει λήξει: %s\n"
 "Εκδότης: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9980,17 +10122,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Αδυναμία ανάλυσης URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Σφάλμα αποθήκευσης `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Κανένα τέτοιο μήνυμα %s στο %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυμάτων σε ένα εικονικό φάκελο"
 
@@ -9999,11 +10141,6 @@ msgstr "Αδυναμία αντιγραφής ή μετακίνησης μηνυ
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου %s: Δεν υπάρχει ο φάκελος"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Δεν ήταν δυνατή η μετονομασία του φακέλου %s: Άκυρη λειτουργία"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10020,10 +10157,12 @@ 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 "Έλεγχος για νέα μηνύματα σε όλους τους φακέλους"
@@ -10056,6 +10195,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Για την πρόσβαση σε εξυπηρετητές Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10077,26 +10217,327 @@ msgstr ""
 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: %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 "Δεν είναι δυνατή η λήψη του φακέλου: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
+
+#: 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: %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 "Παράκαμψη φακέλου namespace που παρέχεται από τον διακομιστή"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Namespace"
+
+#: 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:429
+#, 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
+#, c-format
+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:140
+#: 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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Η σύνδεση ακυρώθηκε"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Άγνωστο Σφάλμα"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Δεν ήταν δυνατή η σύνδεση με το διακομιστή POP %s: Δεν υποστηρίζεται ο "
+"μηχανισμός πιστοποίησης."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sΠαρακαλώ εισάγετε τον κωδικό πρόσβασης SMTP για %s στο σύστημα %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
+"χαρακτήρα \"%c\""
+
+#: 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': %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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': %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': %s"
+
+#: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Η λειτουργία ακυρώθηκε"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Απροσδόκητη αποσύνδεση του διακομιστή: %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:1089
-msgid "Unknown error"
-msgstr "Άγνωστο Σφάλμα"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10141,21 +10582,21 @@ msgstr "Δεν ήταν δυνατή η δημιουργία του καταλό
 msgid "Could not load summary for %s"
 msgstr "Δεν ήταν δυνατή η φόρτωση της περίληψης του  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Γίνεται σάρωση για αλλαγμένα μηνύματα"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -10171,25 +10612,25 @@ msgstr ""
 "Δεν μπορεί να γίνει η λήψη του μηνύματος: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Δεν υπάρχει τέτοιο μήνυμα"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Το μήνυμα δεν είναι διαθέσιμο αύτη την στιγμή"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Αδυναμία εύρεσης σώματος μηνύματος στην απάντηση FETCH."
 
@@ -10228,23 +10669,6 @@ msgstr "Χρήση προσαρμοσμένης εντολής για την σ�
 msgid "Command:"
 msgstr "Εντολή:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Φάκελοι"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Εμφάνιση μόνο των φακέλων με συνδρομή"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Παράκαμψη φακέλου namespace που παρέχεται από τον διακομιστή"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10268,87 +10692,44 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Για ανάγνωση και αποθήκευση μηνυμάτων σε διακομιστές IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Διακομιστής IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Υπηρεσία IMAP για %s στο %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL δεν είναι διαθέσιμο"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Η σύνδεση ακυρώθηκε"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Δεν ήταν δυνατή η σύνδεση με τον διακομιστή IMAP %s σε ασφαλή λειτουργία: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Η επέκταση SSL/TLS  δεν υποστηρίζεται"
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Αποτυχία διαπραγματεύσεων SSL"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Δεν ήταν δυνατή η σύνδεση με την εντολή \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Ο διακομιστής IMAP %s δεν υποστηρίζει την αιτούμενο τύπο πιστοποίησης %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Δεν έχετε εισάγει κωδικό πρόσβασης."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10359,27 +10740,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Δεν υπάρχει τέτοιος φάκελος %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"Το όνομα φακέλου \"%s\" δεν είναι έγκυρο δεν μπορεί να περιέχει τον "
-"χαρακτήρα \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να περιέχει υποφάκελους"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10387,7 +10759,7 @@ msgstr "Ο μητρικός φάκελος δεν επιτρέπεται να π
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: `%s': ο φάκελος υπάρχει"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Άγνωστος μητρικός φάκελος: %s"
@@ -10495,59 +10867,59 @@ msgstr ""
 "Μπορεί ακόμα να χρησιμοποιηθούν για την ανάγνωση δέντρου φακέλων στυλ Elm, "
 "Pine, ή Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Η αποθήκη του root %s δεν είναι απόλυτη θέση"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Η αποθήκη του root %s δεν είναι κανονικός κατάλογος"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Οι τοπικές αποθήκες δεν έχουν εισερχόμενα"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Τοπικό αρχείο μηνυμάτων %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10613,7 +10985,7 @@ msgstr "Δεν ήταν δυνατή η διαγραφή του φακέλου `
 msgid "not a maildir directory"
 msgstr "δεν είναι κατάλογος maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10945,7 +11317,7 @@ msgid "Server rejected username/password"
 msgstr "Ο διακομιστής απέρριψε το όνομα χρήστη/κωδικό"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10954,8 +11326,8 @@ msgid "User cancelled"
 msgstr "Ακυρώθηκε από τον χρήστη"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10964,49 +11336,49 @@ msgstr "Ακυρώθηκε από τον χρήστη"
 msgid "Cannot get message %s: %s"
 msgstr "Αδυναμία λήψης  μηνύματος %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Εσωτερικό σφάλμα: uid σε μή έγκυρη μορφή: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "Η δημοσίευση δεν επιτρέπεται από τον εξυπηρετητή συζητήσεων"
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Δεν μπορείτε να στέλνετε μηνύματα NNTP όταν εργάζεστε χωρίς σύνδεση!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Δεν ήταν δυνατή η αντιγραφή μηνυμάτων από έναν φάκελο NNTP!"
 
@@ -11136,7 +11508,8 @@ msgid "Could not get group: %s"
 msgstr "Αδυναμία λήψης ομάδας: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Δεν είναι δυνατή η λήψη μηνυμάτων: ακαθόριστο σφάλμα"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11189,8 +11562,8 @@ msgstr "Κανένα μήνυμα με uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Παραλαβή μηνύματος ΡΟΡ %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Άγνωστος λόγος"
 
@@ -11663,7 +12036,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "συννημένο"
 
@@ -11707,6 +12080,105 @@ msgstr "Τύπος MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Πρόταση για αυτόματη προβολή της επισύναψης"
 
+#: 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 "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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] "<b>%d</b> αρχείο επισυνάφθηκε"
+msgstr[1] "<b>%d</b> αρχεία επισυνάφθηκαν"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Απόκρυψη εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
+
+#: 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 ""
+"Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
+"Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
+
+#: 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 ""
+"Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
+"Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML.\n"
+"Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
+"gtkhtml και libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
+"Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
+"οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Προορισμός αποστολής"
@@ -11788,213 +12260,135 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr "Επισύναψη αρχείου(ων)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
-"υπογραφής από τον λογαριασμό."
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Αδυναμία υπογραφής εξερχόμενου μηνύματος: Δεν έχει ορισθεί πιστοποιητικό "
-"κρυπτογράφησης  από τον λογαριασμό."
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Δεν ήταν δυνατό το άνοιγμα του αρχείου"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Αδύνατη η ανάκτηση του μηνύματος από τον επεξεργαστή"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Πολλαπλά Μηνύματα"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Άνοιγμα αρχείου"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Αυτόματη δημιουργία"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Υπογραφή:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> αρχείο επισυνάφθηκε"
-msgstr[1] "<b>%d</b> αρχεία επισυνάφθηκαν"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Απόκρυψη εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Εμφάνιση εργαλειοθήκης συνη_μμένων (ρίξτε τα συνημμένα εδώ)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Συγγραφή νέου μηνύματος"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Επισύναψη αρχείου στο μήνυμα"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
-"Αδύνατη η ενεργοποίηση του συστατικού ελέγχου του επιλογέα διευθύνσεων."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
-"Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML.\n"
-"Βεβαιωθείτε ότι έχετε εγκατεστημένη την σωστή έκδοση\n"
-"gtkhtml και libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Δεν ήταν δυνατή ή δημιουργία του παραθύρου του επεξεργαστή:\n"
-"Αδύνατη η ενεργοποίηση του συστατικού του επεξεργαστή HTML."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Ο επεξεργαστής περιέχει ένα σώμα μηνύματος που δεν είναι κείμενο, στο "
-"οποίο δεν είναι δυνατή η επεξεργασία.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού χωρίς όνομα;"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Μη αναγνωσμένα μηνύματα"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Δεν ήταν δυνατή η κατασκευή σωλήνωσης: %s"
+msgid "Don't Recover"
+msgstr "Όχι απομάκρυνση"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
+msgid "Recover"
+msgstr "Αφαίρεση"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Α_πόρριψη Αλλαγών"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Όχι απομάκρυνση"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Σφάλμα κατά την αποθήκευση των συντομεύσεων."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Είστε βέβαιοι για την διαγραφή του ραντεβού χωρίς όνομα;"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Αφαίρεση"
+msgid "Discard Changes"
+msgstr "Α_πόρριψη Αλλαγών"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Αποθήκευση μηνύματος..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Δεν ήταν δυνατή η κατασκευή σωλήνωσης: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Μη αναγνωσμένα μηνύματα"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Προειδοποίηση: Τροποποιημένο Μήνυμα"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Επισύναψη αρχείου στο μήνυμα"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Πρέπει να ρυθμίσετε έναν λογαριασμό πριν από την συγγραφή μηνύματος."
 
@@ -12127,7 +12521,8 @@ msgstr ""
 "Υπάρχει  ήδη αρχείο με αυτό το όνομα\n"
 "Να γίνει επικάλυψη;"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Επικάλυψη αρχείου;"
 
@@ -12305,81 +12700,97 @@ msgstr "Επιλέξτε μια ώρα για να συγκρίνετε"
 msgid "_Filter Rules"
 msgstr "Κανόνες Φίλτρων"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Σφάλμα στη κανονική έκφραση '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Το αρχείο '%s'  δεν υπάρχει ή δεν είναι κανονικό αρχείο."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Ανανέωση Συνάντησης"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "Διακεκριμένο ό_νομα:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Πρέπει να επιλέξετε ένα όνομα αρχείου."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Αφαιρείται ο φακέλος %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Το αρχείο '%s'  δεν υπάρχει ή δεν είναι κανονικό αρχείο."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Εργασία"
+msgid "Missing folder."
+msgstr "Αφαιρείται ο φακέλος %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Δεν έχει επιλεγεί διακομιστής"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Σφάλμα στη κανονική έκφραση '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Πρέπει να επιλέξετε μια ημερομηνία."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Εργασία"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Πρέπει να δώσετε όνομα σ' αυτό το φίλτρο."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Πρέπει να δώσετε όνομα στον eφάκελο."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Πρέπει να επιλέξετε ένα όνομα αρχείου."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Πρέπει να καθορίσετε ένα κατάλογο."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Δεν έχει επιλεγεί διακομιστής"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12392,66 +12803,11 @@ msgstr "Επιλογή ενός αρχείου"
 msgid "<b>Then</b>"
 msgstr "<b>Λήγει:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Επιλογή Φακέλου"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Σημαντικό"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Πρός Τακτοποίηση"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Αργότερα"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Δοκιμή"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "'Όνομα κανόνα: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Χωρίς τίτλο"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Λήγει:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Εκτέλεση ενεργειών"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "εισερχόμενα"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "εξερχόμενα"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12542,6 +12898,77 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Λήγει:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "αν ικανοποιηθούν όλα τα κριτήρια"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "αν ικανοποιηθούν κάποια από τα κριτήρια"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Εκτέλεση ενεργειών"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Εξουσιοδοτήθηκε"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Παραλήπτες"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Απαντήσεις σε %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Μαζί με:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "εισερχόμενα"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "εξερχόμενα"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12671,7 +13098,7 @@ msgstr "δεν έχει Σημαία"
 msgid "Junk Test"
 msgstr "Δοκιμή ανεπιθύμητης αλληλογραφίας"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Ετικέτα"
@@ -12709,7 +13136,7 @@ msgstr "Έξοδος από το πρόγραμμα"
 msgid "Play Sound"
 msgstr "Εκτέλεση Ήχου"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Αναγνωσμένα"
 
@@ -12779,9 +13206,9 @@ msgstr "ξεκινά με"
 msgid "Stop Processing"
 msgstr "Τερματισμός Επεξεργασίας"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Θέμα"
@@ -12844,105 +13271,60 @@ msgstr "Θέμα δεν περιέχει"
 msgid "Virtual _Folders"
 msgstr "Εικονικοί Φάκελοι"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Προσθήκη"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Πηγή εΦακέλων"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Προτιμήσεις Επεξεργαστή"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
-"ασφάλειας και της προβολής μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Έλεγχος λογαριασμών αλληλογραφίας Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Συστατικό αλληλογραφίας του Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Επεξεργαστής μηνυμάτων του Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Έλεγχος ρυθμίσεων επεξεργαστή  μηνυμάτων του Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Έλεγχος προτιμήσεων Evolution Mail "
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Μηνύματα"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "Προτιμήσεις Αλληλογραφίας"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Προεπιλογή]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Όνομα λογαριασμού:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Πρωτόκολλο"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Χωρίς τίτλο"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Γλώσσα"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Προσθήκη υπογραφής"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Υπογραφή(ές)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "--------Προωθημένο Μήνυμα --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "Στις  %d-%m-%Y, ημέρα %a, και ώρα %H:%M %%+05d, ο/η %%s έγραψε:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Δημιουργία Ει_κονικού Φακέλου Από το Μήνυμα..."
 
@@ -12976,265 +13358,439 @@ msgstr "<κάντε κλικ εδώ για να επιλέξετε φάκελο>
 msgid "Create New Folder"
 msgstr "Δημιουργία Νέου Φακέλου.."
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "ΕΦάκελοι"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "ΑΤΑΙΡΙΑΣΤΑ"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Εισερχόμενα"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Γίνεται φόρτωση..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Αδυναμία μετακίνησης μηνυμάτων σε ένα toplevel store"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Μετακίνηση"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Ακύρωση Εργασίας"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Επιλογή Φακέλου"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Αντιγραφή"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Δημιουργία φακέλου"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Μετονομασία φακέλου \"%s\" σε:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Μετονομασία Φακέλου"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Προβολή"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Άνοιγμα σε _Νέο παράθυρο"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Μετακίνηση"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Νέος Φάκελος..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Μετονομασία"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "ΕΦάκελοι"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "Μηνύματα"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Επεξεργασία ως Νέο Μήνυμα..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Εκτύπωση"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Απάντηση στον Αποστολέα"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Απάντηση στη _Λίστα"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Απάντηση σε _Όλους"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Προώθηση"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Παρα_κολούθηση..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Ση_μαία Ολοκληρώθηκε"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Εκκα_θάριση Σημαίας"
 
-#: mail/em-folder-view.c:787 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 "Σήμανση _ως Αναγνωσμένο"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Σήμανση ως _Μη Αναγνωσμένο"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Σήμανση ως _Σημαντικό"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Σή_μανση ως Μη Σημαντικά"
 
-#: mail/em-folder-view.c:791 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 "Σήμανση ως ανεπι_θύμητη αλληλογραφία"
 
-#: mail/em-folder-view.c:792 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 "Σήμανση ως  επιθ_υμητή αλληλογραφία"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Α_κύρωση Διαγραφής"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Με_τακίνηση στο Φάκελο..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Αντιγραφή στο Φάκελο..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Προσθήκη Αποστολέα στο _Βιβλίο Διευθύνσεων"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Εφαρμο_γή Φίλτρων"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Κανόνες Φίλτρων"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Δη_μιουργία Κανόνα Από το Μήνυμα"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "ΕΦάκελος στο _Θέμα"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "ΕΦάκελος στον _Αποστολέα"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "ΕΦάκελος στους παραλήπτες"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "ΕΦάκελος στη Λίστα _Ταχυδρομείου"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "ΕΦάκελος στην αλληλουχία"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Φίλτρο στο Θ_έμα"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Φίλτρο στον Α_ποστολέα"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Φίλτρο στους Παρα_λήπτες"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Φίλτρο στη Λίστα _Ταχυδρομείου"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Φίλτρο στην αλληλουχία"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Προεπιλογή"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Εκτύπωση Μηνύματος"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "Αντι_γραφή τοποθεσίας δεσμού"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Κλικ εδώ για μήνυμα σε %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Αντίγραφο:"
+
+#: 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 "Ιδιαίτερη Κοινοποίηση"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Κλικ για άνοιγμα %s"
+msgid "%s attachment"
+msgstr " %s επισύναψη"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Αδυναμία ανάλυσης μηνύματος S/MIME: Άγνωστο σφάλμα"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησης για  multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Παραλαμβάνεται  %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Μη υπογεγραμμένο"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Έγκυρη υπογραφή"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Μή έγκυρη υπογραφή"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Αποκρυπτογραφημένο"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Αδύναμα κρυπτογραφημένο"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Κρυπτογραφημένο"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Ισχυρά κρυπτογραφημένο"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Δείκτης σε σελίδα FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στη σελίδα \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Δείκτης σε τοπικό αρχείο (%s)"
+
+#: 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\")"
+
+#: mail/em-format-html.c:1137
+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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13242,11 +13798,7 @@ msgstr "Κλικ για άνοιγμα %s"
 msgid "Matches: %d"
 msgstr "Ταιριάσματα: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Μη υπογεγραμμένο"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13254,11 +13806,7 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο. Δεν υπάρχει εγγύηση ότι το μήνυμαείναι "
 "αυθεντικό."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Έγκυρη υπογραφή"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13266,11 +13814,7 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο και έγκυρο, ο αποστολέας του μηνύματος "
 "είναι και αυτός που ισχυρίζεται ότι είναι."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Μή έγκυρη υπογραφή"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13278,11 +13822,11 @@ msgstr ""
 "Η υπογραφή του μηνύματος δεν μπορεί να επιβεβαιωθεί, μπορεί να έχει "
 "αλλοιωθεί κατά  την μεταφορά."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Έγκυρη υπογραφή, αδυναμία επιβεβαίωσης αποστολέα"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13290,11 +13834,7 @@ msgstr ""
 "Αυτό το μήνυμα είναι υπογεγραμμένο με μια έγκυρη υπογραφή, αλλά δεν είναι "
 "δυνατή η επιβεβαίωση του αποστολέα."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Αποκρυπτογραφημένο"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13303,11 +13843,7 @@ msgstr ""
 "Αυτό το μήνυμα δεν είναι κρυπτογραφημένο. Το περιεχόμενο του μπορεί να "
 "αναγνωστεί κατά την μεταφορά του στο διαδίκτυο."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Αδύναμα κρυπτογραφημένο"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13317,11 +13853,7 @@ msgstr ""
 "κρυπτογράφησης. Θα είναι  δύσκολο αλλά όχι αδύνατο σε ένα τρίτο να διαβάσει "
 "το περιεχόμενο του μηνύματος μέσα  σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Κρυπτογραφημένο"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13329,11 +13861,7 @@ msgstr ""
 "Αυτό το μήνυμα είναι κρυπτογραφημένο. Θα είναι δύσκολο σε ένα τρίτο να "
 "διαβάσει το περιεχόμενο του μηνύματος."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Ισχυρά κρυπτογραφημένο"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13343,182 +13871,63 @@ msgstr ""
 "Θα είναι εξαρετικά δύσκολο σε ένα τρίτο να διαβάσει το περιεχόμενο του "
 "μηνύματος μέσα σε ένα λογικό χρόνο."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "Προ_βολή πιστοποιητικού"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Το πιστοποιητικό δεν είναι αναγνώσιμο"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ολοληρώθηκε σε %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "'Εχουν λήξει:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "από %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "Προβολή μέ_σα στο μήνυμα"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "Απόκρυ_ψη"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Σελίδα %d από %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Παραλαμβάνεται  %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Κακοδιατυπωμένο εξωτερικό μέρος μηνύματος."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Δείκτης σε σελίδα FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Δείκτης σε τοπικό αρχείο (%s) έγκυρο στη σελίδα \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Δείκτης σε τοπικό αρχείο (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Δείκτης σε απομακρυσμένα δεδομένα (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Δείκτης σε άγνωστα εξωτερικά δεδομένα (τύπος \"%s\")"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Μορφοποίηση μηνυμάτων"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Από"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Απάντηση Σε"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Προς"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Αντίγραφο:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Ιδιαίτερη Κοινοποίηση"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Πρόγραμμα αλληλογραφίας"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Ημερομηνία"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr " %s επισύναψη"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Αδυναμία ανάλυσης μηνύματος S/MIME: Άγνωστο σφάλμα"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Μη υποστηριζόμενος τύπος κρυπτογράφησης για  multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Δεν ήταν δυνατή η ανάλυση του μηνύματος MIME. Προβολή ως πηγή."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Μη υποστηριζόμενη μορφή υπογραφής"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Άγνωστο σφάλμα επιβεβαίωσης υπογραφής"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ενσωματωμένος)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Κάθε χρόνο"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Κάθε εβδομάδα"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "κάθε  μήνα"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13530,25 +13939,55 @@ msgstr ""
 "\n"
 "Περιμένετε μέχρι το Evolution να εισάγει τους φακέλους σας..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Αποτυχία εισαγωγής pop3 uid caches: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου `%s': %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Αποτυχία εισαγωγής folder expand state: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Αδυναμία αποθήκευσης αρχείου λίστας ομάδας για %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Δεν είναι δυνατή η πιστοποίηση στο διακομιστή POP %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Αποτυχία δημιουργίας καταλόγου `%s': %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Αποτυχία ανοίγματος αποθηκευτικού χώρου για `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Αποτυχία δημιουργίας καταλόγου `%s': %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13559,90 +13998,76 @@ msgstr "Αποθήκευση ως..."
 msgid "untitled_image.%s"
 msgstr "ανώνυμη_εικόνα.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Καθορισμός ως _παρασκήνιο"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "Α_πάντηση στον αποστολέα"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "Άν_οιγμα δεσμού στον φυλλομετρητή"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Αποστολή _μηνύματος στο..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Προσ_ήκη στο Βιβλίο Διευθύνσεων"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Άνοιγμα με %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Αυτός ο αποθηκευτικός χώρος δεν υποστηρίζει συνδρομές, ή δεν είναι "
 "ενεργοποιημένες."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Συνδρομή"
 
-#: mail/em-subscribe-editor.c:637 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 "Φάκελος"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Παρακαλώ επιλέξτε διακομιστή."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Δεν έχει επιλεγεί διακομιστής"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Να μην ξαναεμφανιστεί αυτό το μήνυμα"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Φίλτρα"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "--------Προωθημένο Μήνυμα --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Στις  %d-%m-%Y, ημέρα %a, και ώρα %H:%M %%+05d, ο/η %%s έγραψε:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "μήνυμα"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Αποθήκευση μηνύματος..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Προσθήκη διεύθυνσης"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Μήνυμα από τον/την %s"
@@ -13660,11 +14085,13 @@ msgid "Check incoming mail being junk"
 msgstr "Έλεγχος εισερχόμενης αλληλογραφία για ανεπιθύμητα μηνύματα"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Χρώμα επισήμανσης παραθέσεων"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Χρώμα επισήμανσης παραθέσεων."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13771,40 +14198,51 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Λίστα από Ετικέτες και από τα συσχετιζόμενα χρώματα τους"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Λίστα λογαριασμών"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Λίστα λογαριασμών"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Λίστα προσαρμοσμένων κεφαλίδων και αν θα είναι ενεργοποιημένες."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Λίστα τύπων mime για έλεγχο για εφαρμογές προβολής συστατικού bonobo"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Φόρτωση εικόνων για μηνύματα HTML σε http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13815,90 +14253,90 @@ msgstr ""
 "αποστολέας είναι στο βιβλίο διευθύνσεων  2 - Να φορτώνονται πάντοτε εικόνες "
 "από το δίκτυο"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Καταγραφή ενεργειών φίλτρων"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Καταγραφή ενεργειών φίλτρων στο καθορισμένο αρχείο καταγραφής."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Αρχείο καταγραφής για τις ενέργειες φίλτρων."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Σημείωση ως ανοιγμένα μετά από καθορισμένο χρόνο."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Σημείωση παραθέσεων στην\"Προεπισκόπηση\" μηνύματος."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Προεπιλεγμένο ύψος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Προεπιλεγμένο πλάτος του παραθύρου μυνήματος"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 "Στυλ εμφάνισης μηνύματος (κανονικό, πλήρεις κεφαλίδες, πηγαίος κώδικας)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Αρχείο ήχου ειδοποίησης Νέου Μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Τύπος ειδοποίησης νέου μηνύματος"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Ειδοποίηση σε κενό θέμα"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να κάνει εκκαθάριση ενός φακέλου."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Ειδοποίηση όταν ο χρήστης κάνει εκκαθάριση"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Ειδοποίηση όταν ο χρήστης συμπληρώνει μόνο το πεδίο Κρυφ.Κοιν"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13906,37 +14344,29 @@ msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει HTML σε επαφές που δεν "
 "επιθυμούν αλληλογραφία σε HTML."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς παραλήπτες "
 "στο Πρός ή στο Κοινοποίηση."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ανεπιθύμητο HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Αναγνώριση δεσμών στο κείμενο και αντικατάσταση τους."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Αναγνώριση smileys στο κείμενο και αντικατάσταση τους με εικόνες."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr ""
 "Εκτέλεση δοκιμής ανεπιθύμητης αλληλογραφίας στην εισερχόμενη αλληλογραφία"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Προεπιλεγμένη αποστολή μηνυμάτων σε HTML"
@@ -13985,7 +14415,7 @@ msgstr "Έλεγχος ορθογραφίας"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Προεπιλεγμένο ύψος του παραθύρου μυνήματος"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -14129,33 +14559,66 @@ msgstr "θύρα για έναρξη spamd εκτελεσμένου από χρ�
 msgid "spamd port"
 msgstr "θύρα spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Εισαγωγέας Elm του Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Εισαγωγέας αλληλογραφίας Netscape του Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Προτιμήσεις Επεξεργαστή"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Εισαγωγέας Outlook Express 4 του Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Ρύθμιστε εδώ τις προτιμήσεις αλληλογραφίας, συμπεριλαμβανομένης της "
+"ασφάλειας και της προβολής μηνυμάτων"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Εισαγωγέας Pine του Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Ρύθμιστε εδώ τον έλεγχο ορθογραφίας, υπογραφές και τον επεξεργαστή μηνυμάτων"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Εισαγωγέας mbox του Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Ρυθμίστε εδώ τους λογαριασμούς αλληλογραφίας σας"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Έλεγχος λογαριασμών αλληλογραφίας Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Συστατικό αλληλογραφίας του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Επεξεργαστής μηνυμάτων του Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Έλεγχος ρυθμίσεων επεξεργαστή  μηνυμάτων του Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Έλεγχος προτιμήσεων Evolution Mail "
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "Προτιμήσεις Αλληλογραφίας"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Ταχυδρομείο:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14163,15 +14626,15 @@ msgstr "Evolution εισάγει τα παλαιά σας Elm μηνύματα"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Παρακαλώ περιμένετε"
 
@@ -14200,18 +14663,46 @@ msgid "Select folder to import into"
 msgstr "Επιλογή ενός φακέλου για εισαγωγή σε"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Εισάγεται`%s'"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Γίνεται Εισαγωγή mailbox"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Εισαγωγέας Elm του Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Εισαγωγέας αλληλογραφίας Netscape του Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Εισαγωγέας Outlook Express 4 του Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Εισαγωγέας Pine του Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Εισαγωγέας mbox του Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Γίνεται σάρωση του %s"
@@ -14221,7 +14712,7 @@ msgstr "Γίνεται σάρωση του %s"
 msgid "Priority Filter \"%s\""
 msgstr "Φίλτρο Προτεραιότητας \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14248,7 +14739,7 @@ msgstr ""
 "εισηγμένα\n"
 "φίλτρα για να δείτε αν όλα λειτουργούν όπως πρέπει."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14260,7 +14751,7 @@ msgstr ""
 "τα οποία δεν υποστηρίζονται από το Evolution.\n"
 "Αυτά τα φίλτρα δεν θα χρησιμοποιηθούν."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14274,23 +14765,23 @@ msgstr ""
 "τροποποιήθηκαν ώστε να αναζητούν αν το αλφαριθμητικό είναι\n"
 "ή δεν είναι στο σώμα του μηνύματος."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Το Evolution εισάγει τα παλαιά σας δεδομένα Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Εισαγωγή δεδομένων Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14323,127 +14814,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Επεξεργαστής Λογαριασμού Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Key Agreement"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Σύστημα:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Όνομα Χρήστη:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Θέση:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Μήνυμα σε %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Το θέμα είναι %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Μήνυμα από τον/την %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s λίστα ταχυδρομείου"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Απαντήσεις σε %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Προσθήκη Κανόνα Φίλτρου"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Διαγραμμένα"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d ημέρες"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d δευτερόλεπτα"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d δευτερόλεπτα"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d επαφές"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Διαγραμμένα"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Νέο Μήνυμα Ταχυδρομείου"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Αποστολή Μηνύματος"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Συγγραφή νέου μηνύματος"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Φίλτρα Μηνυμάτων"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Δημιουργία νέου ημερολογίου"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "Το URI  της πηγής αλληλογραφίας που θα εμφανίσει η προβολή"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Ταυτότητα"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14454,12 +14957,12 @@ msgstr ""
 "συμπληρωθούν εκτός αν θέλετε να συμπεριλάβετε αυτές τις πληροφορίες όταν "
 "στέλνετε μηνύματα."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Λήψη Μηνυμάτων"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14468,15 +14971,15 @@ msgstr ""
 "δεν είστε βέβαιοι, ρωτήστε τον διαχειριστή δικτύου σας ή τον Πάροχο "
 "Υπηρεσιών Διαδικτύου."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Παρακαλώ επιλέξτε ανάμεσα ανάμεσα στις παρακάτω επιλογές"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Αποστολή Αλληλογραφίας"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14485,11 +14988,11 @@ msgstr ""
 "μηνυμάτων. Αν δεν είστε βέβαιοι ρωτήστε τον διαχειριστή δικτύου σας ή τον "
 "Παροχέα Διαδικτύου."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Διαχείριση Λογαριασμού"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14503,14 +15006,6 @@ msgstr ""
 "ταχυδρομείου Evolution. Παρακαλώ εισάγετε ένα όνομα στο παρακάτω κενό.Το "
 "όνομα είναι μόνο για να προβάλει τον λογαριασμό."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Γίνεται Έλεγχος Υπηρεσίας"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Σύνδεση στο διακομιστή..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14833,7 +15328,8 @@ msgid "Execute Command..."
 msgstr "Εκτέλεση Εντολής..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Στα_θερού πλάτους:"
 
 #: mail/mail-config.glade.h:82
@@ -15162,446 +15658,563 @@ msgstr " χρώμα"
 msgid "description"
 msgstr "Περιγραφή"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Ένας φάκελος που ονομάζεται \"%s\" υπάρχει ήδη. Παρακαλώ χρησιμοποιείστε ένα "
-"διαφορετικό όνομα."
+msgid "Invalid authentication"
+msgstr "Πιστοποίηση"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Είστε βέβαιοι για την διαγραφή αυτού του λογαριασμού;"
-
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+#. 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-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"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-errors.xml.in.h:6
+#. 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 "Είστε βέβαιοι για την διαγραφή αυτού του URL?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς παραλήπτες "
-"στο Πρός ή στο Κοινοποίηση."
+"Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
+" παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
+"%s Να αποσταλεί οπωσδήποτε?"
+
+#: 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-errors.xml.in.h:8
+#. 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 "Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς θέμα."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
+"Ειδοποίηση όταν ο χρήστης προσπαθεί να στείλει ένα μήνυμα χωρίς παραλήπτες "
+"στο Πρός ή στο Κοινοποίηση."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Αδυναμία αντιγραφής φακέλου: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου `%s': %s."
+msgid "Use default drafts folder?"
+msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο επαφών"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Δεν ήταν δυνατή η διαγραφή του φακέλου:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:18
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Δεν ήταν δυνατή η διαγραφή του τοπικού φακέλου %s"
+"Δεν είναι δυνατό το άνοιγμα του προσωρινού φακέλου για αυτόν τον "
+"λογαριασμό.\n"
+"Θέλετε να κάνετε χρήση του προεπιλεγμένου προσωρινού φακέλου;"
 
-#: mail/mail-errors.xml.in.h:19
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Δεν είναι δυνατή η λήψη του φακέλου`%s' . Ο φάκελος δεν υπάρχει."
+msgid "Use _Default"
+msgstr "Προεπιλογή"
 
-#: mail/mail-errors.xml.in.h:20
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Αδυναμία μετακίνησης φακέλου: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
+"Μόνιμη διαγραφή όλων των μηνυμάτων που έχουν διαγραφεί από αυτόν τον φάκελο"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
+#. 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-errors.xml.in.h:22
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
+msgid "_Expunge"
+msgstr "Ε_ξάλειψη"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Δεν ήταν δυνατό το άνοιγμα του μηνύματος"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
+"Οριστική διαγραφή όλων των διαγραμμένων μηνυμάτων από όλους τους φακέλους"
 
-#: mail/mail-errors.xml.in.h:25
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Δεν ήταν δυνατή η μετονομασία του τοπικού φακέλου %s."
+msgid "_Empty Trash"
+msgstr "Άδειασμα Απορριμμάτων"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
+"Υπάρχουν μη απεσταλμένα μηνύματα, θέλετε να τερματίσετε την εφαρμογή "
+"οπωσδήποτε?"
 
-#: mail/mail-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου `%s': %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. 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 ""
-"Αδυναμία αποθήκευσης σε `%s'\n"
-" %s"
 
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Προσθήκη υπογραφής"
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Διαγραφή \"%s\""
+msgid "Error while {0}."
+msgstr ""
+"Σφάλμα κατά '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Διαγραφή επιλεγμένων επαφών"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "Α_πόρριψη αλλαγών"
+msgid "Error while performing operation."
+msgstr ""
+"Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Να μην διαγραφεί"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Εισάγετε κωδικό"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Σφάλμα κατά το φόρτωμα των πληροφοριών:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου `%s': %s."
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
-"Σφάλμα κατά την εκτέλεση της λειτουργίας:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Σφάλμα κατά '%s':\n"
-"%s"
+"Αδυναμία αποθήκευσης σε `%s'\n"
+" %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Δεν ήταν δυνατή η δημιουργία του καταλόγου `%s': %s."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Το αρχείο '%s'  δεν υπάρχει ή δεν είναι κανονικό αρχείο."
-
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+msgid "Cannot create temporary save directory."
+msgstr "Δεν είναι δυνατή η δημιουργία του προσωρινού καταλόγου: %s"
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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/mail-errors.xml.in.h:47
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Πιστοποίηση"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:49
-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 ""
+msgid "File exists but cannot overwrite it."
+msgstr "Το αρχείο υπάρχει, να γίνει επικάλυψη;"
 
-#: mail/mail-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Θα στείλετε μήνυμα σε μορφή HTML. Παρακαλώ βεβαιωθείτε ότι\n"
-" παρακάτω παραλήπτες επιθυμούν μηνύματα σε μορφή HTML:\n"
-"%s Να αποσταλεί οπωσδήποτε?"
+"Δεν ήταν δυνατή η διαγραφή του φακέλου:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr ""
-"Αλήθεια να γίνει διαγραφή του φακέλου \"%s\" και όλων των υποφακέλων του?"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Δεν ήταν δυνατή η διαγραφή του τοπικού φακέλου %s"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Δεν ήταν δυνατή η μετονομασία του τοπικού φακέλου %s."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"Οι παρακάτω εφάκελος(οι):\n"
-"%sΈκαναν χρήση του διαγραμμένου φακέλου:\n"
-"    '%s'\n"
-"Και έχει ανανεωθεί."
+msgid "Delete \"{0}\"?"
+msgstr "Διαγραφή \"%s\""
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
-"Οι παρακάτω εφάκελος(οι):\n"
-"%sΈκαναν χρήση του διαγραμμένου φακέλου:\n"
-"    '%s'\n"
-"Και έχει ανανεωθεί."
+"Αλήθεια να γίνει διαγραφή του φακέλου \"%s\" και όλων των υποφακέλων του?"
 
-#: mail/mail-errors.xml.in.h:57
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. 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/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Ο διακομιστής SMTP %s δεν υποστηρίζει τον τύπο πιστοποίησης %s που ζητήθηκε"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Αδυναμία μετακίνησης φακέλου: %s"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Η υπογραφή έχει αλλάξει αλλά δεν έχει αποθηκευτεί.\n"
-"\n"
-"Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
+msgid "Cannot open source \"{2}\"."
+msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Δεν είναι δυνατό το άνοιγμα του προσωρινού φακέλου για αυτόν τον "
-"λογαριασμό.\n"
-"Θέλετε να κάνετε χρήση του προεπιλεγμένου προσωρινού φακέλου;"
+msgid "Cannot open target \"{2}\"."
+msgstr "Δεν ήταν δυνατό το άνοιγμα του μηνύματος"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid "Use _Default"
-msgstr "Προεπιλογή"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Αδυναμία αντιγραφής φακέλου: %s"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο επαφών"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Δεν είναι δυνατή η δημιουργία φακέλου: %s: %s"
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Δεν έχετε συμπληρώσει όλα τις απαιτούμενες πληροφορίες."
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Δεν ήταν δυνατό το άνοιγμα πηγής"
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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-errors.xml.in.h:68
+#. 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/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Να μην διαγραφεί"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Δεν ήταν δυνατή η αποθήκευση του αρχείου υπογραφής: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Προσθήκη υπογραφής"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
 msgstr "Α_πόρριψη αλλαγών"
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Άδειασμα Απορριμμάτων"
+msgid "Do you wish to save your changes?"
+msgstr "Θέλετε να αποθηκεύσετε τις αλλαγές;"
 
-#: mail/mail-errors.xml.in.h:73
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
-msgid "_Expunge"
-msgstr "Ε_ξάλειψη"
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Η υπογραφή έχει αλλάξει αλλά δεν έχει αποθηκευτεί.\n"
+"\n"
+"Θέλετε να αποθηκεύσετε τις αλλαγές τώρα;"
+
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "Α_πόρριψη αλλαγών"
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Send"
-msgstr "Αποστολή"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Δεν είναι δυνατή η λήψη του φακέλου`%s' . Ο φάκελος δεν υπάρχει."
+
+#. 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."
+msgstr ""
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Οι παρακάτω εφάκελος(οι):\n"
+"%sΈκαναν χρήση του διαγραμμένου φακέλου:\n"
+"    '%s'\n"
+"Και έχει ανανεωθεί."
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Οι παρακάτω εφάκελος(οι):\n"
+"%sΈκαναν χρήση του διαγραμμένου φακέλου:\n"
+"    '%s'\n"
+"Και έχει ανανεωθεί."
+
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-folder-cache.c:786
+#: 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:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -15610,20 +16223,20 @@ msgstr "Pinging %s"
 msgid "Working"
 msgstr "Εργάζεται"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Φιλτράρισμα Φακέλου"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Λήψη Μηνύματος"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Αποτυχία εφαρμογής εξερχόμενων φίλτρων:  %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15632,115 +16245,115 @@ msgstr ""
 "Αποτυχία προσθήκης στο %s: %s\n"
 "Γίνεται προσθήκη στο φάκελο 'Απεσταλμένα'."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Αποτυχία προσθήκης στον φάκελο 'Απεσταλμένα': %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Αποστολή μηνύματος %d από %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Αποτυχία στο μήνυμα %d από %d"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Ολοκληρώθηκε."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Αποθήκευση μηνύματος στο φάκελο"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Μετακίνηση μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Αντιγραφή μηνυμάτων στο %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Σάρωση φακέλων στο \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Προωθημένα μηνύματα"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Άνοιγμα φακέλου %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Άνοιγμα αποθήκης %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Αφαιρείται ο φακέλος %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Αποθηκεύεται ο φακέλος '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Αποθηκεύεται ο λογαριασμός '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Ανανεώνεται ο φακέλος"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Εξαλείφεται ο φακέλος"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Άδειασμα κάδου σε '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Τοπικοί Φάκελοι"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Παραλαμβάνεται το μήνυμα %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Παραλαμβάνονται %d μήνυμα(τα)"
 msgstr[1] "Παραλαμβάνονται %d μήνυμα(τα)"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Αποθήκευση %d μηνυμάτων"
 msgstr[1] "Αποθήκευση %d μηνυμάτων"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15749,7 +16362,7 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία του αρχείου αποτελέσματος: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15758,11 +16371,11 @@ msgstr ""
 "Σφάλμα κατά την αποθήκευση μηνυμάτων στο %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Αποθήκευση συννημένου"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15771,17 +16384,17 @@ msgstr ""
 "Δεν είναι δυνατή η δημιουργία αρχείου αποτελέσματος: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Δεν ήταν δυνατή η εγγραφή δεδομένων:%s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Αποσύνδεση από το %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Επανασύνδεση στο %s"
@@ -15845,24 +16458,24 @@ msgstr "Ανανέωση..."
 msgid "Waiting..."
 msgstr "Αναμονή..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Ο χρήστης ακύρωσε την λειτουργία."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Εισάγετε Κωδικό Πρόσβασης για %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Εισάγετε Κωδικό Πρόσβασης"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Απομνημόνευση αυτού του κωδικού"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 "Απο_μνημόνευση αυτού του κωδικού πρόσβασης για το υπόλοιπο της συνεδρίας"
@@ -15903,89 +16516,94 @@ msgstr "Προωθημένο μήνυμα"
 msgid "Invalid folder: `%s'"
 msgstr "Μη έγκυρος φάκελος: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ρύθμιση εφακέλου: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Αναβάθμιση εφακέλων για το uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Αναβάθμιση εφακέλων για το uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "εΦάκελοι"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Επεξεργασία ΕΦακέλου"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Νέος ΕΦάκελος"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Μη ανοιγμένα"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Ανοιγμένα"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Απαντημένα"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Πολλαπλά μή ανοιγμένα μηνύματα"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Πολλαπλά Μηνύματα"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Χαμηλότερα"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Χαμηλά"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Υψηλά"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Υψηλότερα"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr ";"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Σήμερα %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Χθες %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%l:%M %p %a"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Δημιουργία λίστας μηνυμάτων"
 
@@ -16017,43 +16635,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Σημαία για Παρακολούθηση"
 
@@ -16098,52 +16716,32 @@ msgstr "_Συνδρομή"
 msgid "_Unsubscribe"
 msgstr "_Κατάργηση Συνδρομής"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Κέλυφος Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Δοκιμή Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Στοιχείο Δοκιμής του Evolution."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Προεπιλεγμένη ομάδα συντομεύσεων"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Προκαθορισμένο πλάτος του ταμπλώ της εργαλειοθήκης φακέλου"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Προκαθορισμένο πλάτος του ταμπλώ της γραμμής συντομεύσεων"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Προκαθορισμένο ύψος παραθύρου"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Προκαθορισμένο πλάτος παραθύρου"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "'Εκδοση ρυθμίσεων του Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 "ID ή alias του στοιχείου που θα εμφανίζεται ως προεπιλογή κατά την εκκίνηση."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -16151,7 +16749,7 @@ msgstr ""
 "Αν ορισθεί σε  true,το Evolution θα ξεκινάει σε κατάσταση εργασίας χωρίς "
 "σύνδεση αντί να είναι με σύνδεση."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -16159,62 +16757,22 @@ msgstr ""
 "Αν ορισθεί σε  true, δεν θα εμφανίζεται ο διάλογος προειδοποίησης στις υπό "
 "ανάπτυξη εκδόσεις του Evolution."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Λίστα από διαδρομέα για τους φακέλους που θα συγχρονίζονται στον δίσκο για "
 "εργασία χωρίς σύνδεση"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο ημερολογίου"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο επαφών"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο αλληλογραφίας"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο εργασιών"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο ημερολογίου"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο επαφών"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο αλληλογραφίας"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο εργασιών"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Αν το Evolution θα ξεκινάει σε κατάσταση χωρίς σύνδεση"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Αν θα εμφανίζεται η εργαλειοθήκη φακέλου"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Αν θα εμφανίζεται η γραμμή συντομεύσεων"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Αν θα παρακάμπτεται ο διάλογος προειδοποίησης ανάπτυξης"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "mail"
 
@@ -16222,6 +16780,32 @@ msgstr "mail"
 msgid "Brought to you by"
 msgstr "Συνεργάστηκαν"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Άγνωστο Σφάλμα"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Μη έγκυρη παράμετρος"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Γενικό σφάλμα"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Χωρίς Τίτλο)"
@@ -16359,11 +16943,11 @@ msgstr "Αποτυχία εκτέλεσης εισαγωγέα"
 msgid "_Import"
 msgstr "Ε_ισαγωγή"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Κλείσιμο συνδέσεων..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Ρυθμίσεις Evolution "
 
@@ -16405,13 +16989,37 @@ msgstr "Ο φάκελος δεν είναι δυνατό να περιέχει �
 msgid "'.' and '..' are reserved folder names."
 msgstr "το '.' and '..' είναι κρατημένα ονόματα φακέλων."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
+"να αποσυνδεθείτε."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Το Ximian Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
+"συνδεθείτε."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Μήνυμα σε %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "Τα εργαλεία GNOME Pilot φαίνεται να μην είναι εγκατεστημένα σ' αυτό το "
 "σύστημα."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Σφάλμα κατά την εκτέλεση του%s."
@@ -16425,14 +17033,15 @@ msgid "Bug buddy could not be run."
 msgstr "Δεν ήταν δυνατή η εκτέλεση του Bug buddy."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Περί του Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Εργασία Ε_ντός Δικτύου"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Εργασία Εκ_τός Δικτύου"
 
@@ -16440,52 +17049,6 @@ msgstr "Εργασία Εκ_τός Δικτύου"
 msgid "Work Offline"
 msgstr "Εργασία Εκτός Δικτύου"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Το Ximian Evolution είναι συνδεμένο στο δίκτυο. Κάντε κλικ στο πλήκτρο για "
-"να αποσυνδεθείτε."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Το Ximian Evolution είναι στη διαδικασία αποσύνδεσης από το δίκτυο."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Το Ximian Evolution είναι εκτός δικτύου. Κάντε κλικ στο πλήκτρο για να "
-"συνδεθείτε."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Προειδοποίηση: Το Evolution δεν μπορεί να αναβαθμίσει όλα σας τα δεδομένα "
-"από την έκδοση %d.%d.%d.\n"
-"Τα δεδομένα δεν έχουν διαγραφεί, αλλά δεν θα είναι ορατά από αυτή την έκδοση "
-"του Evolution .\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Μη έγκυρη παράμετρος"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Δεν ήταν δυνατή η εγγραφή στο OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Δεν βρέθηκε η βάση δεδομένων ρυθμίσεων"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Γενικό σφάλμα"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Checkbox"
@@ -16558,6 +17121,43 @@ msgstr ""
 "Κάντε κλικ στο ΟΚ για να κλείσετε τις συνδέσεις και να δουλέψετε εκτός "
 "δικτύου"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "Η_μερολόγιο:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Επαφές: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Ταχυδρομείο:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "Ερ_γασίες:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Τύπος φακέλου:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Άνοιγμα φακέλου άλλου χρήστη"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Λογαριασμός:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Όνομα _Φακέλου:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_ Χρήστης:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Βοηθός Εγκατάστασης του Evolution"
@@ -16600,6 +17200,18 @@ msgstr ""
 "\n"
 "Επιλέξτε \"Εφαρμογή\" για να αποθηκεύσετε τις ρυθμίσεις. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Κέλυφος Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Δοκιμή Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Στοιχείο Δοκιμής του Evolution."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16662,13 +17274,13 @@ msgstr ""
 "Δεν ήταν δυνατό για το Evolution να εισάγει δεδομένα από τα παρακάτω αρχεία:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16697,59 +17309,49 @@ msgstr ""
 "Ελπίζουμε τα απολαύσετε τα αποτελέσματα της σκληρής μας δουλειάς\n"
 "και περιμένουμε με ανυπομονησία την συμβολή σας!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Ευχαριστούμε\n"
 "Η ομάδα του Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Να μην ξαναγίνει η ερώτηση"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλον του Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-"Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Εκκίνηση του Evolution  με ενεργοποίηση του καθορισμένου συστατικού"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Εκκίνηση σε λειτουργία χωρίς σύνδεση"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Εκκίνηση σε λειτουργία με σύνδεση"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Βιαίο κλείσιμο όλων των συστατικών του evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Βιαία επαναεισαγωγή από το Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Αποστολή όλων των εντοπισμένων σφαλμάτων από όλα τα συστατικά σε αρχείο."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16758,13 +17360,79 @@ msgstr ""
 "%s: --online and --offline δεν μπορούν να χρησιμοποιηθούν μαζί.\n"
 " Χρησιμοποιήστε %s --help για περισσότερες πληροφορίες.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Σύνδεση"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Δεν ήταν δυνατή η πρόσβαση στο περιβάλλον του Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Βοηθός Λογαριασμού Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Επιλογή ενός πιστοποιητικού για εισαγωγή..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Όνομα Πιστοποιητικού"
 
@@ -16999,11 +17667,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Τα Πιστοποιητικά σας:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Το πιστοποιητικό υπάρχει ήδη"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17194,6 +17857,11 @@ msgstr "Μοναδικό Αναγνωριστικό Θέματος"
 msgid "Certificate Signature Value"
 msgstr "Τιμή Υπογραφής Πιστοποιητικού"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Το πιστοποιητικό υπάρχει ήδη"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Κωδικός αρχείου PKCS12"
@@ -17233,12 +17901,12 @@ msgstr "Προεπιλεγμένο θέμα για το μήνυμα."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Αδυναμία εκτέλεσης '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Τερματισμός %s (%s)\n"
@@ -17302,7 +17970,8 @@ msgid "Select all contacts"
 msgstr "Επιλογή όλων των επαφών"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Στείλτε ένα μήνυμα στις επιλεγμένες επαφές."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17333,8 +18002,8 @@ msgstr "Προβολή της τρέχουσας επαφής"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "Ε_νέργειες"
@@ -17352,7 +18021,8 @@ msgid "_Preview Pane"
 msgstr "_Οθόνη Προεπισκόπησης"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Αποθήκευση ως VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17479,10 +18149,20 @@ msgstr "Προβολή του τρέχοντος ραντεβού"
 msgid "Week"
 msgstr "Εβδομάδα"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Εργάσιμη Εβδομάδα"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 "_Κλείσιμο"
+
 #: 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
@@ -17805,6 +18485,16 @@ msgstr "Αντιστρο_φή Επιλογής"
 msgid "_Threaded Message List"
 msgstr "Λίστα μηνυμάτων κατά _θέμα"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Κλείσιμο"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Προσ_θήκη Αποστολέα στο Βιβλίο Διευθύνσεων"
@@ -18046,7 +18736,8 @@ msgid "Open the selected message in a new window"
 msgstr "Άνοιγμα επιλεγμένου μηνύματος σε νέο παράθυρο"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Άνοιγμα του επιλεγμένου μηνύματος στον επεξεργαστή για να ξανά-σταλεί"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18161,58 +18852,46 @@ msgstr "ΕΦάκελος στο _Θέμα..."
 msgid "_Attached"
 msgstr "Ε_πισύναψη"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Αντιγραφή σε Φάκελο"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Δημιουργία Φίλτρου Από Το Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Μετάβαση σε"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Μέσα στο _μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Μεγαλύτερο"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Προβολή Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Μετακίνηση σε φάκελο"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Επόμε_νο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Κανονική Προβολή"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Άνοιγμα Μηνύματος"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Προηγούμενο Μήνυμα"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "Σε παρά_θεση"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Αποστολή ξανά..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Εργα_λεία"
@@ -18221,16 +18900,6 @@ msgstr "Εργα_λεία"
 msgid "_Undelete"
 msgstr "Α_ναίρεση Διαγραφής"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Κλείσιμο"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Επισύναψη"
@@ -18624,6 +19293,11 @@ msgstr "_Γρήγορη αναφορά"
 msgid "_Send / Receive"
 msgstr "_Αποστολή / Λήψη"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Παρά_θυρο"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Κατά Ε_ταιρεία"
@@ -18691,10 +19365,6 @@ msgstr "Ημερομηνία Λήξης:"
 msgid "With _Status"
 msgstr "Ορισμός Κατάστασης"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Εργασίες"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18853,6 +19523,34 @@ msgstr "Άλλο..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Σφάλμα Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Πληροφορίες Συνάντησης"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Δοκιμή Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Απεσταλμένα και Πρόχειρα Μηνύματα"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Αναπτυγμένα"
@@ -18969,6 +19667,35 @@ msgstr "Κείμενο"
 msgid "Find _Now"
 msgstr "Εύρεση _τώρα"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"Θέλετε να αντικατασταθεί;"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Αδυναμία αποθήκευσης σε `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Αδυναμία αποθήκευσης σε `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18979,13 +19706,155 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% έχει ολοκληρωθεί)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Εφαρμογή προβολής φακέλου του Βιβλίου Διευθύνσεων του Evolution"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Διεύθυνση _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Εφαρμογή προβολής Ημερολογίου Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Εφαρμογή προβολής Εργασιών του Evolution "
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Δεν ήταν δυνατή η προετοιμασία του gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Αδύνατο το άνοιγμα φακέλου στο `%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "Το URI που θα εμφανίσει το ημερολόγιο"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Ο τύπος της προβολής για εμφάνιση"
+
+#~ msgid "Display a message"
+#~ msgstr "Εμφάνιση μηνύματος"
+
+#~ msgid "Alerts"
+#~ msgstr "Ειδοποιήσεις"
+
+#~ msgid "Time"
+#~ msgstr "Χρόνος"
+
+#~ msgid "_General"
+#~ msgstr "_Γενικά"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Επιλογή εισαγωγής"
+
+#~ msgid "calendar"
+#~ msgstr "ημερολόγιο"
+
+#~ msgid "task list"
+#~ msgstr "λίστα εργασιών"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Δεν ήταν δυνατό να ανανεωθεί\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
 #~ msgstr ""
-#~ "Το ημερολόγιο '%s' θα διαγραφεί. Είστε σίγουροι ότι θέλετε να συνεχίσετε?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
 
-#~ msgid "New Address Book"
-#~ msgstr "Νέο Βιβλίο Διευθύνσεων"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Το URI του φακέλου ενεργειών προς εμφάνιση"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Αδύνατη η φόρτωση ενεργειών στο `%s'"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Συστατικό για την προβολή φακέλου μηνυμάτων του Evolution"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "ΕΦάκελος στην αλληλουχία"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Φίλτρο στην αλληλουχία"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Αποτυχία εισαγωγής pop3 uid caches: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Αποτυχία εισαγωγής folder expand state: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Αποτυχία ανοίγματος αποθηκευτικού χώρου για `%s': %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Το URI  της πηγής αλληλογραφίας που θα εμφανίσει η προβολή"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Προεπιλεγμένη ομάδα συντομεύσεων"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Προκαθορισμένο πλάτος του ταμπλώ της γραμμής συντομεύσεων"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο ημερολογίου"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο επαφών"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο αλληλογραφίας"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Διαδρομή για τον προεπιλεγμένο φάκελο εργασιών"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο ημερολογίου"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο επαφών"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο αλληλογραφίας"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Φυσικό URI για τον προεπιλεγμένο φάκελο εργασιών"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Αν θα εμφανίζεται η εργαλειοθήκη φακέλου"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Αν θα εμφανίζεται η γραμμή συντομεύσεων"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Προειδοποίηση: Το Evolution δεν μπορεί να αναβαθμίσει όλα σας τα δεδομένα "
+#~ "από την έκδοση %d.%d.%d.\n"
+#~ "Τα δεδομένα δεν έχουν διαγραφεί, αλλά δεν θα είναι ορατά από αυτή την "
+#~ "έκδοση του Evolution .\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr ""
+#~ "Δεν ήταν δυνατή η αρχικοποίηση του περιβάλλοντος του Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Αποστολή ξανά..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "Το UID της πηγής επαφών που θα εμφανίσει η προβολή"
@@ -19160,9 +20029,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Σύζυγος:"
 
-#~ msgid "_Add"
-#~ msgstr "_Προσθήκη"
-
 #~ msgid "_Business:"
 #~ msgstr "Ε_ργασία:"
 
@@ -19287,15 +20153,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Η ημερομηνία λήξης είναι πριν από την ημερομηνία έναρξης!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Ημερομηνία Έναρξης:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Ημερομηνία Λήξης:"
-
-#~ msgid "Priority:"
-#~ msgstr "Προτεραιότητα:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19327,13 +20184,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Αδυναμία αντιγραφής περιγραφέα αρχείου: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19483,9 +20333,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Η προβολή που δείχνει πότε ξεκινάει το ημερολόγιο"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Εισάγετε κωδικό πρόσβασης για %s"
-
 #~ msgid "New task list"
 #~ msgstr "Νέα λίστα εργασιών"
 
@@ -19542,30 +20389,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Δεν ήταν δυνατή η εύρεση του συγκεκριμένου κοινόχρηστου φακέλου."
 
-#~ msgid "C_alendar:"
-#~ msgstr "Η_μερολόγιο:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Ταχυδρομείο:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "Ερ_γασίες:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Τύπος φακέλου:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Άνοιγμα φακέλου άλλου χρήστη"
-
-#~ msgid "_Account:"
-#~ msgstr "_Λογαριασμός:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Όνομα _Φακέλου:"
-
-#~ msgid "_User:"
-#~ msgstr "_ Χρήστης:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Δημιουργία νέου παραθύρου"
 
@@ -19805,9 +20628,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgid "Encryption"
 #~ msgstr "Κρυπτοφράφηση"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Οι παρακάτω συνδέσεις είναι ενεργές αυτή τη στιγμή:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Αναζήτηση Επαφής"
 
@@ -19904,9 +20724,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ msgstr ""
 #~ "Να _μην γίνει έλεγχος εισερχόμενης αλληλογραφίας για λογαριασμούς IMAP"
 
-#~ msgid "No data provided"
-#~ msgstr "Δεν έχουν δοθεί δεδομένα"
-
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
@@ -20125,9 +20942,6 @@ msgstr "%s (%d%% έχει ολοκληρωθεί)"
 #~ "Αυτό το μήνυμα είναι ψηφιακά υπογεγραμμένο και δεν βρέθηκε να είναι "
 #~ "αυθεντικό."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Σφάλμα Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
diff --git a/po/en_AU.po b/po/en_AU.po
index d6a39073a8..26d997774f 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2000-10-22 16:19+0100\n"
 "Last-Translator: Michael Zucchi <notzed@ximian.com>\n"
 "Language-Team: \n"
@@ -20,6 +20,15 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -41,15 +50,6 @@ msgstr ""
 msgid " card"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -65,65 +65,20 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Cannot initialise Evolution's mail component."
+msgid "Failed to authenticate.\n"
+msgstr "Could not close temporary folder: %s"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
@@ -171,41 +126,45 @@ msgstr "_Other Organiser"
 msgid "Create a new contacts group"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -213,8 +172,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -222,7 +181,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
@@ -269,20 +228,41 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr "Could not close temporary folder: %s"
+msgid "New Address Book"
+msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: 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
+#: 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
+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
+#: 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 ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -303,6 +283,62 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr ""
@@ -324,6 +360,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 ""
@@ -394,7 +431,7 @@ msgstr "_Other Organiser"
 msgid "Address Book Properties"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr ""
@@ -409,110 +446,100 @@ msgid "Basic"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "C_lose"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -523,7 +550,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -532,19 +559,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -552,7 +579,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -562,34 +589,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -597,124 +624,131 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Chile"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 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-popup.c:208
-msgid "Remove All"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr ""
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -738,21 +772,14 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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
@@ -821,55 +848,46 @@ msgid "<b>Work</b>"
 msgstr "Organisation"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Chile"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Organisation"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -877,77 +895,85 @@ msgstr ""
 msgid "Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "PO Box:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr ""
@@ -971,9 +997,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr ""
@@ -1004,24 +1030,36 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr ""
 
@@ -1994,94 +2032,109 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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 "Organisation"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "_Other Organiser"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Chile"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+msgid "No image"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 ""
 
+#: 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
+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 "Organisation"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2099,18 +2152,6 @@ msgstr ""
 msgid "E-_mail:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
@@ -2258,8 +2299,8 @@ msgstr ""
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr ""
 
@@ -2316,6 +2357,419 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Chile"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Synchronising folder failed: %s: %s"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+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
+#. * 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 ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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] "_Other Organiser"
+msgstr[1] "_Other Organiser"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: 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"
@@ -2331,8 +2785,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr ""
 
@@ -2387,9 +2841,9 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+msgid "Save as VCard..."
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2457,7 +2911,7 @@ msgid "Cut"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2468,18 +2922,8 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr ""
 
@@ -2492,7 +2936,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
@@ -2533,21 +2977,6 @@ msgstr ""
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr ""
@@ -2586,29 +3015,14 @@ msgstr "Comoros"
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisation"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2660,21 +3074,29 @@ msgstr ""
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 ""
@@ -2691,10 +3113,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2715,392 +3133,8 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Chile"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Organisation"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr ""
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Could not close temporary folder: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Synchronising folder failed: %s: %s"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-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:114
-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 ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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:140
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-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
-#. * 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:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Cannot initialise Evolution's mail component."
-
-#: 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] "_Other Organiser"
-msgstr[1] "_Other Organiser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3148,11 +3182,6 @@ msgstr "Cannot initialise Evolution's mail component."
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3164,6 +3193,11 @@ msgstr "_Other Organiser"
 msgid "Print contact"
 msgstr "_Other Organiser"
 
+#: 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"
 msgstr ""
@@ -3349,17 +3383,6 @@ msgstr "_Other Organiser"
 msgid "This should test the contact print code"
 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
-#, 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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3414,6 +3437,17 @@ 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
+#, 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-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3426,11 +3460,12 @@ msgstr ""
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3462,124 +3497,54 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: 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
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: 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
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "C_lose"
+msgid "Snooze _time (minutes):"
+msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+msgid "_Edit appointment"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3588,12 +3553,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3601,7 +3566,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3612,19 +3577,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3735,179 +3700,173 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
+msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Organisation"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 ""
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 ""
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%m/%d/%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:464
+#: 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 ""
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "New meeting"
 msgstr "Synchronising folders"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Synchronising folder failed: %s: %s"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Organisation"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr ""
 
@@ -3937,15 +3896,36 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Organisation"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr ""
 
@@ -3954,19 +3934,6 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Could not close temporary folder: %s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr ""
@@ -4032,7 +3999,7 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4051,12 +4018,12 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
+#: 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/e-alarm-list.c:444
-msgid "Play a sound"
+#: 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
@@ -4073,6 +4040,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
 msgid "Summary:"
 msgstr ""
@@ -4111,10 +4079,103 @@ msgstr ""
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 ""
 
@@ -4128,19 +4189,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 ""
 
@@ -4165,164 +4226,176 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "Organisation"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "_Other Organiser"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "Organisation"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Organisation"
+
+#: 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 "Colours for display"
 
-#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Chile"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+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:563
 msgid "Friday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Colours for display"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4332,138 +4405,46 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "_Other Organiser"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Organisation"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Organisation"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4538,80 +4519,80 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 #, fuzzy
 msgid "Could not update object"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4734,27 +4715,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 ""
 
@@ -4766,7 +4747,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4853,10 +4834,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4875,15 +4856,15 @@ msgstr ""
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5154,25 +5135,19 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr ""
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr ""
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
+msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Organisation"
+msgid "_Destination"
+msgstr "Synchronising folder"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "_Other Organiser"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5201,38 +5176,44 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 ""
 
@@ -5268,11 +5249,11 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5281,8 +5262,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr ""
@@ -5430,97 +5412,53 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Other Organiser"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
+#: calendar/gui/e-cal-component-preview.c:300
+msgid "Web Page:"
 msgstr ""
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
+#: 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-cal-model.c:872
-msgid "Recurring"
+#: 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-cal-model.c:874
-msgid "Assigned"
+#: 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
@@ -5567,17 +5505,26 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr ""
 
@@ -5586,41 +5533,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr ""
 
@@ -5677,77 +5625,153 @@ msgstr ""
 msgid "Start date"
 msgstr "_Other Organiser"
 
+#: 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:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Organisation"
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Organisation"
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Cannot initialise Evolution's mail component."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr ""
+
+#: 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: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-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:168 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
+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:629
+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 ""
+
 #. 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
@@ -5768,35 +5792,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. 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 ""
+
+#. 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 ""
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
@@ -5904,10 +5928,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr ""
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5937,7 +5957,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
@@ -6150,60 +6170,56 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 #, 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6320,28 +6336,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6402,77 +6396,160 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 ""
+
+#. 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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Synchronising folders"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
+#: calendar/gui/gnome-cal.c:2894
+msgid "Purging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2757
-msgid "Purging"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: 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 "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Organisation"
+
+#: 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
@@ -6612,6 +6689,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Could not close temporary folder: %s"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Could not close temporary folder: %s"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr ""
@@ -6831,7 +6925,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr ""
 
@@ -6843,67 +6937,76 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "_Other Organiser"
+msgstr[1] "_Other Organiser"
+
+#: calendar/gui/tasks-component.c:447
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "_Other Organiser"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6911,11 +7014,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr ""
 
@@ -8558,7 +8661,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Synchronising \"%s\""
@@ -8651,31 +8754,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Can not parse search expression: %s\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8709,7 +8787,48 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Can not open message"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Can not parse search expression: %s\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8717,43 +8836,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Can not encrypt this message: no recipients specified"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8761,85 +8880,65 @@ msgid ""
 "%s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1246 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 "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Can not verify this message: could not create temporary file: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Can not verify this message: could not create temporary file: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Can not build locking helper pipe: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Can not fork locking helper: %s"
-
-#: 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 ""
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8860,6 +8959,26 @@ msgstr ""
 msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Can not build locking helper pipe: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Can not fork locking helper: %s"
+
+#: 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 ""
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9092,7 +9211,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9283,8 +9402,9 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
-msgstr ""
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "Can not get folder: %s: %s"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9300,7 +9420,7 @@ msgstr "Can not create folder lock on %s: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Could not close temporary folder: %s"
@@ -9365,95 +9485,95 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Can not get folder: %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Can not open message"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Can not create folder lock on %s: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9470,16 +9590,26 @@ msgstr "Can not get folder: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Can not create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Can not delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
@@ -9601,7 +9731,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9610,11 +9740,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9631,7 +9761,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9641,28 +9771,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9674,17 +9804,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "You can not copy messages from this rubbish bin."
@@ -9694,11 +9824,6 @@ msgstr "You can not copy messages from this rubbish bin."
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Can not rename folder: %s: Invalid operation"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9715,10 +9840,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Could not close temporary folder: %s"
 
 #: 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 ""
@@ -9750,6 +9877,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9768,26 +9896,315 @@ msgstr ""
 msgid "Checklist"
 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:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Can not get folder: %s: %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
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: 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 "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Can not get message: %s from folder %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 ""
+"Can not get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Can not append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Can not append message to mh folder: %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 ""
+"Can not get message: %s from folder %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 ""
+"Can not get message: %s from folder %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 ""
+"Can not get message: %s from folder %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 ""
+"Can not get message: %s from folder %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
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 ""
+
+#: 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:815
+#: 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/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
 msgstr ""
 
+#: 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"
+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
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Could not close temporary folder: %s"
+
+#: 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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 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
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Could not close temporary folder: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Can not delete folder: %s: No such folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "_Other Organiser"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Can not delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Can not rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Can not get folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9830,23 +10247,23 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -9862,25 +10279,25 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9919,23 +10336,6 @@ msgstr "Could not close temporary folder: %s"
 msgid "Command:"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -9956,85 +10356,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Could not close temporary folder: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10042,25 +10400,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10068,7 +10419,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Can not get folder: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Can not get folder: %s: %s"
@@ -10167,58 +10518,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Can not get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10284,7 +10635,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10609,7 +10960,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10618,8 +10969,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10630,46 +10981,46 @@ msgstr ""
 "Can not get message: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Could not close temporary folder: %s"
@@ -10783,8 +11134,11 @@ msgid "Could not get group: %s"
 msgstr "Could not close temporary folder: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr ""
+"Can not get message: %s\n"
+"  %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
@@ -10836,8 +11190,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11269,7 +11623,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
@@ -11313,6 +11667,91 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Can not encrypt this message: no plaintext to encrypt"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Can not open message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+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.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 ""
@@ -11391,194 +11830,129 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Can not encrypt this message: no plaintext to encrypt"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Can not open message"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
 msgstr ""
 
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Can not open message"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Can not open message"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
 msgstr ""
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Synchronising folder"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Could not close temporary folder: %s"
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "Could not close temporary folder: %s"
-
-#: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Could not close temporary folder: %s"
-
-#: composer/mail-composer-errors.xml.in.h:9
-#, fuzzy
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Could not close temporary folder: %s"
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "Synchronising folder"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Can not open message"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Could not close temporary folder: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Can not open message"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Could not close temporary folder: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11698,7 +12072,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -11875,73 +12250,89 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Can not delete folder: %s: No such folder"
-
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Can not delete folder: %s: No such folder"
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Synchronising folder"
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr ""
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -11954,65 +12345,11 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr "Organisation"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "_Other Organiser"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr ""
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12095,6 +12432,72 @@ 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
+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
+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
+msgid "Later"
+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 "_Other Organiser"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12225,7 +12628,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12262,7 +12665,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr ""
 
@@ -12331,9 +12734,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 ""
@@ -12395,106 +12798,59 @@ msgstr ""
 msgid "Virtual _Folders"
 msgstr "Synchronising folder"
 
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
+#: filter/vfolder-rule.c:493
+msgid "_Add"
 msgstr ""
 
-#: 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:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12530,535 +12886,559 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "Synchronising folder"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr ""
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Can not append message to mh folder: %s: %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "You can not copy messages from this rubbish bin."
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+msgid "Cancel _Drag"
+msgstr ""
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+msgid "C_opy"
+msgstr ""
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Synchronising folder"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr ""
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Synchronising folders"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr ""
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Organisation"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %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/message-tag-followup.c:325
+msgid "From"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
+#: 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-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
+#: 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-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: 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 ""
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
+#: 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 ""
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: 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-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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."
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:755
-#, fuzzy
-msgid "_View Certificate"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/em-format-html-display.c:770
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Could not close temporary folder: %s"
-
-#: mail/em-format-html-display.c:1002
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1013
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a %d/%m/%Y %I:%M %p"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "Can not open message"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
+#: 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 ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
+#: 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."
 msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: 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 ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: 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 ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:757
+#, fuzzy
+msgid "_View Certificate"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-format-html-display.c:772
+#, fuzzy
+msgid "This certificate is not viewable"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-format-html-display.c:1007
+#, fuzzy
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%a %d/%m/%Y %I:%M %p"
+
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
 msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
 msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13066,26 +13446,52 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Can not get folder: %s: %s"
+
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Could not close temporary folder: %s"
+
+#: mail/em-migrate.c:1715
+#, 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
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Unable to create local mail folders at `%s': %s"
 msgstr "Could not close temporary folder: %s"
 
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr ""
@@ -13095,91 +13501,77 @@ msgstr ""
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Can not open message"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Chile"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr ""
@@ -13197,11 +13589,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13300,157 +13692,157 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13498,7 +13890,7 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13635,51 +14027,84 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Cannot initialise Evolution's mail component."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Mail composer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: 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:96
+msgid "Mail Preferences"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Chile"
+
 #: mail/importers/elm-importer.c:88
 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13707,19 +14132,49 @@ msgid "Select folder to import into"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Organisation"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -13729,7 +14184,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13744,7 +14199,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13752,7 +14207,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13761,23 +14216,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13806,166 +14261,178 @@ msgid "Pine"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr ""
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "_Other Organiser"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "_Other Organiser"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "_Other Organiser"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "_Other Organiser"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 #, fuzzy
 msgid "_Mail Message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Can not open message"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Synchronising folders"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Synchronising folder"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -13974,14 +14441,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14272,7 +14731,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14573,385 +15032,500 @@ msgstr "Colours"
 msgid "description"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+#. 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-errors.xml.in.h:4
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"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-errors.xml.in.h:5
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:6
-msgid "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 "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:7
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#: 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 ""
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Synchronising folder failed: %s: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Can not get folder: %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Can not create folder lock on %s: %s"
-
-#: mail/mail-errors.xml.in.h:16
-#, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Can not create folder lock on %s: %s"
-
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Can not delete folder: %s: No such folder"
+#. 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-errors.xml.in.h:18
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Can not delete folder: %s: No such folder"
+#. 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-errors.xml.in.h:19
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Can not get folder: %s: %s"
+msgid "Use default drafts folder?"
+msgstr "Synchronising folder"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Can not get folder: %s: %s"
+#. 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?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Could not close temporary folder: %s"
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Could not close temporary folder: %s"
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Can not open message"
+#. 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-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Can not rename folder: %s: No such folder"
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Can not create folder lock on %s: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. 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 ""
-"Can not get message: %s\n"
-"  %s"
 
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Could not close temporary folder: %s"
-
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 msgid "Enter password."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr ""
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Can not create folder lock on %s: %s"
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
+"Can not get message: %s\n"
+"  %s"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Can not delete folder: %s: No such folder"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Can not create folder lock on %s: %s"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Can not create folder lock on %s: %s"
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. 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/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Could not close temporary folder: %s"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/mail-errors.xml.in.h:49
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 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."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Can not rename folder: %s: No such folder"
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Can not delete folder: %s: No such folder"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
+#. 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 "Can not get folder: %s: %s"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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 "Could not close temporary folder: %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 "Can not open message"
+
+#. 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 "Synchronising folder failed: %s: %s"
+
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Can not get folder: %s: %s"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Could not close temporary folder: %s"
+
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#. 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-errors.xml.in.h:64
-msgid "Use _Default"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Synchronising folder"
+msgid "Could not save signature file."
+msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Can not get folder: %s: %s"
+
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-errors.xml.h:216
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+msgid "_Append"
+msgstr ""
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14960,170 +15534,170 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Could not close temporary folder: %s"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Synchronising \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15187,24 +15761,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15244,89 +15818,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr "Can not get folder: %s: %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Synchronising \"%s\""
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Synchronising \"%s\""
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15359,43 +15938,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15437,130 +16016,88 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Cannot initialise Evolution's mail component."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Cannot initialise Evolution's mail component."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Cannot initialise Evolution's mail component."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Synchronising folder"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Synchronising folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
+msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:15
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Synchronising folder"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
+msgid "mail"
+msgstr "Chile"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, c-format
+msgid "%ld KB"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Synchronising folder"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
+#: shell/e-shell.c:744
+msgid "Uknown system error."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-#, fuzzy
-msgid "mail"
-msgstr "Chile"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1107
+msgid "Generic error"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15686,11 +16223,11 @@ msgstr "Could not close temporary folder: %s"
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15727,11 +16264,28 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -15746,14 +16300,14 @@ msgstr ""
 
 #: shell/e-shell-window-commands.c:171
 #, fuzzy
-msgid "About Ximian Evolution"
+msgid "About Evolution"
 msgstr "Can not initialise the Ximian Evolution shell."
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
@@ -15761,44 +16315,6 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -15861,6 +16377,49 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Organisation"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Other Organiser"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Chile"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Other Organiser"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Synchronising folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Synchronising folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Synchronising folder"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr ""
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -15894,6 +16453,21 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Cannot initialise Evolution's mail component."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -15951,13 +16525,13 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -15971,69 +16545,124 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr "Can not initialise the Ximian Evolution shell."
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Can not initialise the Ximian Evolution shell."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Can not initialise the Ximian Evolution shell."
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+msgid "Continue"
+msgstr ""
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Can not initialise the Ximian Evolution shell."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Cannot initialise Evolution's mail component."
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr ""
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Could not close temporary folder: %s"
@@ -16264,12 +16893,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Could not close temporary folder: %s"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%m/%d/%Y"
@@ -16466,6 +17089,12 @@ msgstr ""
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Could not close temporary folder: %s"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16506,12 +17135,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Could not close temporary folder: %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16575,7 +17204,7 @@ msgid "Select all contacts"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16606,8 +17235,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr ""
@@ -16625,7 +17254,7 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+msgid "_Save as VCard..."
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:42
@@ -16751,10 +17380,20 @@ msgstr ""
 msgid "Week"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr ""
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 "C_lose"
+
 #: 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
@@ -17076,6 +17715,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr ""
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17315,7 +17964,7 @@ msgid "Open the selected message in a new window"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17431,58 +18080,46 @@ msgstr ""
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Go To"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:115
-msgid "_Inline"
+msgid "_Go To"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:116
-msgid "_Larger"
+msgid "_Inline"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:117
-msgid "_Message Display"
+msgid "_Larger"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr ""
@@ -17491,16 +18128,6 @@ msgstr ""
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr ""
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17890,6 +18517,10 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution.xml.h:36
+msgid "_Window"
+msgstr ""
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17956,10 +18587,6 @@ msgstr "_Other Organiser"
 msgid "With _Status"
 msgstr ""
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18114,6 +18741,35 @@ msgstr ""
 msgid "..."
 msgstr ""
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, 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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Cannot initialise Evolution's mail component."
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Cannot initialise Evolution's mail component."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18226,6 +18882,32 @@ msgstr ""
 msgid "Find _Now"
 msgstr ""
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Can not get message: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Can not get message: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18237,9 +18919,60 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
-#~ msgid "New Address Book"
+#~ msgid "Address 2:"
+#~ msgstr "Chile"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Cannot initialise Evolution's mail component."
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
 #~ msgstr "Cannot initialise Evolution's mail component."
 
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Could not initialise gnome-vfs"
+
+#, fuzzy
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Organisation"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "_Other Organiser"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Could not close temporary folder: %s"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Synchronising folder"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Can not initialise the Ximian Evolution shell."
+
 #, fuzzy
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "Organisation"
@@ -18264,14 +18997,6 @@ msgstr ""
 #~ msgstr "Organisation"
 
 #, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
 #~ msgid "Cannot move folder `%s': illegal operation"
 #~ msgstr "Can not rename folder: %s: Invalid operation"
 
@@ -18292,10 +19017,6 @@ msgstr ""
 #~ msgstr "_Other Organiser"
 
 #, fuzzy
-#~ msgid "_Task List"
-#~ msgstr "_Other Organiser"
-
-#, fuzzy
 #~ msgid "Offline Folders"
 #~ msgstr "Synchronising folders"
 
@@ -18376,10 +19097,6 @@ msgstr ""
 #~ msgstr "Could not close temporary folder: %s"
 
 #, fuzzy
-#~ msgid "Failed to migrate `%s': %s"
-#~ msgstr "Could not close temporary folder: %s"
-
-#, fuzzy
 #~ msgid "Could not create cache for new calendar"
 #~ msgstr "Could not close temporary folder: %s"
 
diff --git a/po/en_CA.po b/po/en_CA.po
index 42aa39bc92..a1169ef37d 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-01 01:25-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-01 01:25-0400\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
@@ -22,6 +22,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution addressbook"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contact's header: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minicard"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "current addressbook folder "
@@ -42,14 +50,6 @@ msgstr " cards"
 msgid " card"
 msgstr " card"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contact's header: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minicard"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Default Sync Address:"
@@ -64,64 +64,20 @@ msgstr "Could not load addressbook"
 msgid "Could not read pilot's Address application block"
 msgstr "Could not read pilot's Address application block"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certificates"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomplete here"
-msgstr "Configure autocomplete here"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Addressbook"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Addressbook folder viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accessing LDAP Server anonymously"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Failed to authenticate.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Manager your S/Mime certificates here"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sEnter password for %s (user %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -159,62 +115,62 @@ msgstr "_Contacts Group"
 msgid "Create a new contacts group"
 msgstr "Create a new contacts group"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: 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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Error retrieving schema information"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 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:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "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:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personal"
@@ -274,20 +230,42 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Failed to authenticate.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Address Book"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sEnter password for %s (user %s)"
+#: 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
+#: 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
+msgid "Properties..."
+msgstr "Properties..."
+
+#. 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
+#: 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 "Contacts"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -309,6 +287,60 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialog"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autocompletion"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificates"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "Configure autocomplete here"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Addressbook"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Manager your S/Mime certificates here"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "  S_how Supported Bases "
@@ -330,6 +362,7 @@ msgstr "  S_how Supported Bases "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -394,7 +427,7 @@ msgstr "Add Contacts Group"
 msgid "Address Book Properties"
 msgstr "Address Book Properties"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Always"
@@ -409,100 +442,90 @@ msgid "Basic"
 msgstr "Basic"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_olour:"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Connecting"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr "Distinguished name"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr "Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
 msgstr "Email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 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"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr "Find Possible Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Never"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr "Only locations within starting point"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Pick a colour"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "S_earch scope: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr "Search base only"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
 msgstr "Search scope:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Searching"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -512,7 +535,7 @@ msgstr ""
 "server if\n"
 "your LDAP server supports SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -530,7 +553,7 @@ msgstr ""
 "is already\n"
 "secure."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -544,19 +567,19 @@ msgstr ""
 "to security\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr "Starting point and locations within it"
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Supported Search Bases"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -568,7 +591,7 @@ msgstr ""
 "begin. If you leave this blank, the search will begin at the root of the "
 "directory tree."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -584,7 +607,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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -592,7 +615,7 @@ msgstr ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -602,7 +625,7 @@ msgstr ""
 "be \n"
 "too large will slow down your address book."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -612,7 +635,7 @@ msgstr ""
 "setting this to \"Email Address\" requires anonymous access to your ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -622,7 +645,7 @@ msgstr ""
 "list.\n"
 "It is for display purposes only. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -634,122 +657,129 @@ msgstr ""
 "list of standard ports has been provided. Ask your system administrator\n"
 "what port you should specify."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
 msgstr "Timeout:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Using distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Using email address"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Whenever Possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr "_Add Contacts Group"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Download limit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
 msgstr "_Email address:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Log in method:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Port number:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Search base:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Server name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minutes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr "_Use secure connection:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Addressbook name selection interface"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Remove All"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Remove"
 
+#: 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 "Name"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Remove All"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "View Contact List"
@@ -772,22 +802,15 @@ msgstr "Add to Contacts"
 msgid "Unnamed Contact"
 msgstr "Unnamed Contact"
 
-#: 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
-msgid "Name"
-msgstr "Name"
-
 #: 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
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Addressbook name selection interface"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -846,125 +869,127 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "Address 2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Address:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Anniversary:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Assistant:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Birthday:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "City:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Company:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Country:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Department:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Free/Busy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Full _Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Home"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "Home page"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Job title:"
 msgstr "Job title:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Location:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Other"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_PO Box:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Personal information"
@@ -987,9 +1012,9 @@ msgstr "Webcam:"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Work"
@@ -1018,23 +1043,39 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Are you sure you want\n"
+"to delete these contacts?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Are you sure you want\n"
+"to delete this contact?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Address"
 
 #: 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Editable"
 
@@ -2006,91 +2047,108 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: 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
-msgid "Location"
-msgstr "Location"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Username"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Please select among the following options"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 "Could not find widget for a field: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: 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
+msgid "Location"
+msgstr "Location"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Username"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Quick-Add"
@@ -2108,22 +2166,6 @@ msgstr "_Full Name:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Are you sure you want\n"
-"to delete these contacts?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Are you sure you want\n"
-"to delete this contact?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Address _2:"
@@ -2269,8 +2311,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Book"
 
@@ -2331,6 +2373,428 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "map"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "List Members"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organization"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Video Conferencing"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "work"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobile Phone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "personal"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Note"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Job Title"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Home page"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Success"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr "Backend busy"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repository offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+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
+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
+msgid "Permission denied"
+msgstr "Permission denied"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Contact not found"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Contact ID already exists"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protocol not supported"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Cancelled"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr "Could not cancel"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Authentication Failed"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Authentication Required"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+msgid "No such source"
+msgstr "No such source"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Other error"
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"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/widgets/eab-gui-util.c:168
+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 ""
+"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."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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:208
+msgid "_Discard"
+msgstr "_Discard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Error adding list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Error adding contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Error modifying list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Error modifying contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Error removing list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Error removing contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "list"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Move contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Copy contact to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Move contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Copy contacts to"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Select target addressbook."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Multiple VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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 "(none)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primary Email"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Select an Action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Create a new contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Add address to existing contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Querying Address Book..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Edit Contact Info"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Merge E-Mail Address"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "and one other contact."
+msgstr[1] "and one other contact."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Show Full VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Show Compact VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Save in addressbook"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "No contacts"
@@ -2345,8 +2809,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Query"
 
@@ -2400,9 +2864,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Save as VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2467,7 +2932,7 @@ msgid "Cut"
 msgstr "Cut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2478,18 +2943,8 @@ msgstr "Copy"
 msgid "Paste"
 msgstr "Paste"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Delete"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Current View"
 
@@ -2505,7 +2960,7 @@ msgstr ""
 "has crashed. You will have to restart Evolution in order to use it again"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Any Category"
@@ -2546,21 +3001,6 @@ msgstr "Categories"
 msgid "Company Phone"
 msgstr "Company Phone"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Family Name"
@@ -2597,29 +3037,14 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobile Phone"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Note"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Office"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organization"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Other Fax"
@@ -2671,21 +3096,29 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Width"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Height"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Has Focus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Selected"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Has Cursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Field"
@@ -2702,10 +3135,6 @@ msgstr "Text Model"
 msgid "Max field name length"
 msgstr "Max field name length"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Column Width"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2734,402 +3163,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Selected"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Has Cursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "map"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "List Members"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Video Conferencing"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Phone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "work"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "personal"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Job Title"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Home page"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Success"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr "Backend busy"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repository offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-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:54
-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:57
-msgid "Permission denied"
-msgstr "Permission denied"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Contact not found"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Contact ID already exists"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protocol not supported"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Cancelled"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr "Could not cancel"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Authentication Failed"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Authentication Required"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-msgid "No such source"
-msgstr "No such source"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Other error"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Unable to open addressbook"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"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/widgets/eab-gui-util.c:167
-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 ""
-"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."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "This query did not complete successfully."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Do you want to save changes?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Discard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Error adding list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Error adding contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Error modifying list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Error modifying contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Error removing list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Error removing contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Overwrite"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "list"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Move contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Copy contact to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Move contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Copy contacts to"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Select target addressbook."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Multiple VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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 "(none)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primary Email"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Select an Action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Create a new contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Add address to existing contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Querying Address Book..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Contact Info"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Merge E-Mail Address"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "and one other contact."
-msgstr[1] "and one other contact."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Show Full VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Show Compact VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Column Width"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3139,17 +3175,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"
 
@@ -3173,11 +3209,6 @@ msgstr "Evolution VCard importer"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Print envelope"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Print contacts"
@@ -3187,6 +3218,11 @@ msgstr "Print contacts"
 msgid "Print contact"
 msgstr "Print contact"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Print envelope"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3371,16 +3407,6 @@ msgstr "Contact Print Test"
 msgid "This should test the contact print code"
 msgstr "This should test the contact print code"
 
-#: 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
-msgid "Can not open file"
-msgstr "Can not open file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Can not load URI"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specify the output file instead of standard output"
@@ -3437,6 +3463,16 @@ msgstr "In normal mode, there should not need size option."
 msgid "Impossible internal error."
 msgstr "Impossible internal error."
 
+#: 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
+msgid "Can not open file"
+msgstr "Can not open file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Can not load URI"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Error loading default addressbook."
@@ -3453,7 +3489,8 @@ msgstr "No filename provided."
 msgid "Unnamed List"
 msgstr "Unnamed List"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Enter password"
 
@@ -3485,63 +3522,6 @@ msgstr "Default Priority:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Could not read pilot's ToDo application block"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:954
-msgid "Calendars"
-msgstr "Calendars"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configure your timezone, Calendar and Task List here "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Calendar and Tasks"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Calendar viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Tasks viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution's Calendar component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution's Tasks component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:991 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:591 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tasks"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Starting:"
@@ -3571,24 +3551,24 @@ msgstr "_Edit appointment"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Open"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3601,12 +3581,12 @@ msgstr ""
 "Starting at %s\n"
 "Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3618,7 +3598,7 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialog box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3635,19 +3615,19 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialize Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialize gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Could not create the alarm notify service factory"
 
@@ -3756,56 +3736,42 @@ msgid "Weekday the week starts on"
 msgstr "Weekday the week starts on"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Whether to ask for confirmation on appointment deletion"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Whether to ask for confirmation when folder is expunged"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Whether to hide completed tasks"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Whether to set a default reminder for events"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Whether to show times in 24h format instead of using am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Summary contains"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Description contains"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Comment contains"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Location contains"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Unmatched"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1706
+#: 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
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3815,72 +3781,73 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "days"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Properties..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Loading calendar..."
 
-#: calendar/gui/calendar-component.c:800
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Unable to open the calendar '%s' for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:812
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:846
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3888,51 +3855,56 @@ msgstr ""
 "Events cannot be created in a read-only calendar. Please select a read-write "
 "calendar."
 
-#: calendar/gui/calendar-component.c:1110
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1118
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1126
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1127
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:1128
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1134
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1135
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "C_alendar"
 
-#: calendar/gui/calendar-component.c:1136
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -3962,15 +3934,35 @@ msgstr "Week View"
 msgid "Month View"
 msgstr "Month View"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Summary contains"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Description contains"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Comment contains"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Location contains"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Unmatched"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Method not supported when opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
@@ -3979,19 +3971,6 @@ msgstr "Permission denied to open the calendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Could not open the folder in '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "The URI that the calendar will display"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "The type of view to show"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Audio Alarm Options"
@@ -4057,7 +4036,7 @@ msgstr "extra times every"
 msgid "hours"
 msgstr "hours"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -4076,14 +4055,14 @@ msgstr "Basics"
 msgid "Date/Time:"
 msgstr "Date/Time:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Display a message"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Play a sound"
 
+#: 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 "Reminders"
@@ -4098,6 +4077,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:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Summary:"
@@ -4136,10 +4116,98 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Add Tasks Group"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+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:107
+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
+msgid "_Add Calendar"
+msgstr "_Add Calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+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
+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
+msgid "_Type:"
+msgstr "_Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "weeks"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Enabled"
 
@@ -4153,19 +4221,19 @@ msgstr "Don't Remove"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Disable"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Enable"
 
@@ -4402,86 +4470,6 @@ msgstr "_Wed"
 msgid "before every appointment"
 msgstr "before every appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, 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:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Add Tasks Group"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Calendar Properties"
-
-#: 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
-msgid "_Add Calendar"
-msgstr "_Add Calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-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
-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
-msgid "_Type:"
-msgstr "_Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weeks"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4562,31 +4550,6 @@ msgstr "%s  You have made changes. Forget those changes and update the editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  You have made no changes, update the editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validation error: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " to "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completed "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Due "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
 #: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Could not update object"
@@ -4620,8 +4583,8 @@ 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:1037
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -4635,6 +4598,31 @@ msgstr "Changes made to this item may be discarded if an update arrives"
 msgid "Unable to use current version!"
 msgstr "Unable to use current version!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validation error: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " to "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completed "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Due "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Could not open source"
@@ -4755,27 +4743,27 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Reminder"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Meeting"
 
@@ -4871,17 +4859,12 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4907,8 +4890,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5180,24 +5163,20 @@ msgstr "_Discard Changes"
 msgid "Save Event"
 msgstr "Save Event"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Select source"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Select destination %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "calendar"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Destination folder:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#, fuzzy
+msgid "Task List"
+msgstr "New Task List"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5225,38 +5204,44 @@ msgid "% _Complete"
 msgstr "% _Complete"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Completed"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "High"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "In Progress"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Low"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:875 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Not Started"
 
@@ -5304,8 +5289,9 @@ msgstr "Unable to open tasks in '%s'."
 msgid "Con_fidential"
 msgstr "Con_fidential"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Description:"
@@ -5449,101 +5435,56 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:321
-#: calendar/gui/e-cal-model.c:328 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Public"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:330
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Private"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidential"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "End Date"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Untitled"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
 msgstr "Start Date"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Summary"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Free"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Busy"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Due date:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Priority:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "No"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Web Page:"
 
-#. 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Unknown"
+#: 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 "Public"
 
-#: calendar/gui/e-cal-model.c:877
-msgid "Recurring"
-msgstr "Recurring"
+#: 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 "Private"
 
-#: calendar/gui/e-cal-model.c:879
-msgid "Assigned"
-msgstr "Assigned"
+#: 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 "Confidential"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5589,6 +5530,15 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Free"
+
+#: 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 "Busy"
+
 #: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Deleting selected objects"
@@ -5598,8 +5548,8 @@ 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:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Open"
 
@@ -5608,41 +5558,42 @@ 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:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: 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:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2602 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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 "_Copy"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Paste"
 
@@ -5697,89 +5648,160 @@ msgstr "Priority"
 msgid "Start date"
 msgstr "Start date"
 
+#: 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 "Summary"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Go to _Today"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Go to Date..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Settings..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "End Date"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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: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-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 "Unknown"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recurring"
+
+#: calendar/gui/e-cal-model.c:913
+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:168 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:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "No"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"The geographical position must be entered in the format: \n"
+"\n"
+"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"
@@ -5796,43 +5818,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minute divisions"
+#. 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 "am"
+
+#. 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 "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-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minute divisions"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5928,6 +5943,7 @@ msgstr "iCalendar Error"
 msgid "An unknown person"
 msgstr "An unknown person"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:910
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -5940,10 +5956,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>None</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5973,7 +5985,7 @@ msgstr "Update"
 #: 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6186,59 +6198,55 @@ msgstr "The attachment does not contain a valid calendar message"
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Calendar file could not be updated!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6355,36 +6363,6 @@ msgstr "Delegated"
 msgid "In Process"
 msgstr "In Process"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#. 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-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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
-msgid "%m/%d/%Y"
-msgstr "%d/%m/%Y"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Out of Office"
@@ -6445,7 +6423,34 @@ msgstr "Meeting _start time:"
 msgid "Meeting _end time:"
 msgstr "Meeting _end time:"
 
-#: calendar/gui/e-tasks.c:615 calendar/gui/gnome-cal.c:2021
+#. 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"
+
+#. 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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Enter the password for `%s'"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6454,19 +6459,19 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:643 calendar/gui/gnome-cal.c:2060
+#: 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:717
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:740
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6475,46 +6480,105 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:761
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:865
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:915
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/gnome-cal.c:1879
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tasks"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1898
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1921
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:2051
+#: 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:2895
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Purging"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configure your timezone, Calendar and Task List here "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Calendar and Tasks"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution's Calendar component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution's Tasks component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6658,6 +6722,23 @@ msgstr "Birthdays & Anniversaries"
 msgid "On The Web"
 msgstr "On The Web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Unable to open the calendar '%s'."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Unable to open tasks in '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1st"
@@ -6877,7 +6958,7 @@ msgid "Contacts: "
 msgstr "Contacts: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -6889,25 +6970,44 @@ msgstr "Print Item"
 msgid "Print Setup"
 msgstr "Print Setup"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "New Task List"
 
-#: calendar/gui/tasks-component.c:469
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d total"
+msgstr[1] "%d total"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d selected"
+msgstr[1] ", %d selected"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Loading tasks"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:481
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:519
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6915,40 +7015,31 @@ msgstr ""
 "Events cannot be created in a read-only calendar. Please select a read-write "
 "calendar."
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:733
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:734
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:740
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:741
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:742
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "The URI of the tasks folder to display"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Could not load the tasks in `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6960,11 +7051,11 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
@@ -8612,7 +8703,7 @@ msgstr "Copy folder content locally for offline operation"
 msgid "Downloading new messages for offline mode"
 msgstr "Downloading new messages for offline mode"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparing folder '%s' for offline"
@@ -8705,33 +8796,6 @@ msgstr "Invalid arguments to (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Error executing filter search: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Cannot parse search expression: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Error executing search expression: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) requires a single bool result"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Performing query on unknown header: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8763,7 +8827,52 @@ msgstr "Learning junk and/or non junk message(s)"
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(s)"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Cannot parse search expression: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Error executing search expression: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Performing query on unknown header: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8774,15 +8883,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8791,27 +8900,27 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8822,81 +8931,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Failed to execute gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Cannot build locking helper pipe: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Cannot fork locking helper: %s"
-
-#: 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 "Could not lock '%s': protocol error with lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Could not lock '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8917,6 +9006,26 @@ msgstr "Failed to get lock using fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Failed to get lock using flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Cannot build locking helper pipe: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Cannot fork locking helper: %s"
+
+#: 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 "Could not lock '%s': protocol error with lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Could not lock '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9170,7 +9279,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9367,7 +9476,8 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+#, fuzzy
+msgid "Cannot add encryption certificate"
 msgstr "Cannot add add encryption certificate"
 
 #: camel/camel-smime-context.c:360
@@ -9382,7 +9492,7 @@ msgstr "Cannot create encoder context"
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
@@ -9442,91 +9552,93 @@ msgstr "Cannot calculate digests"
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Certficate only message, cannot verify certificates"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Certficate only message, certificates imported and verified"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Can't find signature digests"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Can't find certificate for `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Can't find common bulk encryption algorithm"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Can't allocate slot for encryption bulk key"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Cannot create CMS Message"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Can't create CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Can't attach CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Can't attach CMS data object"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Can't create CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Can't add CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Can't create encoder context"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Decoder failed, error %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "import keys: unimplemented"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
@@ -9543,16 +9655,26 @@ msgstr "Cannot create folder `%s': folder exists"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Cannot create folder `%s': folder exists"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
@@ -9673,7 +9795,7 @@ msgstr "Key usage does not support certificate signing"
 msgid "Error in application verification"
 msgstr "Error in application verification"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9686,11 +9808,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BAD"
 
@@ -9714,7 +9836,7 @@ msgstr ""
 "Do you wish to accept anyway?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9729,7 +9851,7 @@ msgstr ""
 "\n"
 "Do you wish to accept?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9738,7 +9860,7 @@ msgstr ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9747,7 +9869,7 @@ msgstr ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9756,7 +9878,7 @@ msgstr ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9770,17 +9892,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Could not parse URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error storing `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
@@ -9789,11 +9911,6 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Cannot rename folder: %s: Invalid operation"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9808,10 +9925,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Cannot copy messages to the Junk folder"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Checking for new mail"
 
 #: 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 "Check for new messages in all folders"
@@ -9842,6 +9961,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "For accessing Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9861,26 +9981,322 @@ msgstr ""
 msgid "Checklist"
 msgstr "Checklist"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Cannot get folder `%s': %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 "Server unexpectedly disconnected: %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 "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Cannot get folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Cannot get message: %s from folder %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 ""
+"Cannot get message: %s from folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Cannot append message to mh folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Cannot append message to mh folder: %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 ""
+"Cannot get message: %s from folder %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 ""
+"Cannot get message: %s from folder %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 ""
+"Cannot get message: %s from folder %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 ""
+"Cannot get message: %s from folder %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 "Folders"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Show only subscribed folders"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Override server-supplied folder namespace"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Namespace"
+
+#: 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 "For reading and storing mail on IMAP servers."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"This option will connect to the IMAP server using a plaintext password."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, 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: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/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 "Could not connect to %s (port %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 "SSL unavailable"
+
+#: 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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connection cancelled"
+
+#: 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"
+msgstr "Failed to connect to IMAP server %s in secure mode: %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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Unknown error"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Unable to connect to POP server %s: No support for requested authentication "
+"mechanism."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPlease enter the SMTP password for %s on host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Cannot 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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Cannot delete folder: %s: No such folder"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Command:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Cannot delete folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Cannot create folder `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Unexpected response from IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Server 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %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:1089
-msgid "Unknown error"
-msgstr "Unknown error"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9925,21 +10341,21 @@ msgstr "Could not create directory %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -9955,25 +10371,25 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "No such message"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -10011,23 +10427,6 @@ msgstr "Use custom command to connect to server"
 msgid "Command:"
 msgstr "Command:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folders"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Show only subscribed folders"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Override server-supplied folder namespace"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namespace"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Apply filters to new messages in INBOX on this server"
@@ -10048,85 +10447,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP service for %s on %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Could not connect to %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL unavailable"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connection cancelled"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10137,26 +10494,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10164,7 +10513,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10271,58 +10620,58 @@ msgstr ""
 "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."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Store root %s is not an absolute path"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Store root %s is not a regular directory"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Cannot get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Local stores do not have an inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Could not rename folder %s to %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not rename '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Could not delete folder summary file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Could not delete folder index file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10388,7 +10737,7 @@ msgstr "Could not delete folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10719,7 +11068,7 @@ 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:258
+#: 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
@@ -10728,8 +11077,8 @@ msgid "User cancelled"
 msgstr "User cancelled"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10738,46 +11087,46 @@ msgstr "User cancelled"
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Internal error: uid in invalid format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
 
@@ -10953,8 +11302,8 @@ msgstr "No message with uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -11398,7 +11747,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "attachment"
 
@@ -11442,6 +11791,102 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Cannot sign outgoing message: No signing certificate set for from account"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Cannot encrypt outgoing message: No encryption certificate set for from "
+"account"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Could not open file"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Unable to retrieve message from editor"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Untitled Message"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Open file"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> File Attached"
+msgstr[1] "<b>%d</b> Files Attached"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Hide _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Show _Attachment Bar (drop attachments here)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Compose a message"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+
+#: 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 ""
+"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"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Posting destination"
@@ -11522,109 +11967,79 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-
-#: composer/e-msg-composer.c:1273
-msgid "Could not open file"
-msgstr "Could not open file"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Unable to retrieve message from editor"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Untitled Message"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Open file"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "You cannot attach the file `${0}' to this message."
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogenerated"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
+msgstr "${1}"
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signature:"
+#. 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 "The file `${0}' is not a regular file and cannot be sent in a message."
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> File Attached"
-msgstr[1] "<b>%d</b> Files Attached"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Directories can not be attached to Messages."
 
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Hide _Attachment Bar (drop attachments here)"
+#. 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."
+msgstr ""
+"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."
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Show _Attachment Bar (drop attachments here)"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
+msgstr "Unfinished messages found"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr "Do you want to recover unfinished messages?"
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 
-#: composer/e-msg-composer.c:3165
-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 ""
-"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"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
+msgstr "Don't Recover"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#: composer/mail-composer-errors.xml.h:18
+msgid "Recover"
+msgstr "Recover"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Could not save to autosave file \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Error saving to autosave because \"{1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Warning: Modified Message"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
@@ -11632,15 +12047,8 @@ msgstr ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr "Because \"${0}\", you may need to select different mail options."
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr "Because \"${1}\"."
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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 "
@@ -11650,79 +12058,41 @@ msgstr ""
 "you choose to save the message in your Drafts folder. This will allow you to "
 "continue the message at a later date."
 
-#: composer/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr "Could not create message."
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr "Could not read signature file \"{0}\"."
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Could not save to autosave file \"{0}\"."
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr "Directories can not be attached to Messages."
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr "Discard Changes"
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr "Do you want to recover unfinished messages?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr "Don't Recover"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Error saving to autosave because \"{1}\"."
-
-#: composer/mail-composer-errors.xml.in.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-
-#: composer/mail-composer-errors.xml.in.h:16
-msgid "Recover"
-msgstr "Recover"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 msgid "Save Message"
 msgstr "Save Message"
 
-#: composer/mail-composer-errors.xml.in.h:18
-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:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
+msgstr "Could not create message."
 
-#: composer/mail-composer-errors.xml.in.h:19
-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 ""
-"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."
+#. 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 "Because \"${0}\", you may need to select different mail options."
 
-#: composer/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
-msgstr "Unfinished messages found"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr "Could not read signature file \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr "Because \"${1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr "All accounts have been removed."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "You need to configure an account before you can compose mail."
 
@@ -11854,7 +12224,8 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Overwrite file?"
 
@@ -11876,16 +12247,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"
@@ -11937,31 +12304,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"
@@ -12042,71 +12401,88 @@ msgstr "Select a time to compare against"
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "Bad regular expression \"{0}\"."
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Could not compile regular expression \"{1}\"."
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "File \"{0}\" does not exist or is not a regular file."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Missing date."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "You must choose a date."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-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."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "File \"{0}\" does not exist or is not a regular file."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Missing name."
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "Bad regular expression \"{0}\"."
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "Could not compile regular expression \"{1}\"."
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Missing name."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "You must name this vFolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "Name \"{0}\" already used."
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Please choose another name."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "No sources selected."
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+#, fuzzy
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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 ""
 "You must specify at least one folder as a source. You may select folders "
 "individually, or select all local and/or remote folders."
@@ -12120,64 +12496,11 @@ msgstr "Choose a file"
 msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Select Folder"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "To Do"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Later"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Rule name:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Untitled"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>If</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Execute actions"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "if all criteria are met"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "if any criteria are met"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "incoming"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "outgoing"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12266,6 +12589,75 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
+#: 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
+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
+msgid "To Do"
+msgstr "To Do"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Later"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Rule name:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>If</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "if all criteria are met"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "if any criteria are met"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Execute actions"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegated"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Recipients"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Replies to %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Include:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "incoming"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "outgoing"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12395,7 +12787,7 @@ msgstr "is not Flagged"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12432,7 +12824,7 @@ msgstr "Pipe to Program"
 msgid "Play Sound"
 msgstr "Play Sound"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Read"
 
@@ -12501,9 +12893,9 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12564,102 +12956,60 @@ msgstr "Subject does not contain"
 msgid "Virtual _Folders"
 msgstr "Virtual _Folders"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "A_dd"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder source"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Composer Preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Configure mail preferences, including security and message display, here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Configure spell-checking, signatures, and the message composer here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configure your email accounts here"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Mail component"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Mail folder viewer"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Mail Accounts"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Mail Preferences"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Default]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Account name"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Forwarded Message --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
@@ -12693,264 +13043,437 @@ 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:2334
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Create folder"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Loading..."
-
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:936
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:943
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:945
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Move"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancel Task"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2148
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copy"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2334 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2597 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2598
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2603
-msgid "_Move"
-msgstr "_Move"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2607
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+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 "UNMATCHED"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Inbox"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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:508
+#: mail/mail-component.c:551
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:787 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 "Mar_k as Read"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:791 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 "Mark as _Junk"
 
-#: mail/em-folder-view.c:792 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 "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder on Thread"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filter on Thread"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "From"
+
+#: 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 "Reply-To"
+
+#: 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 "To"
+
+#: 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: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 "Date"
+
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr "Newsgroups"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Click to open %s"
+msgid "%s attachment"
+msgstr "%s attachment"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Could not parse S/MIME message: Unknown error"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Unsupported encryption type for multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Could not parse MIME message. Displaying as source."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Unsupported signature format"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Error verifying signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Unknown error verifying signature"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Retrieving `%s'"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Unsigned"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Valid signature"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Invalid signature"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Valid signature, cannot verify sender"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Unencrypted"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Encrypted, weak"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Encrypted"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Encrypted, strong"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Malformed external-body part."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointer to FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointer to local file (%s) valid at site \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointer to local file (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointer to remote data (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointer to unknown external data (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatting message"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Mailer"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -12958,11 +13481,7 @@ msgstr "Click to open %s"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Unsigned"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -12970,11 +13489,7 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Valid signature"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -12982,11 +13497,7 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Invalid signature"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -12994,11 +13505,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13006,11 +13517,7 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Unencrypted"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13018,11 +13525,7 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Encrypted, weak"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13032,11 +13535,7 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Encrypted"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13044,11 +13543,7 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Encrypted, strong"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13058,178 +13553,60 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Retrieving `%s'"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Malformed external-body part."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointer to FTP site (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointer to local file (%s) valid at site \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointer to local file (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointer to remote data (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointer to unknown external data (\"%s\" type)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formatting message"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "From"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "To"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Mailer"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Newsgroups"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s attachment"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Could not parse S/MIME message: Unknown error"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Unsupported encryption type for multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Could not parse MIME message. Displaying as source."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Unsupported signature format"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Error verifying signature"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Unknown error verifying signature"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Every time"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Once per day"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Once per week"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Once per month"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13241,25 +13618,53 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Failed to migrate pop3 uid caches: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Cannot create folder `%s': %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Failed to migrate folder expand state: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Could not rename folder %s to %s: %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Unable to save grouplist file for %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Failed to create directory `%s': %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Failed to open store for `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Failed to create directory `%s': %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Unable to create output file: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13270,88 +13675,74 @@ msgstr "Save As..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Set as _Background"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Reply to sender"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Open Link in Browser"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Se_nd message to..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Add to Addressbook"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Open in %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: mail/em-subscribe-editor.c:637 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 "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Forwarded Message --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "On %a, %Y-%d-%m at %H:%M %%+05d, %%s wrote:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -13479,10 +13870,15 @@ msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "List of accounts"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "List of accounts"
+
+#: 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."
@@ -13490,11 +13886,11 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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."
@@ -13502,15 +13898,19 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13520,89 +13920,89 @@ msgstr ""
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Message-display style (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "New Mail Notify sound file"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "New Mail Notify type"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13610,34 +14010,26 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Recognize links in text and replace them."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Recognize smileys in text and replace them with images."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Run junk test on incoming mail"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
@@ -13826,33 +14218,64 @@ msgstr "port for starting user runned spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Composer Preferences"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Configure mail preferences, including security and message display, here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configure your email accounts here"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Mail"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Mail component"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Mail Accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Mail Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Mail"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13860,15 +14283,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -13897,18 +14320,46 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importing `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importing mailbox"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Scanning %s"
@@ -13918,7 +14369,7 @@ msgstr "Scanning %s"
 msgid "Priority Filter \"%s\""
 msgstr "Priority Filter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13944,7 +14395,7 @@ msgstr ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13956,7 +14407,7 @@ msgstr ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13970,23 +14421,23 @@ msgstr ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution is importing your old Netscape data"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importing Netscape data"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Settings"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Mail Filters"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14019,124 +14470,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Account Editor"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Key Agreement"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Path:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Replies to %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ", %d selected"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Checking Service"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connecting to server..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identity"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14146,12 +14609,12 @@ msgstr ""
 "below do not need to be filled in, unless you wish to include this "
 "information in email you send."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Receiving Mail"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14159,15 +14622,15 @@ msgstr ""
 "Please enter information about your incoming mail server below. If you are "
 "not sure, ask your system administrator or Internet Service Provider."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Please select among the following options"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Sending Mail"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14175,11 +14638,11 @@ msgstr ""
 "Please enter information about the way you will send mail. If you are not "
 "sure, ask your system administrator or Internet Service Provider."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Account Management"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14193,14 +14656,6 @@ msgstr ""
 "name for this account in the space below. This name will be used for display "
 "purposes only."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Checking Service"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Connecting to server..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " Ch_eck for Supported Types "
@@ -14799,11 +15254,64 @@ msgstr "colour"
 msgid "description"
 msgstr "description"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Invalid authentication"
+
+#. 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 ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
 
-#: mail/mail-errors.xml.in.h:2
+#. 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 ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+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
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+
+#: 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 "_Send"
+
+#. 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 "Are you sure you want to send a message without a subject?"
+
+#. 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."
@@ -14811,11 +15319,78 @@ msgstr ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of the topic of your letter."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+#. 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 "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
+#, fuzzy
+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 ""
+"The contact list you are sending to is configured to hide list recipients. "
+"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."
+
+#. 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 ""
+"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."
+
+#. 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 ""
+"This message cannot be sent because you have not specified any Recipients"
+
+#. 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 ""
+"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."
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "Use default drafts folder?"
+
+#. 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 ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "Use _Default"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -14823,7 +15398,17 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "If you continue, you will not be able to recover these messages."
+
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "_Expunge"
+
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14831,373 +15416,367 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: mail/mail-errors.xml.in.h:6
-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/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "_Empty Trash"
 
-#: mail/mail-errors.xml.in.h:7
-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:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail-errors.xml.in.h:8
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Are you sure you want to send a message without a subject?"
+#. 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 ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
-msgstr "Because \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr "Your message message, with the subject \"{0}\" was not delivered."
 
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+#, fuzzy
+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 ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
-msgstr "Because \"{2}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Error while {0}."
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Cannot add vFolder \"{0}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Error while performing operation."
 
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
-msgstr "Cannot create folder \"{0}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
 
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
-msgstr "Cannot create temporary save directory."
+#. 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 "{0}"
+
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+msgid "Enter password."
+msgstr "Enter password."
+
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
+msgstr "Error loading filter definitions."
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+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
+msgid "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+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."
+msgstr "File exists but cannot be overwritten."
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
+msgstr "File exists but is not a regular file."
+
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:18
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
+#. mail:no-delete-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."
+msgstr ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
+
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder \"{0}\"."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "Delete \"{0}\"?"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+
+#. 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 ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 
-#: mail/mail-errors.xml.in.h:20
+#. 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 "Cannot rename \"{0}\" to \"{1}\"."
+
+#. mail:no-rename-folder-exists 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."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "Because \"{2}\"."
+
+#. mail:no-move-folder-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/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "Cannot open source \"{1}\""
-
-#: mail/mail-errors.xml.in.h:22
+#. mail:no-move-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/mail-errors.xml.in.h:23
+#. mail:no-move-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/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:no-copy-folder-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}\"."
 
-#: mail/mail-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Cannot rename or move system folder \"{0}\"."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder \"{0}\"."
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "Cannot open source \"{1}\""
 
-#: mail/mail-errors.xml.in.h:26
+#. mail:account-incomplete 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."
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Cannot save to directory \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Cannot set signature script \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "Could not save signature file."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "You have not filled in all of the required information."
 
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "Delete \"{0}\"?"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "You may not create two accounts with the same name."
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 msgid "Delete account?"
 msgstr "Delete account?"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "Discard changes?"
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account?"
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "Do you wish to save your changes?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "If you proceed, the account information will be deleted permanently."
 
-#: mail/mail-errors.xml.in.h:36
+#: mail/mail-errors.xml.h:169
 msgid "Don't delete"
 msgstr "Don't delete"
 
-#: mail/mail-errors.xml.in.h:37
-msgid "Enter password."
-msgstr "Enter password."
-
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
-msgstr "Error loading filter definitions."
-
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr "Error while performing operation."
-
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
-msgstr "Error while {0}."
-
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
-msgstr "File exists but cannot be overwritten."
-
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
-msgstr "File exists but is not a regular file."
-
-#: mail/mail-errors.xml.in.h:43
-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."
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "Could not save signature file."
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "If you proceed, the account information will be deleted permanently."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "Because \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Cannot set signature script \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Invalid authentication"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr "The script file must exist and be executable."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr "Mail filters automatically updated."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "Discard changes?"
 
-#: mail/mail-errors.xml.in.h:49
-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 ""
-"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."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "Do you wish to save your changes?"
 
-#: mail/mail-errors.xml.in.h:50
-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 ""
-"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."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Discard changes"
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly. Go to the virtual folder editor "
+"to add it explictly, if required."
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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 ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "Cannot add vFolder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr "vFolders automatically updated."
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
 "been updated."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr "The script file must exist and be executable."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "Mail filters automatically updated."
 
-#: mail/mail-errors.xml.in.h:59
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
 msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
-"This folder may have been added implictly. Go to the virtual folder editor "
-"to add it explictly, if required."
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
-"This message cannot be sent because you have not specified any Recipients"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+"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 ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
-msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "Use _Default"
-
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "Use default drafts folder?"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "You have not filled in all of the required information."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "You have unsent messages, do you wish to quit anyway?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "You may not create two accounts with the same name."
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
-
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr "Your message message, with the subject \"{0}\" was not delivered."
-
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Discard changes"
-
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "_Empty Trash"
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "_Expunge"
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Overwrite"
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
 msgstr "_Send"
 
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
-msgstr "vFolders automatically updated."
-
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr "{0}"
-
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr "{0}."
-
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr "{1}"
-
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr "{1}."
-
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -15206,20 +15785,20 @@ msgstr "Pinging %s"
 msgid "Working"
 msgstr "Working"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtering Folder"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Fetching Mail"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Failed to apply outgoing filters: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15228,115 +15807,115 @@ msgstr ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Failed to append to local `Sent' folder: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sending message %d of %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Failed to send %d of %d messages"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Complete."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Saving message to folder"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Moving messages to %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copying messages to %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanning folders in \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Forwarded messages"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opening folder %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Opening store %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Removing folder %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Storing folder '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Expunging and storing account '%s'"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Storing account '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Refreshing folder"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Expunging folder"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Emptying trash in '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Local Folders"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Retrieving message %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Retrieving %d message"
 msgstr[1] "Retrieving %d message(s)"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Saving %d message"
 msgstr[1] "Saving %d messsage(s)"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15345,7 +15924,7 @@ msgstr ""
 "Unable to create output file: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15354,11 +15933,11 @@ msgstr ""
 "Error saving messages to: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Saving attachment"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15367,17 +15946,17 @@ msgstr ""
 "Cannot create output file: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Could not write data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Disconnecting from %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnecting to %s"
@@ -15441,24 +16020,24 @@ msgstr "Updating..."
 msgid "Waiting..."
 msgstr "Waiting..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "User canceled operation."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Enter Password for %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Enter Password"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Remember this password"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Remember this password for the remainder of this session"
 
@@ -15498,89 +16077,94 @@ msgstr "Forwarded message"
 msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Setting up vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Updating vfolders for uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Updating vfolders for uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3105
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -15612,43 +16196,43 @@ msgstr "Received"
 msgid "Size"
 msgstr "Size"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Call"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Do Not Forward"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Follow-Up"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "For Your Information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Forward"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "No Response Necessary"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Reply"
 
-#: mail/message-tag-followup.c:70 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 "Reply to All"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Review"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flag to Follow Up"
 
@@ -15692,18 +16276,6 @@ msgstr "_Subscribe"
 msgid "_Unsubscribe"
 msgstr "_Unsubscribe"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Shell"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -15766,6 +16338,32 @@ msgstr "mail"
 msgid "Brought to you by"
 msgstr "Brought to you by"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Unknown error"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Invalid arguments"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Cannot register on OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Configuration Database not found"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generic error"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Untitled)"
@@ -15903,7 +16501,7 @@ msgstr "Unable to execute importer"
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Closing connections..."
 
@@ -15949,82 +16547,62 @@ msgstr "Folder name cannot contain the character \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution is currently online.  Click on this button to work offline."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution is in the process of going offline."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution is currently offline.  Click on this button to work online."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail to %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Error executing %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy is not installed."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
-#: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
 msgstr "About Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Work Offline"
 
-#: shell/e-shell-window.c:336
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-
-#: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution is in the process of going offline."
-
-#: shell/e-shell-window.c:349
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Invalid arguments"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Cannot register on OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Configuration Database not found"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generic error"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Checkbox"
@@ -16094,6 +16672,51 @@ msgstr "Active Connections"
 msgid "Click OK to close these connections and go offline"
 msgstr "Click OK to close these connections and go offline"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "C_alendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacts: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Mail"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Tasks"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "File _type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Sent _Messages Folder:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "_Account name:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Folder Name"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "User_name:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Setup Assistant"
@@ -16136,6 +16759,18 @@ msgstr ""
 "\n"
 "Click the \"Apply\" button to save your settings. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Shell"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Click \"Import\" to begin importing the file into Evolution. "
@@ -16194,13 +16829,14 @@ msgstr "Don't ask me again"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution can import data from the following files:"
 
-#: shell/main.c:230
-#, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16229,56 +16865,48 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Cannot register the Ximian Evolution shell."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Cannot initialize the Ximian Evolution shell: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcibly shut down all evolution components"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16287,6 +16915,72 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Connecting"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Cannot register the Ximian Evolution shell."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Account Assistant"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -16523,11 +17217,6 @@ msgstr "You have certificates on file that identify these people:"
 msgid "Your Certificates"
 msgstr "Your Certificates"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Certificate already exists"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16718,6 +17407,11 @@ msgstr "Subject Unique ID"
 msgid "Certificate Signature Value"
 msgstr "Certificate Signature Value"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Certificate already exists"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 File Password"
@@ -16826,7 +17520,8 @@ msgid "Select all contacts"
 msgstr "Select all contacts"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Send a mess to the selected contacts."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16857,8 +17552,8 @@ msgstr "View the current contact"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Actions"
@@ -16876,7 +17571,8 @@ msgid "_Preview Pane"
 msgstr "_Preview Pane"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Save as VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17332,6 +18028,16 @@ msgstr "_Invert Selection"
 msgid "_Threaded Message List"
 msgstr "_Threaded Message List"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Close"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_dd Sender to Address Book"
@@ -17569,7 +18275,8 @@ msgid "Open the selected message in a new window"
 msgstr "Open the selected message in a new window"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Open the selected message in the composer to re-send it"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17684,58 +18391,46 @@ msgstr "VFolder on _Subject..."
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copy to Folder"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Create Filter From Message"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Message Display"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Move to Folder"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal Display"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Open Message"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Resend..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Tools"
@@ -17744,16 +18439,6 @@ msgstr "_Tools"
 msgid "_Undelete"
 msgstr "_Undelete"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Close"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Attach"
@@ -18142,6 +18827,11 @@ msgstr "_Quick Reference"
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "New _Window"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
@@ -18206,10 +18896,6 @@ msgstr "With _Due Date"
 msgid "With _Status"
 msgstr "With _Status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18365,6 +19051,35 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution Mail"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Meeting Information"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution Test"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Printed Fonts</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Expanded"
@@ -18478,6 +19193,31 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Find _Now"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 already exists\n"
+"Do you want to overwrite it?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18488,3 +19228,94 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Addressbook folder viewer"
+
+#~ msgid "Address 2:"
+#~ msgstr "Address 2:"
+
+#~ msgid "Blog:"
+#~ msgstr "Blog:"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Calendar viewer"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Tasks viewer"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Could not initialize gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Could not open the folder in '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "The URI that the calendar will display"
+
+#~ msgid "The type of view to show"
+#~ msgstr "The type of view to show"
+
+#~ msgid "Display a message"
+#~ msgstr "Display a message"
+
+#~ msgid "Select source"
+#~ msgstr "Select source"
+
+#~ msgid "calendar"
+#~ msgstr "calendar"
+
+#~ msgid "task list"
+#~ msgstr "task list"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Calendar file could not be updated!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "The URI of the tasks folder to display"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Could not load the tasks in `%s'"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution Mail folder viewer"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder on Thread"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter on Thread"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Failed to migrate pop3 uid caches: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Failed to migrate folder expand state: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Failed to open store for `%s': %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI of the mail source that the view will display"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Cannot initialize the Ximian Evolution shell: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Resend..."
diff --git a/po/en_GB.po b/po/en_GB.po
index 6066ca35bb..41e5d0782a 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-03 21:27-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-03 21:32-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
@@ -114,41 +114,45 @@ msgstr "_Contacts Group"
 msgid "Create a new contacts group"
 msgstr "Create a new contacts group"
 
-#: addressbook/gui/component/addressbook-config.c:463
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: 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:487
+#: 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:515
+#: 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:820
+#: 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:1220
+#: 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:1241
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Error retrieving schema information"
 
-#: addressbook/gui/component/addressbook-config.c:1249
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrating..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrating `%s':"
@@ -157,7 +161,7 @@ msgstr "Migrating `%s':"
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: 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:243
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "On This Computer"
 
@@ -165,7 +169,7 @@ msgstr "On This Computer"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:78
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personal"
@@ -225,16 +229,16 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your Pilot Sync data..."
 
-#: addressbook/gui/component/addressbook-view.c:687
+#: addressbook/gui/component/addressbook-view.c:674
 #, 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:774
+#: addressbook/gui/component/addressbook-view.c:761
 msgid "New Address Book"
 msgstr "New Address Book"
 
-#: addressbook/gui/component/addressbook-view.c:775
+#: 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
@@ -245,25 +249,17 @@ msgstr "New Address Book"
 msgid "Delete"
 msgstr "Delete"
 
-#: addressbook/gui/component/addressbook-view.c:776
+#: addressbook/gui/component/addressbook-view.c:763
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Properties..."
 
-#: addressbook/gui/component/addressbook-view.c:1001
-msgid "UID of the contacts source that the view will display"
-msgstr "UID of the contacts source that the view will display"
-
-#: addressbook/gui/component/addressbook-view.c:1006
-msgid "The URI that the address book will display"
-msgstr "The URI that the address book will display"
-
 #. 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:1031
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/addressbook-view.c:1002
+#: 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"
@@ -290,51 +286,57 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for the folder last used in the select names dialogue"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletion"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificates"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Configure autocomplete here"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Evolution Addressbook"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution Addressbook address pop-up"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution Addressbook address viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution Addressbook card viewer"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Evolution Addressbook component"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Addressbook folder viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution S/Mime Certificate Management Control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Evolution folder settings configuration control"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
 msgstr "Manager your S/Mime certificates here"
 
 #: addressbook/gui/component/ldap-config.glade.h:1
@@ -865,125 +867,127 @@ 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:180
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "Address 2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Address:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Anniversary:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Assistant:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Birthday:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "City:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Company:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:261
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1443
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Contact Editor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Country:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Department:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Free/Busy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Full _Name..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
+#: 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 "Home"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "Home page"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Job title:"
 msgstr "Job title:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Location:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "Mailing Address"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Manager:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "Ni_ckname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Notes:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
-#: addressbook/gui/contact-editor/e-contact-editor.c:196
+#: 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 "Other"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_PO Box:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Personal Information"
@@ -1006,9 +1010,9 @@ msgstr "Webcam:"
 
 #. 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:201
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:77
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Work"
@@ -1054,13 +1058,13 @@ msgstr ""
 "to delete this contact?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Address"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:282
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2041,65 +2045,83 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:247
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Source Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:254
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Target Book"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:268
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Is New Contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:275
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Writable Fields"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:289
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Changed"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1657
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Category editor not available."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1665
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "This contact belongs to these categories:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2512
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Please select among the following options"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "The following connections are currently active:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Could not find widget for a field: `%s'"
@@ -2350,147 +2372,148 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Advanced Search"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(map)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "map"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "List Members"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisation"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Position"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Video Conferencing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "work"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobile Phone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Job Title"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Home page"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Success"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Backend busy"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Repository offline"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 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:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 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:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Permission denied"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contact not found"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "Contact ID already exists"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocol not supported"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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:626 calendar/gui/print.c:2349
+#: 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
@@ -2499,37 +2522,37 @@ msgid "Cancelled"
 msgstr "Cancelled"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Could not cancel"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Authentication Failed"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Authentication Required"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "No such source"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Other error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: 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."
@@ -2537,7 +2560,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:109
+#: 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."
@@ -2545,7 +2568,7 @@ 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:114
+#: 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 "
@@ -2555,7 +2578,7 @@ msgstr ""
 "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:123
+#: 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."
@@ -2563,11 +2586,11 @@ 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:140
+#: 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:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2579,7 +2602,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:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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"
@@ -2591,53 +2614,53 @@ msgstr ""
 "more specific or raise the time limit in the directory server\n"
 "preferences for this addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 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:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 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:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "This query did not complete successfully."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: 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:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Discard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Error adding list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Error adding contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Error modifying list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Error modifying contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Error removing list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Error removing contact"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2646,7 +2669,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:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2655,49 +2678,49 @@ msgstr ""
 "%s already exists\n"
 "Do you want to overwrite it?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Overwrite"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: 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:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "list"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Move contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Copy contact to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Move contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Copy contacts to"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Select target addressbook."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "Multiple VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2840,9 +2863,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Save as VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2919,7 +2943,7 @@ msgid "Paste"
 msgstr "Paste"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Current View"
 
@@ -2935,7 +2959,7 @@ msgstr ""
 "has crashed. You will have to restart Evolution in order to use it again"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Any Category"
@@ -3526,24 +3550,24 @@ msgstr "_Edit appointment"
 msgid "_Snooze"
 msgstr "_Snooze"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Open"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Dismiss"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Dismiss All"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "No description available."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3556,12 +3580,12 @@ msgstr ""
 "Starting at %s\n"
 "Ending at %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Warning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3573,7 +3597,7 @@ msgstr ""
 "configured to send an email.  Evolution will display\n"
 "a normal reminder dialogue box instead."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3590,7 +3614,7 @@ msgstr ""
 "\n"
 "Are you sure you want to run this program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Do not ask me about this program again."
 
@@ -3598,15 +3622,11 @@ msgstr "Do not ask me about this program again."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Evolution Calendar alarm notification service"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Could not initialise Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Could not initialise gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Could not create the alarm notify service factory"
 
@@ -3715,38 +3735,42 @@ msgid "Weekday the week starts on"
 msgstr "Weekday the week starts on"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Whether to ask for confirmation on appointment deletion"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Whether to ask for confirmation when folder is expunged"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Whether to hide completed tasks"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Whether to set a default reminder for events"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Whether to show times in 24h format instead of using am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Whether to show week numbers in date navigator"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: 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:1706
+#: calendar/gui/gnome-cal.c:1703
 #: camel/providers/groupwise/camel-gw-listener.c:304
 #: camel/providers/groupwise/camel-gw-listener.c:327
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3756,36 +3780,36 @@ msgstr ""
 "amount of time. If you continue, you will not be able to recover these "
 "events."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Purge events older than"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "days"
 
-#: calendar/gui/calendar-commands.c:431 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.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1589 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
@@ -3794,7 +3818,7 @@ 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:464 calendar/gui/calendar-component.c:533
+#: 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"
@@ -3808,16 +3832,21 @@ msgstr "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgid "New Calendar"
 msgstr "New Calendar"
 
-#: calendar/gui/calendar-component.c:908
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Loading calendar..."
+
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Unable to open the calendar '%s' for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:920
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "There is no calendar available for creating events and meetings"
 
-#: calendar/gui/calendar-component.c:954
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3825,56 +3854,56 @@ msgstr ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
 
-#: calendar/gui/calendar-component.c:1062
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Calendars"
 
-#: calendar/gui/calendar-component.c:1225
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "New appointment"
 
-#: calendar/gui/calendar-component.c:1226
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Appointment"
 
-#: calendar/gui/calendar-component.c:1227
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Create a new appointment"
 
-#: calendar/gui/calendar-component.c:1233
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "New meeting"
 
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "M_eeting"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Create a new meeting request"
 
-#: calendar/gui/calendar-component.c:1241
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "New all day appointment"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "All _Day Appointment"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Create a new all-day appointment"
 
-#: calendar/gui/calendar-component.c:1249
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "New calendar"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "C_alendar"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Create a new calendar"
 
@@ -3924,15 +3953,15 @@ msgstr "Location contains"
 msgid "Unmatched"
 msgstr "Unmatched"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error while opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Method not supported when opening the calendar"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Permission denied to open the calendar"
 
@@ -3941,19 +3970,6 @@ msgstr "Permission denied to open the calendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Could not open the folder in '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "The URI that the calendar will display"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "The type of view to show"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Audio Alarm Options"
@@ -4019,7 +4035,7 @@ msgstr "extra times every"
 msgid "hours"
 msgstr "hours"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Action/Trigger"
 
@@ -4038,14 +4054,14 @@ msgstr "Basics"
 msgid "Date/Time:"
 msgstr "Date/Time:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Display a message"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Play a sound"
 
+#: 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 "Reminders"
@@ -4099,26 +4115,26 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "start of appointment"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
+#: calendar/gui/dialogs/calendar-setup.c:170
 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:174
+#: calendar/gui/dialogs/calendar-setup.c:178
 #, 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:189
+#: calendar/gui/dialogs/calendar-setup.c:193
 #, 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:234
+#: calendar/gui/dialogs/calendar-setup.c:265
 #, 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:247
+#: calendar/gui/dialogs/calendar-setup.c:278
 #, c-format
 msgid ""
 "The group '%s' is remote. You must specify a location to get the calendar "
@@ -4190,7 +4206,7 @@ msgstr "weeks"
 #. 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:676 mail/em-composer-prefs.c:904
+#: mail/em-composer-prefs.c:677 mail/em-composer-prefs.c:905
 msgid "Enabled"
 msgstr "Enabled"
 
@@ -4206,8 +4222,8 @@ msgstr "Don't Remove"
 #: 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:595 mail/em-composer-prefs.c:653
-#: mail/em-composer-prefs.c:683
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Disable"
 msgstr "Disable"
 
@@ -4215,8 +4231,8 @@ msgstr "Disable"
 #: 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:595 mail/em-composer-prefs.c:653
-#: mail/em-composer-prefs.c:683
+#: mail/em-composer-prefs.c:596 mail/em-composer-prefs.c:654
+#: mail/em-composer-prefs.c:684
 msgid "Enable"
 msgstr "Enable"
 
@@ -4566,8 +4582,8 @@ 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:1037
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Save as..."
 
@@ -4726,27 +4742,27 @@ msgstr "Delegate To:"
 msgid "Enter Delegate"
 msgstr "Enter Delegate"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appointment"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Reminder"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Recurrence"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Scheduling"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Meeting"
 
@@ -4844,10 +4860,10 @@ 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/e-cal-model-tasks.c:618 composer/e-msg-composer.c:2110
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:805
-#: mail/mail-account-gui.c:1551 mail/mail-account-gui.c:2045
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4873,8 +4889,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:796
+#: 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
 #: 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
@@ -5147,8 +5163,9 @@ msgid "Save Event"
 msgstr "Save Event"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Select source"
+#, fuzzy
+msgid "Select destination"
+msgstr "Select destination %s"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5186,42 +5203,42 @@ msgstr "% _Complete"
 #: 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:624 calendar/gui/e-meeting-store.c:187
+#: 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 "Completed"
 
 #: 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:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "High"
 
 #: 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:622 calendar/gui/e-cal-model-tasks.c:697
+#: 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 "In Progress"
 
 #: 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:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Low"
 
 #: 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:875
-#: mail/message-list.c:927
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normal"
 
 #: 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:620 calendar/gui/print.c:2340
+#: calendar/gui/e-cal-model-tasks.c:649 calendar/gui/print.c:2340
 msgid "Not Started"
 msgstr "Not Started"
 
@@ -5415,12 +5432,12 @@ msgstr "%s at %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for an unknown trigger type"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2215
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Click to open %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:750
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Untitled"
 
@@ -5524,8 +5541,8 @@ 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:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:771 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Open"
 
@@ -5534,41 +5551,42 @@ 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:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:773 mail/em-popup.c:690 mail/em-popup.c:806
+#: 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
 #: 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:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Print..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: 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:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2602 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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 "_Copy"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Paste"
 
@@ -5632,67 +5650,67 @@ msgstr "Summary"
 msgid "Task sort"
 msgstr "Task sort"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "New _Appointment..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "New All Day _Event"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "New Meeting"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "New Task"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Select _Today"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Select Date..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publish Free/Busy Information"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Cop_y to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ve to Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Schedule Meeting..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Forward as iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Delete this _Occurrence"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Delete _All Occurrences"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Go to _Today"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Go to Date..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Settings..."
 
@@ -5710,35 +5728,36 @@ msgstr "Start Date"
 #: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
+#: 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:1034
+#: 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:1046
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Unknown"
 
-#: calendar/gui/e-cal-model.c:877
+#: calendar/gui/e-cal-model.c:911
 msgid "Recurring"
 msgstr "Recurring"
 
-#: calendar/gui/e-cal-model.c:879
+#: calendar/gui/e-cal-model.c:913
 msgid "Assigned"
 msgstr "Assigned"
 
-#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:980
+#: 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-store.c:169 calendar/gui/e-meeting-store.c:765
 msgid "Yes"
 msgstr "Yes"
 
-#: calendar/gui/e-cal-model.c:881 calendar/gui/e-cal-model-tasks.c:980
+#: 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
 msgid "No"
 msgstr "No"
@@ -5759,7 +5778,7 @@ msgstr "E"
 msgid "W"
 msgstr "W"
 
-#: calendar/gui/e-cal-model-tasks.c:572
+#: calendar/gui/e-cal-model-tasks.c:601
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5793,27 +5812,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 msgstr "pm"
 
 #. 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:1572 calendar/gui/e-day-view-top-item.c:690
+#: 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:1605 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"
@@ -5959,7 +5978,7 @@ msgstr "Update"
 #: 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6172,59 +6191,55 @@ msgstr "The attachment does not contain a valid calendar message"
 msgid "The attachment has no viewable calendar items"
 msgstr "The attachment has no viewable calendar items"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Calendar file could not be updated!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Update complete\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Object is invalid and cannot be updated\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Object could not be found\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Attendee status updated\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Attendee status could not be updated!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Removal Complete"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Item sent!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "The item could not be sent!\n"
 
@@ -6428,7 +6443,7 @@ msgstr "%d/%m/%Y"
 msgid "Enter the password for %s"
 msgstr "Enter the password for %s"
 
-#: calendar/gui/e-tasks.c:582 calendar/gui/gnome-cal.c:2021
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6437,19 +6452,19 @@ msgstr ""
 "Error on %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:610 calendar/gui/gnome-cal.c:2060
+#: 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:684
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opening tasks at %s"
 
-#: calendar/gui/e-tasks.c:707
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6458,87 +6473,87 @@ msgstr ""
 "Error opening %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:728
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Loading tasks"
 
-#: calendar/gui/e-tasks.c:832
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Completing tasks..."
 
-#: calendar/gui/e-tasks.c:855
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Deleting selected objects..."
 
-#: calendar/gui/e-tasks.c:882
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Expunging"
 
-#: calendar/gui/e-tasks.c:958
+#: calendar/gui/e-tasks.c:960
 #: 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:637 calendar/gui/tasks-control.c:516
+#: calendar/gui/tasks-component.c:648 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:1879
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Loading appointments at %s"
 
-#: calendar/gui/gnome-cal.c:1898
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Loading tasks at %s"
 
-#: calendar/gui/gnome-cal.c:1921
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Opening %s"
 
-#: calendar/gui/gnome-cal.c:2051
+#: 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:2897
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Purging"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Calendar and Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configure your timezone, Calendar and Task List here "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution Calendar and Tasks"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Evolution Calendar configuration control"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution Calendar scheduling message viewer"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Calendar viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution Calendar/Task editor"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Tasks viewer"
-
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Evolution's Calendar component"
@@ -6547,6 +6562,16 @@ msgstr "Evolution's Calendar component"
 msgid "Evolution's Tasks component"
 msgstr "Evolution's Tasks component"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendars"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tasks"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6690,6 +6715,23 @@ msgstr "Birthdays & Anniversaries"
 msgid "On The Web"
 msgstr "On The Web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Unable to open the calendar '%s'."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Unable to open tasks in '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1st"
@@ -6909,7 +6951,7 @@ msgid "Contacts: "
 msgstr "Contacts: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Print Preview"
 
@@ -6937,23 +6979,28 @@ msgid_plural "%d tasks"
 msgstr[0] "%d task"
 msgstr[1] "%d tasks"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:532
+#: calendar/gui/tasks-component.c:400 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:515
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Loading tasks"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:527
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "There is no calendar available for creating tasks"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6961,40 +7008,31 @@ msgstr ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 
-#: calendar/gui/tasks-component.c:793
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "New task"
 
-#: calendar/gui/tasks-component.c:794
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Task"
 
-#: calendar/gui/tasks-component.c:795
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Create a new task"
 
-#: calendar/gui/tasks-component.c:801
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "New tasks group"
 
-#: calendar/gui/tasks-component.c:802
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "_Tasks Group"
 
-#: calendar/gui/tasks-component.c:803
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Create a new tasks group"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "The URI of the tasks folder to display"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Could not load the tasks in `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7006,11 +7044,11 @@ msgstr ""
 "\n"
 "Really erase these tasks?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Do not ask me again."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Print Tasks"
 
@@ -8658,7 +8696,7 @@ msgstr "Copy folder content locally for offline operation"
 msgid "Downloading new messages for offline mode"
 msgstr "Downloading new messages for offline mode"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparing folder '%s' for offline"
@@ -8782,7 +8820,7 @@ msgstr "Learning junk and/or non junk message(s)"
 msgid "Filtering new message(s)"
 msgstr "Filtering new message(s)"
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8791,7 +8829,7 @@ msgstr ""
 "Cannot parse search expression: %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"
@@ -8800,16 +8838,34 @@ msgstr ""
 "Error executing search expression: %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 "(match-all) requires a single bool result"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) requires a single bool result"
+
+#: camel/camel-folder-search.c:880
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Performing query on unknown header: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8820,15 +8876,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Failed to parse gpg userid hint."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Failed to parse gpg passphrase request."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8837,27 +8893,27 @@ msgstr ""
 "You need a passphrase to unlock the key for\n"
 "user: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelled."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Failed to unlock secret key: 3 bad passphrases given."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Unexpected response from GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Failed to encrypt: No valid recipients specified."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8868,58 +8924,58 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Failed to GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Could not generate signing data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Failed to execute gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Failed to execute gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "This is a digitally signed message part"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Cannot verify message signature: Incorrect message format"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Cannot verify message signature: could not create temp file: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Could not generate encrypting data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "This is a digitally encrypted message part"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Encrypted content"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Unable to parse message content"
 
@@ -9216,7 +9272,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Bad authentication response from server."
 
@@ -9413,7 +9469,8 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "Cannot add MS SMIMEEncKeyPrefs attribute"
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+#, fuzzy
+msgid "Cannot add encryption certificate"
 msgstr "Cannot add add encryption certificate"
 
 #: camel/camel-smime-context.c:360
@@ -9428,7 +9485,7 @@ msgstr "Cannot create encoder context"
 msgid "Failed to add data to CMS encoder"
 msgstr "Failed to add data to CMS encoder"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Failed to encode data"
 
@@ -9488,91 +9545,93 @@ msgstr "Cannot calculate digests"
 msgid "Cannot set message digests"
 msgstr "Cannot set message digests"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Certificate import failed"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Certficate only message, cannot verify certificates"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Certficate only message, certificates imported and verified"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Can't find signature digests"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signer: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Decoder failed"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Can't find certificate for `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Can't find common bulk encryption algorithm"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Can't allocate slot for encryption bulk key"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Can't create CMS Message"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Can't create CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Can't attach CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Can't attach CMS data object"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Can't create CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Can't add CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Can't create encoder context"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Failed to add data to encoder"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Decoder failed, error %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME Decrypt: No encrypted content found"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "import keys: unimplemented"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "export keys: unimplemented"
 
@@ -9589,16 +9648,26 @@ msgstr "Cannot create folder `%s': folder exists"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Cannot create folder: Invalid operation on this store"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Cannot create folder `%s': folder exists"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Cannot delete folder: %s: Invalid operation"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Cannot rename folder: %s: Invalid operation"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Trash"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
@@ -9719,7 +9788,7 @@ msgstr "Key usage does not support certificate signing"
 msgid "Error in application verification"
 msgstr "Error in application verification"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9732,11 +9801,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Signature:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BAD"
 
@@ -9760,7 +9829,7 @@ msgstr ""
 "Do you wish to accept anyway?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9775,7 +9844,7 @@ msgstr ""
 "\n"
 "Do you wish to accept?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9784,7 +9853,7 @@ msgstr ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9793,7 +9862,7 @@ msgstr ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9802,7 +9871,7 @@ msgstr ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9816,17 +9885,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Could not parse URL `%s'"
 
-#: camel/camel-vee-folder.c:629
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Error storing `%s': %s"
 
-#: camel/camel-vee-folder.c:669
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No such message %s in %s"
 
-#: camel/camel-vee-folder.c:835 camel/camel-vee-folder.c:841
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Cannot copy or move messages into a Virtual Folder"
 
@@ -9835,11 +9904,6 @@ msgstr "Cannot copy or move messages into a Virtual Folder"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Cannot delete folder: %s: No such folder"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Cannot rename folder: %s: Invalid operation"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10034,21 +10098,21 @@ 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:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, 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:545
-#: camel/providers/imap/camel-imap-store.c:565
+#: 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/pop3/camel-pop3-store.c:175
@@ -10059,15 +10123,15 @@ 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:547
+#: 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:562
-#: camel/providers/imap/camel-imap-store.c:799
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10085,8 +10149,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
+#: 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 "Failed to connect to IMAP server %s in secure mode: %s"
@@ -10095,7 +10159,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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 msgid "Unknown error"
 msgstr "Unknown error"
 
@@ -10122,9 +10186,11 @@ 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
 #, c-format
 msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
 
@@ -10153,31 +10219,31 @@ msgstr "Cannot delete folder `%s': Invalid mailbox name"
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Cannot delete folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1032
+#: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-store.c:1039
 msgid "Bad command"
 msgstr "Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1095
+#: camel/providers/imap4/camel-imap4-store.c:1100
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Cannot subscribe to folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-store.c:1105
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Cannot subscribe to folder `%s': Bad command"
 
-#: camel/providers/imap4/camel-imap4-store.c:1144
+#: camel/providers/imap4/camel-imap4-store.c:1149
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-store.c:1154
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Cannot unsubscribe from folder `%s': Bad command"
@@ -10199,12 +10265,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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operation cancelled"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server unexpectedly disconnected: %s"
@@ -10253,21 +10319,21 @@ msgstr "Could not create directory %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Could not load summary for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder was destroyed and recreated on server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Scanning for changed messages"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Unable to retrieve message: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10283,25 +10349,25 @@ msgstr ""
 "Cannot get message: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "No such message"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "This message is not currently available"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Fetching summary information for new messages"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Could not find message body in FETCH response."
 
@@ -10359,43 +10425,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:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL negotiations failed"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "You didn't enter a password."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10406,26 +10472,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "No such folder %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10433,7 +10491,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Unknown parent folder: %s"
@@ -10540,58 +10598,58 @@ msgstr ""
 "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."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Store root %s is not an absolute path"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Store root %s is not a regular directory"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Cannot get folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Local stores do not have an inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Local mail file %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Could not rename folder %s to %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Could not rename '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Could not delete folder summary file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Could not delete folder index file `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10657,7 +10715,7 @@ msgstr "Could not delete folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "not a maildir directory"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10988,7 +11046,7 @@ 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:258
+#: 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
@@ -10997,8 +11055,8 @@ msgid "User cancelled"
 msgstr "User cancelled"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11007,46 +11065,46 @@ msgstr "User cancelled"
 msgid "Cannot get message %s: %s"
 msgstr "Cannot get message %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Internal error: uid in invalid format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "You cannot copy messages from a NNTP folder!"
 
@@ -11222,8 +11280,8 @@ msgstr "No message with uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Retrieving POP message %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1223
-#: composer/e-msg-composer.c:1244
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Unknown reason"
 
@@ -11667,7 +11725,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "attachment"
 
@@ -11711,65 +11769,67 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggest automatic display of attachment"
 
-#: composer/e-msg-composer.c:703
+#: composer/e-msg-composer.c:704
+#, fuzzy
 msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
+"Cannot sign outgoing message: No signing certificate set for this account"
 msgstr ""
 "Cannot sign outgoing message: No signing certificate set for from account"
 
-#: composer/e-msg-composer.c:709
+#: composer/e-msg-composer.c:711
+#, fuzzy
 msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
+"Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
 msgstr ""
 "Cannot encrypt outgoing message: No encryption certificate set for from "
 "account"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1283
 msgid "Could not open file"
 msgstr "Could not open file"
 
-#: composer/e-msg-composer.c:1289
+#: composer/e-msg-composer.c:1291
 msgid "Unable to retrieve message from editor"
 msgstr "Unable to retrieve message from editor"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1561
 msgid "Untitled Message"
 msgstr "Untitled Message"
 
-#: composer/e-msg-composer.c:1589
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Open file"
 
-#: composer/e-msg-composer.c:1996 mail/mail-account-gui.c:1472
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
 msgid "Autogenerated"
 msgstr "Autogenerated"
 
-#: composer/e-msg-composer.c:2095
+#: composer/e-msg-composer.c:2097
 msgid "Signature:"
 msgstr "Signature:"
 
-#: composer/e-msg-composer.c:2296
+#: composer/e-msg-composer.c:2298
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> File Attached"
 msgstr[1] "<b>%d</b> Files Attached"
 
-#: composer/e-msg-composer.c:2325
+#: composer/e-msg-composer.c:2327
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Hide _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2328 composer/e-msg-composer.c:3232
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Show _Attachment Bar (drop attachments here)"
 
-#: composer/e-msg-composer.c:2345 composer/e-msg-composer.c:3111
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
 msgid "Compose a message"
 msgstr "Compose a message"
 
-#: composer/e-msg-composer.c:3145
+#: composer/e-msg-composer.c:3147
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11777,7 +11837,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
 
-#: composer/e-msg-composer.c:3173
+#: composer/e-msg-composer.c:3175
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11789,7 +11849,7 @@ msgstr ""
 "Please make sure you have the correct version\n"
 "of gtkhtml and libgtkhtml installed.\n"
 
-#: composer/e-msg-composer.c:3277
+#: composer/e-msg-composer.c:3279
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11797,7 +11857,7 @@ msgstr ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
 
-#: composer/e-msg-composer.c:4282
+#: composer/e-msg-composer.c:4284
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11885,113 +11945,132 @@ msgstr "Click here to select folders to post to"
 msgid "Attach file(s)"
 msgstr "Attach file(s)"
 
-#: composer/mail-composer-errors.xml.in.h:1
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+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.in.h:2
-msgid "All accounts have been removed."
-msgstr "All accounts have been removed."
+#. 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 "The file `${0}' is not a regular file and cannot be sent in a message."
+
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Directories can not be attached to Messages."
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"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 ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"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."
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr "Because \"${0}\", you may need to select different mail options."
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
+msgstr "Unfinished messages found"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr "Because \"${1}\"."
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr "Do you want to recover unfinished messages?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"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."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 
-#: composer/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr "Could not create message."
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
+msgstr "Don't Recover"
 
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr "Could not read signature file \"{0}\"."
+#: composer/mail-composer-errors.xml.h:18
+msgid "Recover"
+msgstr "Recover"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Could not save to autosave file \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr "Directories can not be attached to Messages."
-
-#: composer/mail-composer-errors.xml.in.h:11
-msgid "Discard Changes"
-msgstr "Discard Changes"
-
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr "Do you want to recover unfinished messages?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr "Don't Recover"
-
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Error saving to autosave because \"{1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Warning: Modified Message"
+
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 
-#: composer/mail-composer-errors.xml.in.h:16
-msgid "Recover"
-msgstr "Recover"
+#. 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 ""
+"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."
+
+#: composer/mail-composer-errors.xml.h:29
+msgid "Discard Changes"
+msgstr "Discard Changes"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 msgid "Save Message"
 msgstr "Save Message"
 
-#: composer/mail-composer-errors.xml.in.h:18
-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:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
+msgstr "Could not create message."
 
-#: composer/mail-composer-errors.xml.in.h:19
-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 ""
-"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."
+#. 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 "Because \"${0}\", you may need to select different mail options."
 
-#: composer/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
-msgstr "Unfinished messages found"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr "Could not read signature file \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr "Because \"${1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr "All accounts have been removed."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "You need to configure an account before you can compose mail."
 
@@ -12123,7 +12202,8 @@ msgstr ""
 "A file by that name already exists.\n"
 "Overwrite it?"
 
-#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.in.h:7
+#. 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 "Overwrite file?"
 
@@ -12299,71 +12379,88 @@ msgstr "Select a time to compare against"
 msgid "_Filter Rules"
 msgstr "_Filter Rules"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "Bad regular expression \"{0}\"."
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Could not compile regular expression \"{1}\"."
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "File \"{0}\" does not exist or is not a regular file."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Missing date."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "You must choose a date."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Missing file name."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-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."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "File \"{0}\" does not exist or is not a regular file."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Missing folder."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Missing name."
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "You must specify a folder."
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "Bad regular expression \"{0}\"."
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "Could not compile regular expression \"{1}\"."
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Missing name."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "You must name this filter."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "You must name this vFolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "Name \"{0}\" already used."
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Please choose another name."
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "No sources selected."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+#, fuzzy
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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 ""
 "You must specify at least one folder as a source. Either by selecting the "
 "folders individually, and/or by selecting all local folders, all remote "
@@ -12378,8 +12475,8 @@ msgstr "Choose a file"
 msgid "<b>Then</b>"
 msgstr "<b>Then</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1338
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Select Folder"
 
@@ -12471,19 +12568,19 @@ msgstr "with all local folders"
 msgid "years"
 msgstr "years"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
+#: 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
 msgid "Important"
 msgstr "Important"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:79
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
 #: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "To Do"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:80
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Later"
@@ -12492,31 +12589,51 @@ msgstr "Later"
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:746
+#: filter/filter-rule.c:790
 msgid "Rule name:"
 msgstr "Rule name:"
 
-#: filter/filter-rule.c:773
+#: filter/filter-rule.c:817
 msgid "<b>If</b>"
 msgstr "<b>If</b>"
 
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Execute actions"
-
-#: filter/filter-rule.c:808
+#: filter/filter-rule.c:854
 msgid "if all criteria are met"
 msgstr "if all criteria are met"
 
-#: filter/filter-rule.c:813
+#: filter/filter-rule.c:854
 msgid "if any criteria are met"
 msgstr "if any criteria are met"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Execute actions"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegated"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Recipients"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Replies to %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Include:"
+
+#: filter/filter-rule.c:974
 msgid "incoming"
 msgstr "incoming"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:974
 msgid "outgoing"
 msgstr "outgoing"
 
@@ -12649,7 +12766,7 @@ msgstr "is not Flagged"
 msgid "Junk Test"
 msgstr "Junk Test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:804
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12755,8 +12872,8 @@ msgstr "starts with"
 msgid "Stop Processing"
 msgstr "Stop Processing"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: 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"
@@ -12818,7 +12935,11 @@ msgstr "Subject does not contain"
 msgid "Virtual _Folders"
 msgstr "Virtual _Folders"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Add"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder source"
 
@@ -12836,47 +12957,40 @@ msgid "Protocol"
 msgstr "Protocol"
 
 #: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1049
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Unnamed"
 
-#: mail/em-composer-prefs.c:908
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Language(s)"
 
-#: mail/em-composer-prefs.c:954
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "Add signature script"
 
-#: mail/em-composer-prefs.c:974
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signature(s)"
 
-#: mail/em-composer-utils.c:883
+#: mail/em-composer-utils.c:888
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Forwarded Message --------"
 
-#: mail/em-composer-utils.c:1494
+#: mail/em-composer-utils.c:1499
 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:1504
+#: mail/em-composer-utils.c:1509
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 
-#: mail/em-folder-browser.c:143
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Create _Virtual Folder From Search..."
 
-#: mail/em-folder-browser.c:835 mail/GNOME_Evolution_Mail.server.in.in.h:12
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:540
-#: mail/mail-component.c:583
-msgid "Mail"
-msgstr "Mail"
-
 #: mail/em-folder-properties.c:120
 msgid "Folder properties"
 msgstr "Folder properties"
@@ -12907,94 +13021,119 @@ 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:2334
-#: mail/mail-component.c:732
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specify where to create the folder:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Create folder"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Folder _name:"
 
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moving folder %s"
 
-#: mail/em-folder-tree.c:936
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copying folder %s"
 
-#: mail/em-folder-tree.c:943
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moving messages into folder %s"
 
-#: mail/em-folder-tree.c:945
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copying messages into folder %s"
 
-#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Cannot drop message(s) into toplevel store"
 
-#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
-#: mail/em-folder-view.c:673 mail/em-folder-view.c:687
+#: mail/em-folder-tree.c:956 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
+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:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Move"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancel Task"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Select folder"
 
-#: mail/em-folder-tree.c:2148
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copy"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creating folder `%s'"
 
-#: mail/em-folder-tree.c:2334 mail/mail-component.c:732
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Create folder"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rename the \"%s\" folder to:"
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Rename Folder"
 
-#: mail/em-folder-tree.c:2597 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_View"
 
-#: mail/em-folder-tree.c:2598
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Open in _New Window"
 
-#: mail/em-folder-tree.c:2603
-msgid "_Move"
-msgstr "_Move"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2607
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_New Folder..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Rename"
 
-#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Properties..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "VFolders"
 
@@ -13008,308 +13147,309 @@ msgstr "UNMATCHED"
 msgid "Inbox"
 msgstr "Inbox"
 
-#: mail/em-folder-tree-model.c:468 mail/em-folder-tree-model.c:777
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
 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:508
+#: mail/mail-component.c:551
+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:772 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit as New Message..."
 
-#: mail/em-folder-view.c:774
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Print"
 
-#: mail/em-folder-view.c:777 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Reply to Sender"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Reply to _List"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Reply to _All"
 
-#: mail/em-folder-view.c:780 mail/em-popup.c:813
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Forward"
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Follo_w Up..."
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Fla_g Completed"
 
-#: mail/em-folder-view.c:785
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Cl_ear Flag"
 
-#: mail/em-folder-view.c:788 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 "Mar_k as Read"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Mark as _Unread"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Mark as _Important"
 
-#: mail/em-folder-view.c:791
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Mark as Unimportant"
 
-#: mail/em-folder-view.c:792 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 "Mark as _Junk"
 
-#: mail/em-folder-view.c:793 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 "Mark as _Not Junk"
 
-#: mail/em-folder-view.c:797
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "U_ndelete"
 
-#: mail/em-folder-view.c:800
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ve to Folder..."
 
-#: mail/em-folder-view.c:801 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copy to Folder..."
 
-#: mail/em-folder-view.c:809
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Add Sender to Address_book"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Appl_y Filters"
 
-#: mail/em-folder-view.c:813
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_ilter Junk"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Crea_te Rule From Message"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder on _Subject"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder on Se_nder"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder on _Recipients"
 
-#: mail/em-folder-view.c:820
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder on Mailing _List"
 
-#: mail/em-folder-view.c:822
-msgid "VFolder on Thread"
-msgstr "VFolder on Thread"
-
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter on Sub_ject"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter on Sen_der"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter on Re_cipients"
 
-#: mail/em-folder-view.c:829
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter on _Mailing List"
 
-#: mail/em-folder-view.c:831
-msgid "Filter on Thread"
-msgstr "Filter on Thread"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1614 mail/em-folder-view.c:1652
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Default"
 
-#: mail/em-folder-view.c:1688
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Print Message"
 
-#: mail/em-folder-view.c:1951
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copy Link Location"
 
-#: mail/em-folder-view.c:2210
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Click to mail %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:84 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 "From"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:85
+#: 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 "Reply-To"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:86 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 "To"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:87
+#: 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:746 mail/em-format-html.c:1436 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:88
+#: 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:748 mail/em-format-html.c:1586 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+#: 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 "Date"
 
-#: mail/em-format.c:749 mail/em-format-html.c:1607 mail/em-mailer-prefs.c:91
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Newsgroups"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "%s attachment"
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Could not parse S/MIME message: Unknown error"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Unsupported encryption type for multipart/encrypted"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Could not parse MIME message. Displaying as source."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Unsupported signature format"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Error verifying signature"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Unknown error verifying signature"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Retrieving `%s'"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Unsigned"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Valid signature"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:648
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Invalid signature"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:649
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Valid signature, cannot verify sender"
 
-#: mail/em-format-html.c:578 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Unencrypted"
 
-#: mail/em-format-html.c:579 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Encrypted, weak"
 
-#: mail/em-format-html.c:580 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Encrypted"
 
-#: mail/em-format-html.c:581 mail/em-format-html-display.c:658
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Encrypted, strong"
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Malformed external-body part."
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Pointer to FTP site (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Pointer to local file (%s) valid at site \"%s\""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Pointer to local file (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Pointer to remote data (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Pointer to unknown external data (\"%s\" type)"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formatting message"
 
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:935
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Mailer"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13319,7 +13459,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Matches: %d"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13327,7 +13467,7 @@ msgstr ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13335,7 +13475,7 @@ msgstr ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13343,7 +13483,11 @@ msgstr ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr "Valid signature, cannot verify sender"
+
+#: 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."
@@ -13351,7 +13495,7 @@ msgstr ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13359,7 +13503,7 @@ msgstr ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13369,7 +13513,7 @@ msgstr ""
 "be difficult, but not impossible for an outsider to view the content of this "
 "message in a practical amount of time."
 
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13377,7 +13521,7 @@ msgstr ""
 "This message is encrypted.  It would be difficult for an outsider to view "
 "the content of this message."
 
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13387,60 +13531,60 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_View Certificate"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "This certificate is not viewable"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completed on %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Overdue:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "by %d %B, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_View Inline"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Hide"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d of %d"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (built-in)"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Every time"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Once per day"
 
-#: mail/em-mailer-prefs.c:104
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Once per week"
 
-#: mail/em-mailer-prefs.c:105
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Once per month"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13452,25 +13596,55 @@ msgstr ""
 "\n"
 "Please be patient while Evolution migrates your folders..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Failed to migrate pop3 uid caches: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Cannot create folder `%s': %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Failed to migrate folder expand state: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Unable to copy file descriptor: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Unable to save grouplist file for %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Failed to authenticate on POP server %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Failed to create directory `%s': %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Failed to open store for `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Failed to create directory `%s': %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Unable to create output file: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13506,49 +13680,49 @@ msgstr "_Add to Addressbook"
 msgid "Open in %s..."
 msgstr "Open in %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "This store does not support subscriptions, or they are not enabled."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Subscribed"
 
-#: mail/em-subscribe-editor.c:637 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 "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Please select a server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "No server has been selected"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Don't show this message again."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Save Message..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Add address"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:989
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages from %s"
@@ -13676,10 +13850,15 @@ msgid "List of Labels and their associated colors"
 msgstr "List of Labels and their associated colours"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "List of accounts"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "List of accounts"
+
+#: 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."
@@ -13687,11 +13866,11 @@ msgstr ""
 "List of accounts known to the mail component of Evolution. The list contains "
 "strings naming subdirectories relative to /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "List of custom headers and whether they are enabled."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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."
@@ -13699,15 +13878,19 @@ msgstr ""
 "List of labels known to the mail component of Evolution. The list contains "
 "strings containing name:colour where colour uses the HTML hex encoding."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "List of mime types to check for bonobo component viewers"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Load images for HTML messages over http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13717,89 +13900,89 @@ msgstr ""
 "load images off the net 1 - Load images if sender is in the addressbook 2 - "
 "Always load images off the net"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Log filter actions to the specified log file."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Logfile to log filter actions"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Logfile to log filter actions."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Mark as Seen after specified timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Mark as Seen after specified timeout."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Mark citations in the message \"Preview\""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Mark citations in the message \"Preview\"."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr "Message Window default height"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Message Window default width"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Message-display style (normal, full headers, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimum days between emptying the trash on exit"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Minimum time between emptying the trash on exit, in days."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "New Mail Notify sound file"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "New Mail Notify type"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Prompt on empty subject"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Prompt the user when he or she tries to expunge a folder."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Prompt the user when he or she tries to send a message without a Subject."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Prompt when user expunges"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Prompt when user only fills Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13807,34 +13990,26 @@ msgstr ""
 "Prompt when user tries to send HTML mail to recipients that may not want to "
 "receive HTML mail."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Prompt when user tries to send a message with no To or Cc recipients."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Prompt when user tries to send unwanted HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Recognise links in text and replace them."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Recognise smileys in text and replace them with images."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Run junk test on incoming mail"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Send HTML mail by default"
@@ -14024,47 +14199,47 @@ msgid "spamd port"
 msgstr "spamd port"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Composer Preferences"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure mail preferences, including security and message display, here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Configure spell-checking, signatures, and the message composer here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configure your email accounts here"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolution Mail"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolution Mail accounts configuration control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution Mail component"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolution Mail composer"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolution Mail composer configuration control"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Mail folder viewer"
-
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Evolution Mail preferences control"
@@ -14077,6 +14252,11 @@ msgstr "Mail Accounts"
 msgid "Mail Preferences"
 msgstr "Mail Preferences"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Mail:"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution is importing your old Elm mail"
@@ -14084,14 +14264,14 @@ 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/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: 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/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Please wait"
 
@@ -14169,7 +14349,7 @@ msgstr "Scanning %s"
 msgid "Priority Filter \"%s\""
 msgstr "Priority Filter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14195,7 +14375,7 @@ msgstr ""
 "of priorities. Check the imported filters to make sure\n"
 "everything still works as intended."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14207,7 +14387,7 @@ msgstr ""
 "feature, which is not supported in Evolution.\n"
 "These filters will be dropped."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14221,23 +14401,23 @@ msgstr ""
 "were modified to test whether that string is or is not\n"
 "contained in the message body."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution is importing your old Netscape data"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importing Netscape data"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Settings"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Mail Filters"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14270,19 +14450,33 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Account Editor"
 
-#: mail/mail-account-gui.c:957 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Key Agreement"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:961 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "User_name:"
 
-#: mail/mail-account-gui.c:965 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Path:"
 
@@ -14291,98 +14485,93 @@ msgstr "_Path:"
 msgid "Mail to %s"
 msgstr "Mail to %s"
 
-#: mail/mail-autofilter.c:260
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subject is %s"
 
-#: mail/mail-autofilter.c:276
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail from %s"
 
-#: mail/mail-autofilter.c:293
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:317
-#, c-format
-msgid "Replies to %s"
-msgstr "Replies to %s"
-
-#: mail/mail-autofilter.c:372
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Add Filter Rule"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d deleted"
 
-#: mail/mail-component.c:495
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d junk"
 
-#: mail/mail-component.c:518
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d drafts"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sent"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d unsent"
 
-#: mail/mail-component.c:526
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:528
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d unread"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "New Mail Message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mail Message"
 
-#: mail/mail-component.c:686
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Compose a new mail message"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "New Mail Folder"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "Mail _Folder"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Create a new mail folder"
 
-#: mail/mail-component.c:872
-msgid "URI of the mail source that the view will display"
-msgstr "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config.c:899
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Checking Service"
 
-#: mail/mail-config.c:977 mail/mail-config.c:981
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Connecting to server..."
 
@@ -15045,11 +15234,64 @@ msgstr "colour"
 msgid "description"
 msgstr "description"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Invalid authentication"
 
-#: mail/mail-errors.xml.in.h:2
+#. 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 ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
+
+#. 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 ""
+"Check to make sure your password is spelled correctly. Remember that many "
+"passwords are case sensitive; your caps lock might be on."
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+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
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email: {0} Send anyway?"
+
+#: 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 "_Send"
+
+#. 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 "Are you sure you want to send a message without a subject?"
+
+#. 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."
@@ -15057,11 +15299,78 @@ msgstr ""
 "Adding a meaningful Subject line to your messages will give your recipients "
 "an idea of what your mail is about."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Are you sure you want to delete this account?"
+#. 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 "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
+#, fuzzy
+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 ""
+"The contact list you are sending to is configured to hide list recipients. "
+"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."
+
+#. 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 ""
+"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."
 
-#: mail/mail-errors.xml.in.h:4
+#. 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 ""
+"This message cannot be sent because you have not specified any Recipients"
+
+#. 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 ""
+"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."
+
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "Use default drafts folder?"
+
+#. 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 ""
+"Unable to open the drafts folder for this account. Use the system drafts "
+"folder instead?"
+
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "Use _Default"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -15069,7 +15378,17 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "If you continue, you will not be able to recover these messages."
+
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "_Expunge"
+
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -15077,373 +15396,366 @@ msgstr ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
 
-#: mail/mail-errors.xml.in.h:6
-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/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "_Empty Wastebasket"
 
-#: mail/mail-errors.xml.in.h:7
-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:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "You have unsent messages, do you wish to quit anyway?"
 
-#: mail/mail-errors.xml.in.h:8
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Are you sure you want to send a message without a subject?"
+#. 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 ""
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
-msgstr "Because \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr "Your message message, with the subject \"{0}\" was not delivered."
 
-#: mail/mail-errors.xml.in.h:10 widgets/misc/e-system-errors.xml.in.h:2
-msgid "Because \"{1}\"."
-msgstr "Because \"{1}\"."
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+#, fuzzy
+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 ""
+"The message was sent via the \"sendmail\" external application. Sendmail "
+"reports the following error: status 67: mail not sent. The message is stored "
+"in the Outbox folder. Check the message for errors and resend."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
-msgstr "Because \"{2}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Error while {0}."
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Cannot add vFolder \"{0}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Cannot copy folder \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Error while performing operation."
 
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
-msgstr "Cannot create folder \"{0}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
 
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
-msgstr "Cannot create temporary save directory."
+#. 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 "{0}"
+
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+msgid "Enter password."
+msgstr "Enter password."
+
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
+msgstr "Error loading filter definitions."
+
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+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
+msgid "Cannot save to file \"{0}\"."
+msgstr "Cannot save to file \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Cannot create the save directory, because \"{1}\""
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+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."
+msgstr "File exists but cannot overwrite it."
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
+msgstr "File exists but is not a regular file."
+
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Cannot delete folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:18
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Cannot delete system folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
+#. mail:no-delete-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."
+msgstr ""
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 
-#: mail/mail-errors.xml.in.h:20
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Cannot rename or move system folder \"{0}\"."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "Delete \"{0}\"?"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+
+#. 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 ""
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
+
+#. 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 "Cannot rename \"{0}\" to \"{1}\"."
+
+#. mail:no-rename-folder-exists 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."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "Because \"{2}\"."
+
+#. mail:no-move-folder-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/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "Cannot open source \"{1}\""
-
-#: mail/mail-errors.xml.in.h:22
+#. mail:no-move-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/mail-errors.xml.in.h:23
+#. mail:no-move-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/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:no-copy-folder-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}\"."
 
-#: mail/mail-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Cannot rename or move system folder \"{0}\"."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "Cannot create folder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:26
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "Cannot open source \"{1}\""
+
+#. mail:account-incomplete 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."
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Cannot save to directory \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
-msgstr "Cannot save to file \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Cannot set signature script \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "Could not save signature file."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "You have not filled in all of the required information."
 
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "Delete \"{0}\"?"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "You may not create two accounts with the same name."
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 msgid "Delete account?"
 msgstr "Delete account?"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "Discard changed?"
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Are you sure you want to delete this account?"
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "Do you wish to save your changes?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "If you proceed, the account information will be deleted permanently."
 
-#: mail/mail-errors.xml.in.h:36
+#: mail/mail-errors.xml.h:169
 msgid "Don't delete"
 msgstr "Don't delete"
 
-#: mail/mail-errors.xml.in.h:37
-msgid "Enter password."
-msgstr "Enter password."
-
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
-msgstr "Error loading filter definitions."
-
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr "Error while performing operation."
-
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
-msgstr "Error while {0}."
-
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
-msgstr "File exists but cannot overwrite it."
-
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
-msgstr "File exists but is not a regular file."
-
-#: mail/mail-errors.xml.in.h:43
-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."
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "Could not save signature file."
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "If you proceed, the account information will be deleted permanently."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "Because \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Cannot set signature script \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Invalid authentication"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr "The script file must exist and be executable."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr "Mail filters automatically updated."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "Discard changed?"
 
-#: mail/mail-errors.xml.in.h:49
-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 ""
-"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."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "Do you wish to save your changes?"
 
-#: mail/mail-errors.xml.in.h:50
-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 ""
-"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."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "This signature has been changed, but has not been saved."
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Discard changes"
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Cannot edit vFolder \"{0}\" as it does not exist."
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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 ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "Cannot add vFolder \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr "vFolders automatically updated."
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
 "been updated."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr "The script file must exist and be executable."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "Mail filters automatically updated."
 
-#: mail/mail-errors.xml.in.h:59
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
 msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
+"have been updated."
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
-"This message cannot be sent because you have not specified any Recipients"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+"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 ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
-msgstr "This signature has been changed, but has not been saved."
-
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "Use _Default"
-
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "Use default drafts folder?"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "You have not filled in all of the required information."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "You have unsent messages, do you wish to quit anyway?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "You may not create two accounts with the same name."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Your login to your server \"{0}\" as \"{0}\" failed."
-
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr "Your message message, with the subject \"{0}\" was not delivered."
-
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Discard changes"
-
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "_Empty Wastebasket"
-
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "_Expunge"
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr "_Overwrite"
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
 msgstr "_Send"
 
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
-msgstr "vFolders automatically updated."
-
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr "{0}"
-
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr "{0}."
-
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr "{1}"
-
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr "{1}."
-
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -15720,26 +16032,26 @@ msgstr "Enter a name for this signature."
 msgid "Name:"
 msgstr "Name:"
 
-#: mail/mail-tools.c:116
+#: mail/mail-tools.c:114
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Could not create spool directory `%s': %s"
 
-#: mail/mail-tools.c:143
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Trying to movemail a non-mbox source `%s'"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Forwarded message - %s"
 
-#: mail/mail-tools.c:280
+#: mail/mail-tools.c:278
 msgid "Forwarded message"
 msgstr "Forwarded message"
 
-#: mail/mail-tools.c:321
+#: mail/mail-tools.c:319
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Invalid folder: `%s'"
@@ -15749,84 +16061,89 @@ msgstr "Invalid folder: `%s'"
 msgid "Setting up vfolder: %s"
 msgstr "Setting up vfolder: %s"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Updating vfolders for uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Updating vfolders for uri: %s"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Edit VFolder"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Unseen"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Seen"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Answered"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Multiple Unseen Messages"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Multiple Messages"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lowest"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lower"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Higher"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Highest"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Today %l:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Yesterday %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3114
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generating message list"
 
@@ -16000,30 +16317,29 @@ msgstr "mail"
 msgid "Brought to you by"
 msgstr "Brought to you by"
 
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Unknown error"
 
-#: shell/e-shell.c:1081
+#: shell/e-shell.c:1101
 msgid "Invalid arguments"
 msgstr "Invalid arguments"
 
-#: shell/e-shell.c:1083
+#: shell/e-shell.c:1103
 msgid "Cannot register on OAF"
 msgstr "Cannot register on OAF"
 
-#: shell/e-shell.c:1085
+#: shell/e-shell.c:1105
 msgid "Configuration Database not found"
 msgstr "Configuration Database not found"
 
-#: shell/e-shell.c:1087
+#: shell/e-shell.c:1107
 msgid "Generic error"
 msgstr "Generic error"
 
@@ -16164,7 +16480,7 @@ msgstr "Unable to execute importer"
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Closing connections..."
 
@@ -16211,51 +16527,58 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' and '..' are reserved folder names."
 
 #: shell/e-shell-window.c:336
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution is currently online.  Click on this button to work offline."
 
 #: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
+#, fuzzy
+msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution is in the process of going offline."
 
 #: shell/e-shell-window.c:349
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution is currently offline.  Click on this button to work online."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail to %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Error executing %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy is not installed."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy could not be run."
 
-#: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
 msgstr "About Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Work Online"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Work Offline"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Work Offline"
 
@@ -16477,13 +16800,13 @@ 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:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16512,56 +16835,48 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Thanks\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Don't tell me again"
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Cannot register the Ximian Evolution shell."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Cannot initialise the Ximian Evolution shell: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution activating the specified component"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Start in offline mode"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Start in online mode"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcibly shut down all evolution components"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcibly re-migrate from Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Send the debugging output of all components to a file."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16570,6 +16885,72 @@ msgstr ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Connecting"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Cannot register the Ximian Evolution shell."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Account Assistant"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17159,7 +17540,8 @@ msgid "_Preview Pane"
 msgstr "_Preview Pane"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Save as VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17862,7 +18244,8 @@ msgid "Open the selected message in a new window"
 msgstr "Open the selected message in a new window"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Open the selected message in the composer to re-send it"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17977,58 +18360,46 @@ msgstr "VFolder on _Subject..."
 msgid "_Attached"
 msgstr "_Attached"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copy to Folder"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Create Filter From Message"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Go To"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Larger"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Message Display"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Move to Folder"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Next Message"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal Display"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Open Message"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Previous Message"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Resend..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Tools"
@@ -18425,6 +18796,11 @@ msgstr "_Quick Reference"
 msgid "_Send / Receive"
 msgstr "_Send / Receive"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "New _Window"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "By _Company"
@@ -18489,10 +18865,6 @@ msgstr "With _Due Date"
 msgid "With _Status"
 msgstr "With _Status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tasks"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18648,26 +19020,26 @@ msgstr "Other..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolution Error"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Evolution Warning"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 msgid "Evolution Information"
 msgstr "Evolution Information"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 msgid "Evolution Query"
 msgstr "Evolution Query"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:430
+#: widgets/misc/e-error.c:410
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18787,29 +19159,25 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Find _Now"
 
-#: widgets/misc/e-system-errors.xml.in.h:1
-msgid "Because \"{1}\""
-msgstr "Because \"{1}\""
-
-#: widgets/misc/e-system-errors.xml.in.h:3
-msgid "Cannot open file \"{0}\"."
-msgstr "Cannot open file \"{0}\"."
-
-#: widgets/misc/e-system-errors.xml.in.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Cannot save file \"{0}\"."
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr "File exists \"{0}\"."
 
-#: widgets/misc/e-system-errors.xml.in.h:5
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Do you wish to overwrite it?"
 
-#: widgets/misc/e-system-errors.xml.in.h:6
-msgid "File exists \"{0}\"."
-msgstr "File exists \"{0}\"."
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
+msgstr "Cannot save file \"{0}\"."
 
-#: widgets/misc/e-system-errors.xml.in.h:8
-msgid "_Overwrite"
-msgstr "_Overwrite"
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
+msgstr "Cannot open file \"{0}\"."
 
 #: widgets/misc/e-task-widget.c:211
 #, c-format
@@ -18821,8 +19189,106 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complete)"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Select destination %s"
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "UID of the contacts source that the view will display"
+
+#~ msgid "The URI that the address book will display"
+#~ msgstr "The URI that the address book will display"
+
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Addressbook folder viewer"
+
+#~ msgid "Address 2:"
+#~ msgstr "Address 2:"
+
+#~ msgid "Blog:"
+#~ msgstr "Blog:"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Could not initialise gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Could not open the folder in '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "The URI that the calendar will display"
+
+#~ msgid "The type of view to show"
+#~ msgstr "The type of view to show"
+
+#~ msgid "Display a message"
+#~ msgstr "Display a message"
+
+#~ msgid "Select source"
+#~ msgstr "Select source"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Calendar file could not be updated!\n"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Calendar viewer"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Tasks viewer"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "The URI of the tasks folder to display"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Could not load the tasks in `%s'"
+
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
+#~ "\""
+#~ msgstr ""
+#~ "The folder name \"%s\" is invalid because it contains the character \"%c\""
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder on Thread"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter on Thread"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Failed to migrate pop3 uid caches: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Failed to migrate folder expand state: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Failed to open store for `%s': %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution Mail folder viewer"
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI of the mail source that the view will display"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Cannot initialise the Ximian Evolution shell: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Resend..."
+
+#~ msgid "Because \"{1}\""
+#~ msgstr "Because \"{1}\""
 
 #~ msgid "calendar"
 #~ msgstr "calendar"
@@ -18918,13 +19384,6 @@ msgstr "%s (%d%% complete)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19226,9 +19685,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "S_pouse:"
 #~ msgstr "S_pouse:"
 
-#~ msgid "_Add"
-#~ msgstr "_Add"
-
 #~ msgid "_Categories..."
 #~ msgstr "_Categories..."
 
@@ -19442,9 +19898,6 @@ msgstr "%s (%d%% complete)"
 #~ msgid "Outgoing"
 #~ msgstr "Outgoing"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "The following connections are currently active:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Search for Contacts"
 
diff --git a/po/es.po b/po/es.po
index 8803535ab7..4377339116 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-10 13:31+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-10 14:11+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"
@@ -125,62 +125,62 @@ msgstr "Grupo de _contactos"
 msgid "Create a new contacts group"
 msgstr "Crea un grupo de contactos nuevo"
 
-#: addressbook/gui/component/addressbook-config.c:463
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: 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:487
+#: 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:515
+#: 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:820
+#: 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:1222
+#: 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:1243
+#: 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:1251
+#: 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:1069
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1110
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 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:438
 #: 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:243
+#: 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:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:923 mail/mail-config.c:78
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Privado"
@@ -241,16 +241,16 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus datos Pilot Sync..."
 
-#: addressbook/gui/component/addressbook-view.c:687
+#: addressbook/gui/component/addressbook-view.c:674
 #, 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:774
+#: addressbook/gui/component/addressbook-view.c:761
 msgid "New Address Book"
 msgstr "Libreta de direcciones nueva"
 
-#: addressbook/gui/component/addressbook-view.c:775
+#: 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
@@ -261,26 +261,17 @@ msgstr "Libreta de direcciones nueva"
 msgid "Delete"
 msgstr "Borrar"
 
-#: addressbook/gui/component/addressbook-view.c:776
+#: addressbook/gui/component/addressbook-view.c:763
 #: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Propiedades..."
 
-#: addressbook/gui/component/addressbook-view.c:1001
-msgid "UID of the contacts source that the view will display"
-msgstr "UID de la fuente de contactos que la vista mostrará"
-
-#: addressbook/gui/component/addressbook-view.c:1006
-msgid "The URI that the address book will display"
-msgstr "La URI que mostrará la libreta de direcciones"
-
 #. 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:1031
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/addressbook-view.c:1002
+#: 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"
@@ -309,50 +300,55 @@ msgstr ""
 "nombres"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletado"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificados"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Configure el autocompletado aquí"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Direcciones emergentes en la libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Visor de direcciones de la libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Visor de tarjetas de la libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Componente de libreta de direcciones de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de carpetas de la libreta de direcciones de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Control de gestión de certificados S/Mime de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Control de configuración de preferencias de carpetas de Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 msgid "Manage your S/MIME certificates here"
 msgstr "Gestione sus certificados S/MIME aquí"
 
@@ -884,9 +880,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:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
@@ -920,7 +916,7 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -928,7 +924,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor de contactos"
 
@@ -949,7 +945,7 @@ msgid "Full _Name..."
 msgstr "_Nombre completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Domicilio"
@@ -994,61 +990,66 @@ msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Otro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Apdo. de correos:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Información personal"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Profession:"
 msgstr "Profesión:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "State/Province:"
 msgstr "Estado/Provincia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: 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:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "Webcam:"
 msgstr "Webcam:"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: 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-im.c:244
-#: filter/filter-label.c:122 mail/em-migrate.c:922 mail/mail-config.c:77
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Trabajo"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "Zip/Postal Code:"
 msgstr "Código postal:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Categories"
 msgstr "_Categorías"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_File under:"
 msgstr "_Archivar en:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Where:"
 msgstr "_Donde:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item7"
 msgstr "item7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "item8"
 msgstr "item8"
 
@@ -1069,13 +1070,13 @@ msgstr ""
 "borrar este contacto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Dirección"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2056,65 +2057,83 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Libro fuente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Libro destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Es un contacto nuevo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Campos editables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Modificados"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "No hay un editor de categorías disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertenece a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2592
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Por favor selecciona entre las siguientes opciones"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Las siguientes conexiones están actualmente activas:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "No se pudo encontrar el widget para el campo: «%s»"
@@ -2366,143 +2385,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Búsqueda avanzada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Listar miembros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "Correo-e"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organización"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Posición"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Videoconferencia"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Teléfono"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "trabajo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Teléfono móvil"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "personal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Puesto"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Correo-e"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Página personal"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Éxito"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Repositorio desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 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:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 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:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Permiso denegado"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contacto no encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 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:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocolo no implementado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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
@@ -2515,37 +2535,37 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "No se pudo cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Falló en la autenticación"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autenticación Requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "No existe ese origen"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Otro error"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: 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."
@@ -2553,7 +2573,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:109
+#: 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."
@@ -2561,7 +2581,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:114
+#: 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 "
@@ -2571,7 +2591,7 @@ msgstr ""
 "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:123
+#: 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."
@@ -2579,11 +2599,11 @@ 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:140
+#: 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:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2596,7 +2616,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:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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"
@@ -2609,55 +2629,55 @@ msgstr ""
 "tiempo en las opciones del servidor de directorios para esta libreta\n"
 " de direcciones."
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 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."
 
-#: addressbook/gui/widgets/eab-gui-util.c:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "El motor para esta libreta de direcciones rehusó a efectuar esta consulta."
 
-#: addressbook/gui/widgets/eab-gui-util.c:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "Esta consulta no se completó con éxito."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: 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:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Error añadiendo lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Error añadiendo contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Error modificando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Error modificando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Error eliminando lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Error eliminando contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2666,7 +2686,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:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2675,49 +2695,49 @@ msgstr ""
 "%s ya existe\n"
 "¿Quiere sobreescribirlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Sobreescribir"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: 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:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "tarjeta.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Mover contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Copiar contacto a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Mover contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Copiar contactos a"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Seleccione la libreta de direcciones destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "VCards múltiples"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -2860,9 +2880,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Guardar como VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2939,7 +2960,7 @@ msgid "Paste"
 msgstr "Pegar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Vista actual"
 
@@ -2955,7 +2976,7 @@ msgstr ""
 "se ha bloqueado. Tendrá que reiniciar Evolution para usarlo de nuevo"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Cualquier categoría"
@@ -3170,17 +3191,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"
 
@@ -3548,24 +3569,24 @@ msgstr "_Editar cita"
 msgid "_Snooze"
 msgstr "_Posponer"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Rechazar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Rechazar todas"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "No hay descripción disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3578,12 +3599,12 @@ msgstr ""
 "Empezando a las %s\n"
 "Terminando a las %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3595,7 +3616,7 @@ msgstr ""
 "configurado para enviar un mensaje de correo-e.  En su lugar\n"
 "Evolution mostrará un diálogo de recordatorio normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3612,7 +3633,7 @@ msgstr ""
 "\n"
 "¿Está seguro que quiere ejecutar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "No me preguntes otra vez sobre este programa."
 
@@ -3620,15 +3641,11 @@ msgstr "No me preguntes otra vez sobre este programa."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servicio de notificación por alarma de la Agenda de Evolution"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "No se pudo inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "No se pudo inicializar gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "No se pudo crear la fábrica del servicio de la alarma de notificación"
 
@@ -3737,33 +3754,37 @@ msgid "Weekday the week starts on"
 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 ""
+
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Indica si debe pedir confirmación al borrar una cita"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Indica si debe pedir confirmación cuando de compacta una carpeta"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Indica si debe ocultar las áreas terminadas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: 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"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: 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"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: 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
@@ -3771,7 +3792,7 @@ msgstr ""
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3781,40 +3802,36 @@ msgstr ""
 "antiguos que el tiempo seleccionado. Si continúa, no podrá recuperar esos "
 "eventos."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Purgar eventos anteriores a"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:431 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 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:434 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1589 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 de %b"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: 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 de %b de %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
@@ -3823,7 +3840,7 @@ msgstr "%d de %B de %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:464 calendar/gui/calendar-component.c:533
+#: 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 de %B"
@@ -3837,16 +3854,21 @@ msgstr "La Agenda «%s» será eliminada. ¿Seguro que quiere continuar?"
 msgid "New Calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:908
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Cargando agenda..."
+
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "no se pudo abrir la agenda «%s» para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:920
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "No hay una agenda disponible para crear eventos y reuniones"
 
-#: calendar/gui/calendar-component.c:954
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3854,56 +3876,56 @@ msgstr ""
 "La agenda selaccionada es de sólo lectura, no pueden crearse eventos. Por "
 "favor, seleccione una agenda de lectura-escritura."
 
-#: calendar/gui/calendar-component.c:1062
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Agendas"
 
-#: calendar/gui/calendar-component.c:1225
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Cita nueva"
 
-#: calendar/gui/calendar-component.c:1226
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Cita"
 
-#: calendar/gui/calendar-component.c:1227
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Crear una cita nueva"
 
-#: calendar/gui/calendar-component.c:1233
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Reunión"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Crear una solicitud de reunión nueva"
 
-#: calendar/gui/calendar-component.c:1241
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Cita para todo el día nueva"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Cita para todo el _día"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Crear una cita nueva para todo el día"
 
-#: calendar/gui/calendar-component.c:1249
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Agenda nueva"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_Agenda"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Crear una agenda nueva"
 
@@ -3953,15 +3975,15 @@ msgstr "La ubicación contiene"
 msgid "Unmatched"
 msgstr "No coincidente"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Error al abrir la agenda"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Método no soportado al abrir la agenda"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado para abrir la agenda"
 
@@ -3970,19 +3992,6 @@ msgstr "Permiso denegado para abrir la agenda"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "No se pudo abrir la carpeta en «%s»"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "La URI que mostrará la agenda"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "El tipo de vista a mostrar"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opciones de los avisos audibles"
@@ -4048,7 +4057,7 @@ msgstr "veces adicionales cada"
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Acción/Disparador"
 
@@ -4067,14 +4076,14 @@ msgstr "Básicos"
 msgid "Date/Time:"
 msgstr "Fecha/Hora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Mostrar un mensaje"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Reproducir un sonido"
 
+#: 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 "Recordatorios"
@@ -4596,8 +4605,8 @@ 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:1037
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Guardar como..."
 
@@ -4759,27 +4768,27 @@ msgstr "Delegar en:"
 msgid "Enter Delegate"
 msgstr "Introducir un delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Repetición"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Planificación"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Reunión"
 
@@ -4875,17 +4884,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/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2110
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:927
-#: mail/mail-account-gui.c:1559 mail/mail-account-gui.c:2039
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4911,8 +4915,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2619 mail/em-folder-view.c:918
+#: 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
 #: 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
@@ -5186,8 +5190,9 @@ msgid "Save Event"
 msgstr "Guardar acontecimiento"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Seleccionar origen"
+#, fuzzy
+msgid "Select destination"
+msgstr "Seleccione destino %s"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5235,7 +5240,7 @@ msgstr "Terminado"
 
 #: 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:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Alta"
 
@@ -5249,14 +5254,14 @@ msgstr "En proceso"
 
 #: 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:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Baja"
 
 #: 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:927
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normal"
 
@@ -5457,12 +5462,12 @@ msgstr "%s a %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para un tipo de disparador desconocido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2331
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Pulse para abrir %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:750
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Sin título"
 
@@ -5566,8 +5571,8 @@ 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:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:893 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -5576,41 +5581,42 @@ 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:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:895 mail/em-popup.c:690 mail/em-popup.c:806
+#: 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
 #: 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:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: 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:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2612 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -5674,67 +5680,67 @@ msgstr "Resumen"
 msgid "Task sort"
 msgstr "Ordenar tareas"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Cit_a nueva..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Acont_ecimiento nuevo para todo el día"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Reunión nueva"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _hoy"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Seleccionar fecha..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar la información de disponibilidad"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Cop_ia al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver al calendario..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Concertar una _reunión..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Reenviar como i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _repetición"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Borrar tod_as las repeticiones"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Ir a _hoy"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Ir a una fecha..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Configuración..."
 
@@ -5752,17 +5758,18 @@ msgstr "Fecha de inicio"
 #: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
+#: 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:1034
+#: 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:1046
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Desconocido"
 
@@ -5812,20 +5819,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"
@@ -5843,34 +5842,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 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:1572 calendar/gui/e-day-view-top-item.c:690
+#: 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 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:1605 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 de %b"
@@ -6016,7 +6008,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
@@ -6229,62 +6221,58 @@ msgstr "El adjunto no contiene un mensaje de agenda válido"
 msgid "The attachment has no viewable calendar items"
 msgstr "El adjunto no tiene elementos de agenda visibles"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "El archivo de agenda no pudo ser actualizado\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Actualización terminada\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "El objeto no pudo encontrarse\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Estado de asistencia actualizado\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "El estado de asistencia no pudo ser actualizado.\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Eliminación terminada"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Elemento enviado.\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "El elemento no pudo ser enviado.\n"
 
@@ -6470,10 +6458,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
@@ -6482,10 +6466,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"
@@ -6545,7 +6525,7 @@ msgstr "Compactando"
 #: calendar/gui/e-tasks.c:960
 #: 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:637 calendar/gui/tasks-control.c:516
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
@@ -6576,37 +6556,37 @@ msgid "Purging"
 msgstr "Compactando"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Agenda y tareas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configure su zona horaria, Agenda y Lista de Tareas aquí"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Agenda y Tareas de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Control de configuración de la agenda de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visor de mensajes de planificación de la agenda de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Visor de la agenda de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor de agenda/tareas de Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Visor de tareas de Evolution"
-
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Componente de Agenda de Evolution"
@@ -6615,6 +6595,16 @@ msgstr "Componente de Agenda de Evolution"
 msgid "Evolution's Tasks component"
 msgstr "Componente de Tareas de Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Agendas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tareas"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6758,6 +6748,23 @@ msgstr "Cumpleaños y aniversarios"
 msgid "On The Web"
 msgstr "En la web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "No se pudo abrir la agenda «%s»."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "No es posible abrir las tareas en «%s»."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -6977,7 +6984,7 @@ msgid "Contacts: "
 msgstr "Contactos: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Vista previa"
 
@@ -7005,24 +7012,29 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarea"
 msgstr[1] "%d tareas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:532
+#: calendar/gui/tasks-component.c:400 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:515
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Cargando tareas"
+
+#: calendar/gui/tasks-component.c:526
 #, 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"
 
-#: calendar/gui/tasks-component.c:527
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "No hay una agenda disponible para crear tareas"
 
-#: calendar/gui/tasks-component.c:565
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -7030,40 +7042,31 @@ 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:793
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Tarea nueva"
 
-#: calendar/gui/tasks-component.c:794
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tarea"
 
-#: calendar/gui/tasks-component.c:795
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Crea una tarea nueva"
 
-#: calendar/gui/tasks-component.c:801
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "Nuevo grupo de tareas"
 
-#: calendar/gui/tasks-component.c:802
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "Grupo de _tareas"
 
-#: calendar/gui/tasks-component.c:803
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Crea una grupo de tareas nuevo"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "La URI que mostrará la carpeta de tareas"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "No se pudo cargar las tareas en «%s»"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7075,11 +7078,11 @@ msgstr ""
 "\n"
 "¿Borrar realmente esas tareas?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "No me preguntes otra vez."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Imprimir tareas"
 
@@ -8728,7 +8731,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr "Descargando mensajes nuevos para modo desconectado"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparando carpeta «%s» para desconexión"
@@ -8852,7 +8855,7 @@ msgstr "Aprendizaje de mensaje(s) de spam/no spam"
 msgid "Filtering new message(s)"
 msgstr "Filtrando mensajes(s) nuevo(s)"
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8861,7 +8864,7 @@ msgstr ""
 "No se pudo analizar la expresión de búsqueda: %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"
@@ -8870,16 +8873,34 @@ msgstr ""
 "Error ejecutando la búsqueda según la expresión: %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 "(coincidir con todas) requiere un único resultado booleano"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(coincidir con todas) requiere un único resultado booleano"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(coincidir con todas) requiere un único resultado booleano"
+
+#: camel/camel-folder-search.c:880
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Realizando búsqueda en cabecera desconocida: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8890,15 +8911,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Falló al analizar el id del usuario gpg."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falló al analizar la solicitud de contraseña gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8907,27 +8928,27 @@ msgstr ""
 "Necesita una contraseña para desbloquear la clave para \n"
 "el usuario: «%s»"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Falló al desbloquear la clave secreta: se dieron 3 contraseñas falsas."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Respuesta inesperada del GNUPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "No se pudo cifrar este mensaje: no hay destinatarios."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8938,61 +8959,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Error con GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "No se pudo generar los datos de la firma: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Error al ejecutar gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Falló al ejecutar gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Esta parte del mensaje está firmada digitalmente"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 ""
 "No se pudo verificar la firma del mensaje: Formato de mensaje incorrecto"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "No se pudo verificar la firma del mensaje: no pude crear un archivo "
 "temporal: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "No se pudo generar los datos de cifrado: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Esta parte del mensaje está cifrada digitalmente"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contenido cifrado"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "No se pudo interpretar el contenido del mensaje"
 
@@ -9295,7 +9316,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:1207
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Respuesta de autenticación errónea desde el servidor."
 
@@ -9491,7 +9512,8 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr "No se puede añadir el atributo SMIMEEncKeyPrefs"
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+#, fuzzy
+msgid "Cannot add encryption certificate"
 msgstr "No se puede añadir el certificado de cifrado"
 
 #: camel/camel-smime-context.c:360
@@ -9506,7 +9528,7 @@ msgstr "No se pudo crear un contexto de codificación"
 msgid "Failed to add data to CMS encoder"
 msgstr "Falló al añadir datos al codificador CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Falló al codificar datos"
 
@@ -9566,91 +9588,93 @@ msgstr "No se pudieron calcular los digests"
 msgid "Cannot set message digests"
 msgstr "No se pueden obtener los digests del mensaje"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Falló en la importación del certificado"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Mensaje sólo de certificado, no se pueden verificar los certificados"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensaje sólo de certificado, certificados importados y verificados"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "No se pueden encontrar los digests de la firma"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Firmante: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "La decodificación ha fallado"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "No se pudo encontrar un certificado para «%s»"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "No se puede encontrar un algoritmo de encriptación común."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "No se puede reservar un slot para la clave de encriptación"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "No se puede crear un mensaje CMS"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "No se puede crear CMS EnvelopedData"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "No se puede adjuntar CMS EvelopedData"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "No se puede adjuntar el objeto de datos CMS"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "No se puede crear CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "No se puede añadir CMS RecipientInfo"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "No se pudo crear un contexto codificación"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Falló al añadir datos al codificador"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "El decodificador ha fallado, error %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Desencriptación S/MIME: No se ha encontrado contenido encriptado"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "importación de claves: no implementado"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "exportación de claves: no implementado"
 
@@ -9667,16 +9691,26 @@ msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "No se pudo crear la carpeta: %s: la carpeta existe"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, 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:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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:811
 msgid "Trash"
 msgstr "Papelera"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
@@ -9900,12 +9934,12 @@ msgstr "No se pudo analizar la URL «%s»"
 msgid "Error storing `%s': %s"
 msgstr "Error guardando «%s»: %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "No existe el mensaje %s en %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 
@@ -9914,11 +9948,6 @@ msgstr "No se pudo copiar o mover mensajes a una Carpeta Virtual"
 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:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "No se pudo renombrar la carpeta: %s: Operación no válida"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10126,21 +10155,21 @@ msgstr ""
 "texto plano."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, 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:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: 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/pop3/camel-pop3-store.c:175
@@ -10151,15 +10180,15 @@ 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:548
+#: 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:563
-#: camel/providers/imap/camel-imap-store.c:810
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10177,8 +10206,8 @@ msgstr ""
 "STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:644
-#: camel/providers/imap/camel-imap-store.c:675
+#: 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 "Falló al conectar al servidor IMAP %s en modo seguro: %s"
@@ -10187,7 +10216,7 @@ 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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 msgid "Unknown error"
 msgstr "Error desconocido"
 
@@ -10215,11 +10244,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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
 #, c-format
 msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
-"El nombre de la carpeta «%s» es inválido porque contiene el carácter «%c»"
+"El nombre de la carpeta «%s» es inválido porque contiene elcarácter «%c»"
 
 #: camel/providers/imap4/camel-imap4-store.c:826
 #, c-format
@@ -10246,33 +10277,33 @@ msgstr "No se pudo borrar la carpeta: «%s»: Nombre de buzón inválido"
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "No se pudo borrar la carpeta «%s»: Comando erróneo"
 
-#: camel/providers/imap4/camel-imap4-store.c:1032
+#: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 "No se pudo obtener la información %s para el patrón «%s» en el servidor IMAP "
 "%s:%s"
 
-#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-store.c:1039
 msgid "Bad command"
 msgstr "Comando erróneo"
 
-#: camel/providers/imap4/camel-imap4-store.c:1095
+#: camel/providers/imap4/camel-imap4-store.c:1100
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "No pudo suscribirse a la carpeta «%s»: Nombre de buzón inválido"
 
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-store.c:1105
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "No pudo suscribirse a la carpeta «%s»: Comando erróneo"
 
-#: camel/providers/imap4/camel-imap4-store.c:1144
+#: camel/providers/imap4/camel-imap4-store.c:1149
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "No pudo desuscribirse de la carpeta «%s»: Nombre de buzón inválido"
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-store.c:1154
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "No pudo desuscribirse de la carpeta «%s»: Comando erróneo"
@@ -10294,12 +10325,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:3129
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3132
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "El servidor se desconectó inesperadamente: %s"
@@ -10348,21 +10379,21 @@ msgstr "No se pudo crear el directorio %s: %s"
 msgid "Could not load summary for %s"
 msgstr "No se pudo cargar el resumen de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "La carpeta fue destruida y recreada en el servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Buscando mensajes modificados"
 
-#: camel/providers/imap/camel-imap-folder.c:1961
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "No se pudo descargar el mensaje: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: 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
@@ -10378,25 +10409,25 @@ msgstr ""
 "No se pudo obtener el mensaje; %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: 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
 msgid "No such message"
 msgstr "No existe ese mensaje"
 
-#: camel/providers/imap/camel-imap-folder.c:2040
-#: camel/providers/imap/camel-imap-folder.c:2642
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Este mensaje no está disponible actualmente"
 
-#: camel/providers/imap/camel-imap-folder.c:2306
-#: camel/providers/imap/camel-imap-folder.c:2376
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Obteniendo información de los nuevos mensajes"
 
-#: camel/providers/imap/camel-imap-folder.c:2680
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "No se pudo encontrar el cuerpo del mensaje en la respuesta de FETCH."
 
@@ -10456,43 +10487,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:645
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:676
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:813
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1237
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1247
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1284
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "No introdujo una contraseña."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10503,26 +10534,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1800
-#: camel/providers/imap/camel-imap-store.c:1990
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "No existe la carpeta %s"
 
-#: camel/providers/imap/camel-imap-store.c:1818
-#: camel/providers/imap/camel-imap-store.c:2196
-#, 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»"
-
-#: camel/providers/imap/camel-imap-store.c:1876
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1931
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10530,7 +10553,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:2207
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Carpeta padre desconocida: %s"
@@ -10639,58 +10662,58 @@ msgstr ""
 "También puede ser usado para leer un árbol del estilo de carpetas de Elm, "
 "Pine o Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "El almacén raíz %s no es una ruta absoluta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "El almacén raíz %s no es un directorio regular"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "No se pudo acceder a la carpeta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Los almacenes locales no tienen una bandeja de entrada"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Archivo de correo local %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "No se pudo cambiar el nombre de la carpeta %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "No se pudo renombrar: «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "No se pudo borrar el resumen la carpeta «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "No se pudo borrar el índice de la carpeta «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10757,7 +10780,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11089,7 +11112,7 @@ 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:258
+#: 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
@@ -11098,8 +11121,8 @@ msgid "User cancelled"
 msgstr "El usuario canceló"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11108,48 +11131,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Error interno: uid en formato inválido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "No puede copiar mensajes desde una carpeta NNTP."
 
@@ -11329,8 +11352,8 @@ msgstr "No hay mensajes con uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Obteniendo mensaje POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1223
-#: composer/e-msg-composer.c:1244
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Razón desconocida"
 
@@ -11777,7 +11800,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "adjunto"
 
@@ -11821,62 +11844,66 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerir mostrar adjuntos automáticamente"
 
-#: composer/e-msg-composer.c:703
+#: composer/e-msg-composer.c:704
 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"
+msgstr ""
+"No se puede firmar el mensaje saliente: No hay establecido un certificado de "
+"firma para esta cuenta"
 
-#: composer/e-msg-composer.c:709
+#: composer/e-msg-composer.c:711
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "No se puede cifrar el mensaje saliente: no hay establecido un certificado de cifrado para esta cuenta"
+msgstr ""
+"No se puede cifrar el mensaje saliente: no hay establecido un certificado de "
+"cifrado para esta cuenta"
 
-#: composer/e-msg-composer.c:1281
+#: composer/e-msg-composer.c:1283
 msgid "Could not open file"
 msgstr "No se pudo abrir el archivo"
 
-#: composer/e-msg-composer.c:1289
+#: composer/e-msg-composer.c:1291
 msgid "Unable to retrieve message from editor"
 msgstr "No se pudo obtener el mensaje del editor"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1561
 msgid "Untitled Message"
 msgstr "Mensaje sin título"
 
-#: composer/e-msg-composer.c:1589
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Abrir archivo"
 
-#: composer/e-msg-composer.c:1996 mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
 msgid "Autogenerated"
 msgstr "Auto-generado"
 
-#: composer/e-msg-composer.c:2095
+#: composer/e-msg-composer.c:2097
 msgid "Signature:"
 msgstr "Firma:"
 
-#: composer/e-msg-composer.c:2296
+#: composer/e-msg-composer.c:2298
 #, c-format
 msgid "<b>%d</b> File Attached"
 msgid_plural "<b>%d</b> Files Attached"
 msgstr[0] "<b>%d</b> archivo adjunto"
 msgstr[1] ""
 
-#: composer/e-msg-composer.c:2325
+#: composer/e-msg-composer.c:2327
 msgid "Hide _Attachment Bar (drop attachments here)"
 msgstr "Ocultar barra de _adjuntos (soltar adjuntos aquí)"
 
-#: composer/e-msg-composer.c:2328 composer/e-msg-composer.c:3232
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
 msgid "Show _Attachment Bar (drop attachments here)"
 msgstr "Mostrar barra de _adjuntos (soltar adjuntos aquí)"
 
-#: composer/e-msg-composer.c:2345 composer/e-msg-composer.c:3111
-#: composer/e-msg-composer.c:3112
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
 msgid "Compose a message"
 msgstr "Redactar un mensaje"
 
-#: composer/e-msg-composer.c:3145
+#: composer/e-msg-composer.c:3147
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate address selector control."
@@ -11884,7 +11911,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudo activar el control de selección de direcciones."
 
-#: composer/e-msg-composer.c:3173
+#: composer/e-msg-composer.c:3175
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11896,7 +11923,7 @@ msgstr ""
 "Asegúrese de que tiene la versión \n"
 "correcta de gtkhtml y libgtkthml instalada.\n"
 
-#: composer/e-msg-composer.c:3277
+#: composer/e-msg-composer.c:3279
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11904,7 +11931,7 @@ msgstr ""
 "No se pudo crear una ventana de composición:\n"
 "No se pudo activar el componente del editor HTML."
 
-#: composer/e-msg-composer.c:4282
+#: composer/e-msg-composer.c:4284
 msgid ""
 "<b>(The composer contains a non-text message body, which cannot be edited.)"
 "<b>"
@@ -11991,114 +12018,133 @@ msgstr "Pulse aquí para seleccionar las carpetas en las que publicar"
 msgid "Attach file(s)"
 msgstr "Adjuntar archivo(s)"
 
-#: composer/mail-composer-errors.xml.in.h:1
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+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.in.h:2
-msgid "All accounts have been removed."
-msgstr "Todas las cuentas han sido eliminadas."
+#. 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."
+
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Los directorios no pueden ser adjuntados a los mensajes."
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
+"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 ""
-"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
+"Para adjuntar el contenido de este directorio, o adjunte individualmente "
+"cada archivo, o cree un archivo comprimido del directorio y adjúntelo."
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-"Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
+msgstr "Se encontraron mensajes no terminados"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr "Debido a «${1}»"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr "¿Quiere recuperar los mensajes no terminados?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Al cerrar esta ventana de redacción, se descartará el mensaje "
-"permanentemente, a no ser que elija guardar el mensaje en la carpeta "
-"«Borradores». Esto le permitirá continuar el mensaje más tarde."
+"Evolution terminó inesperadamente mientras estaba redactando un mensaje "
+"nuevo. La recuperación del mensaje le permitirá continuar donde lo dejó."
 
-#: composer/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr "No se pudo crear un mensaje."
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
+msgstr "No recuperar"
 
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr "No se pudo leer el archivo de firma «{0}."
+#: composer/mail-composer-errors.xml.h:18
+msgid "Recover"
+msgstr "Recuperar"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "No se pudo autoguardar el archivo «{0}»"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr "Los directorios no pueden ser adjuntados a los mensajes."
-
-#: composer/mail-composer-errors.xml.in.h:11
-msgid "Discard Changes"
-msgstr "Descartar cambios"
-
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr "¿Quiere recuperar los mensajes no terminados?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr "No recuperar"
-
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "Error al autoguardar debido a «{1}»."
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Aviso: Mensaje modificado"
+
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
 msgstr ""
-"Evolution terminó inesperadamente mientras estaba redactando un mensaje "
-"nuevo. La recuperación del mensaje le permitirá continuar donde lo dejó."
+"¿Seguro que quiere descartar el mensaje titulado '{0}' que está redactando?"
 
-#: composer/mail-composer-errors.xml.in.h:16
-msgid "Recover"
-msgstr "Recuperar"
+#. 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 ""
+"Al cerrar esta ventana de redacción, se descartará el mensaje "
+"permanentemente, a no ser que elija guardar el mensaje en la carpeta "
+"«Borradores». Esto le permitirá continuar el mensaje más tarde."
+
+#: composer/mail-composer-errors.xml.h:29
+msgid "Discard Changes"
+msgstr "Descartar cambios"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 msgid "Save Message"
 msgstr "Guardar mensaje"
 
-#: composer/mail-composer-errors.xml.in.h:18
-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:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
+msgstr "No se pudo crear un mensaje."
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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 ""
-"Para adjuntar el contenido de este directorio, o adjunte individualmente "
-"cada archivo, o cree un archivo comprimido del directorio y adjúntelo."
+"Debido a «${0}», quizá necesite seleccionar diferentes opciones de correo."
 
-#: composer/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
-msgstr "Se encontraron mensajes no terminados"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr "No se pudo leer el archivo de firma «{0}."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Aviso: Mensaje modificado"
+#. 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.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "No puede adjuntar el archivo «{0}» a este mensaje."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr "Todas las cuentas han sido eliminadas."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Necesita configurar una cuenta antes de poder escribir correo."
 
@@ -12231,7 +12277,8 @@ msgstr ""
 "Ya existe una archivo con ese nombre.\n"
 "¿Quiere sobreescribirlo?"
 
-#: e-util/e-dialog-utils.c:251 widgets/misc/e-system-errors.xml.in.h:7
+#. 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 "¿Sobreescribir archivo?"
 
@@ -12253,16 +12300,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"
@@ -12314,31 +12357,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"
@@ -12419,72 +12454,92 @@ msgstr "Selecciones una hora con la que comparar"
 msgid "_Filter Rules"
 msgstr "Reglas para los _filtros"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "Error en la expresión regular «{0}»."
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "No se puede compilar la expresión regular «{1}»."
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "El archivo «{0}» no existe o no es un archivo regular."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Falta la fecha."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Debe elegir una fecha."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Falta el nombre de archivo."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-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."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "El archivo «{0}» no existe o no es un archivo regular."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Falta la carpeta."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Falta el nombre."
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "El nombre «{0}» ya se está usando."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Debe especificar una carpeta."
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "No se ha seleccionado ningún origen."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "Error en la expresión regular «{0}»."
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Elija otro nombre."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "No se puede compilar la expresión regular «{1}»."
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Debe elegir una fecha."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Falta el nombre."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Debes dar un nombre a este filtro."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "Debe dar un nombre a esta carpeta virtual."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Debe especificar un nombre de archivo."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "El nombre «{0}» ya se está usando."
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Debe especificar una carpeta."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Elija otro nombre."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "No se ha seleccionado ningún origen."
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+#, fuzzy
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
-msgstr "Debe especificar al menos una carpeta como origen. Hágalo seleccionando las carpetas individualmente, y/o seleccionando todas las carpetas locales, todas las carpetas remotas, o ambas."
+"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 ""
+"Debe especificar al menos una carpeta como origen. Hágalo seleccionando las "
+"carpetas individualmente, y/o seleccionando todas las carpetas locales, "
+"todas las carpetas remotas, o ambas."
 
 #: filter/filter-file.c:288
 msgid "Choose a file"
@@ -12495,7 +12550,7 @@ msgstr "Elija un archivo"
 msgid "<b>Then</b>"
 msgstr "<b>Entonces</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
 #: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Seleccionar carpeta"
@@ -12588,19 +12643,19 @@ 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:921
+#: 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
 msgid "Important"
 msgstr "Importante"
 
 #. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:924 mail/mail-config.c:79
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
 #: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Tareas pendientes"
 
 #. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:925 mail/mail-config.c:80
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
 #: mail/mail-config.glade.h:94
 msgid "Later"
 msgstr "Más tarde"
@@ -12609,31 +12664,51 @@ msgstr "Más tarde"
 msgid "Test"
 msgstr "Prueba"
 
-#: filter/filter-rule.c:746
+#: filter/filter-rule.c:790
 msgid "Rule name:"
 msgstr "Nombre de la regla:"
 
-#: filter/filter-rule.c:773
+#: filter/filter-rule.c:817
 msgid "<b>If</b>"
 msgstr "<b>Si</b>"
 
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Ejecutar acciones"
-
-#: filter/filter-rule.c:808
+#: filter/filter-rule.c:854
 msgid "if all criteria are met"
 msgstr "si se cumplen todos los criterios"
 
-#: filter/filter-rule.c:813
+#: filter/filter-rule.c:854
 msgid "if any criteria are met"
 msgstr "si se cumple algún criterio"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Ejecutar acciones"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegado"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Destinatarios"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Responde a %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Incluye:"
+
+#: filter/filter-rule.c:974
 msgid "incoming"
 msgstr "entrante"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:974
 msgid "outgoing"
 msgstr "saliente"
 
@@ -12766,7 +12841,7 @@ msgstr "no está marcado"
 msgid "Junk Test"
 msgstr "Test de correo Spam"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:926
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiquetar"
@@ -12872,8 +12947,8 @@ msgstr "comienza por"
 msgid "Stop Processing"
 msgstr "Parar el proceso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: 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"
@@ -12935,7 +13010,11 @@ msgstr "El asunto no contiene"
 msgid "Virtual _Folders"
 msgstr "Carpetas _virtuales"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Añadir"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Origen de la carpeta virtual"
 
@@ -12953,7 +13032,7 @@ msgid "Protocol"
 msgstr "Protocolo"
 
 #: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1061
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Sin nombre"
 
@@ -12969,17 +13048,17 @@ msgstr "Añadir firma"
 msgid "Signature(s)"
 msgstr "Firma(s)"
 
-#: mail/em-composer-utils.c:883
+#: mail/em-composer-utils.c:888
 msgid "-------- Forwarded Message --------"
 msgstr "--------- Mensaje reenviado --------"
 
-#: mail/em-composer-utils.c:1494
+#: mail/em-composer-utils.c:1499
 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:1504
+#: mail/em-composer-utils.c:1509
 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ó:"
 
@@ -13017,94 +13096,119 @@ 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:2344
-#: mail/mail-component.c:732
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifique donde crear la carpeta:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nombre de la carpeta:"
 
-#: mail/em-folder-tree.c:937
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Moviendo carpeta %s"
 
-#: mail/em-folder-tree.c:939
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copiando carpeta %s"
 
-#: mail/em-folder-tree.c:946
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Moviendo mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:948
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando mensajes a la carpeta %s"
 
-#: mail/em-folder-tree.c:964
+#: mail/em-folder-tree.c:866
 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:2118 mail/em-folder-tree.c:2131
-#: mail/em-folder-view.c:797 mail/em-folder-view.c:811
+#: mail/em-folder-tree.c:956 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
+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:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Mover"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancelar tarea"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar carpeta"
 
-#: mail/em-folder-tree.c:2158
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copiar"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando carpeta «%s»"
 
-#: mail/em-folder-tree.c:2344 mail/mail-component.c:732
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Crear carpeta"
 
-#: mail/em-folder-tree.c:2536
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renombrar la carpeta «%s» a:"
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Renombrar carpeta"
 
-#: mail/em-folder-tree.c:2607 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Abrir en una ventana _nueva"
 
-#: mail/em-folder-tree.c:2613
-msgid "_Move"
-msgstr "_Mover"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "Carpeta _nueva..."
 
-#: mail/em-folder-tree.c:2620
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Renombrar"
 
-#: mail/em-folder-tree.c:2623 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "Carpetas virtuales"
 
@@ -13122,303 +13226,305 @@ msgstr "Bandeja de entrada"
 msgid "Loading..."
 msgstr "Cargando..."
 
-#: mail/em-folder-view.c:413 mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: 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:540
-#: mail/mail-component.c:583
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 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:894 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como un mensaje nuevo..."
 
-#: mail/em-folder-view.c:896
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Im_primir"
 
-#: mail/em-folder-view.c:899 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Responder al _remitente"
 
-#: mail/em-folder-view.c:900 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a la _lista"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:813
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Reen_viar"
 
-#: mail/em-folder-view.c:905
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Se_guimiento..."
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Ma_rcar como terminado"
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Quitar marca"
 
-#: mail/em-folder-view.c:910 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 "Mar_car como leído"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Marcar como _no leído"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marcar como _importante"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Marcar como no im_portante"
 
-#: mail/em-folder-view.c:914 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 "Marcar como _Spam"
 
-#: mail/em-folder-view.c:915 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 "Marcar como _no spam"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:922
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver a la carpeta..."
 
-#: mail/em-folder-view.c:923 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a la carpeta..."
 
-#: mail/em-folder-view.c:931
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Añadir remitente a la li_breta de direcciones"
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltrar spam"
 
-#: mail/em-folder-view.c:938
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Crear re_gla desde el mensaje"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Carpeta virtual según el a_sunto"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Carpeta virtual según el re_mitente"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Carpeta virtual según los des_tinatarios"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Carpeta virtual según la li_sta de correo"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtro según el _asunto"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtro según el _remitente"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtro según los _destinatarios"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtro según la lista de _correo"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1717 mail/em-folder-view.c:1757
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Predeterminado"
 
-#: mail/em-folder-view.c:1807
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Imprimir mensaje"
 
-#: mail/em-folder-view.c:2072
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copiar dirección del enlace"
 
-#: mail/em-folder-view.c:2326
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Pulse para enviar correo a %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:84 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 "De"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:85
+#: 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 "Responder a"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:86 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 "Para"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:87
+#: 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:746 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:88
+#: 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 "Cco"
 
-#: mail/em-format.c:748 mail/em-format-html.c:1577 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+#: 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:749 mail/em-format-html.c:1598 mail/em-mailer-prefs.c:91
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grupos de noticias"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "%s adjunto"
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "No se pudo interpretar el mensaje S/MIME: Error desconocido"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifrado no soportado para multipart/encrypted"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "No se pudo analizar el mensaje MIME. Mostrando la fuente."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Formato de firma no soportado"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Error al verificar la firma"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Error desconocido al verificar la firma"
 
-#: mail/em-format-html.c:453 mail/em-format-html.c:455
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Obteniendo «%s»"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "No firmado"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Firma válida"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:648
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Firma no válida"
 
-#: mail/em-format-html.c:563 mail/em-format-html-display.c:649
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Firma válida, no se puede verificar el remitente"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Descifrado"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Cifrado, débil"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:658
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Cifrado, fuerte"
 
-#: mail/em-format-html.c:834
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte externa al cuerpo del mensaje mal escrita."
 
-#: mail/em-format-html.c:864
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/em-format-html.c:875
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntero a archivo local (%s) valido en «%s»"
 
-#: mail/em-format-html.c:877
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntero a archivo local (%s)"
 
-#: mail/em-format-html.c:898
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntero a sitio FTP (%s)"
 
-#: mail/em-format-html.c:909
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntero a datos externos desconocidos (tipo «%s»)"
 
-#: mail/em-format-html.c:1151
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formateando el mensaje"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:935
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Transporte"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13428,7 +13534,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Coincide con: %d"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13436,7 +13542,7 @@ msgstr ""
 "Este mensaje no está firmado. No hay garantía de que el mensaje sea "
 "auténtico."
 
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13444,7 +13550,7 @@ msgstr ""
 "Este mensaje está firmado y es válido, lo que significa que es muy probable "
 "que el mensaje sea auténtico."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13452,7 +13558,11 @@ msgstr ""
 "La firma de este mensaje no puede ser verificada, pudo haber sido alterada "
 "en tránsito."
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr "Firma válida, no se puede verificar el remitente"
+
+#: 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."
@@ -13460,7 +13570,7 @@ msgstr ""
 "Este mensaje está firmado con una firma válida, pero el remitente del "
 "mensaje no pudo ser verificado."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13468,7 +13578,7 @@ msgstr ""
 "Este mensaje no está cifrado. Su contenido puede ser visto en tránsito a "
 "través de Internet."
 
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13478,7 +13588,7 @@ msgstr ""
 "ser difícil, pero no imposible para un espía ver el contenido de este "
 "mensaje empleando algo de tiempo."
 
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13486,7 +13596,7 @@ msgstr ""
 "Este mensaje está cifrado. Sería difícil para un espía ver el contenido de "
 "este mensaje."
 
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13496,60 +13606,60 @@ msgstr ""
 "difícil que un espía vea el contenido de este mensaje en empleando un tiempo "
 "razonable."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Certificado no es visible"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminado el %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Atrasado:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "antes del %d de %B de %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Ver incluido"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Ocultar"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrado)"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Cada vez"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Una vez por día"
 
-#: mail/em-mailer-prefs.c:104
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Una vez por semana"
 
-#: mail/em-mailer-prefs.c:105
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Una vez por mes"
 
-#: mail/em-migrate.c:1077
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13561,25 +13671,55 @@ msgstr ""
 "\n"
 "Tenga paciencia mientras Evolution migra sus carpetas..."
 
-#: mail/em-migrate.c:1932 mail/em-migrate.c:1947
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Falló  al migrar las cachés de identificación de usuario pop3 : %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "No se pudo crear la carpeta: «%s»: %s"
 
-#: mail/em-migrate.c:2035 mail/em-migrate.c:2136
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Falló  al migrar el estado de expansión de la carpeta : %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"No se pudo copiar el descriptor de archivo:  %s\n"
+"%s"
 
-#: mail/em-migrate.c:2337 mail/em-migrate.c:2511
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "No se pudo guardar el archivo de lista de grupo para %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "No se pudo autenticarme en el servidor POP %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Fallo al crear directorio  «%s»: %s"
 
-#: mail/em-migrate.c:2349
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Fallo al abrir almacén para «%s»: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Fallo al crear directorio  «%s»: %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"No se pudo crear el archivo de salida: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13615,49 +13755,49 @@ msgstr "_Añadir a la libreta de direcciones"
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Este almacén no soporta suscripciones, o no están activadas."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Suscrito"
 
-#: mail/em-subscribe-editor.c:637 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 "Carpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "No se ha seleccionado ningún servidor"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "No mostrar otra vez este mensaje."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "mensaje"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Guardar mensaje..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Añadir dirección"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:989
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Correos de %s"
@@ -13822,7 +13962,8 @@ msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista de tipos mime de comprobación de visores de componentes bonobo"
 
 #: mail/evolution-mail.schemas.in.in.h:36
-msgid "List of protocol names whose license has been accepted"
+#, fuzzy
+msgid "List of protocol names whose license has been accepted."
 msgstr "Lista de nombres de protocolos cuya licencia ha sido aceptada"
 
 #: mail/evolution-mail.schemas.in.in.h:37
@@ -14138,48 +14279,48 @@ msgid "spamd port"
 msgstr "puerto spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Preferencias del editor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure las preferencias de correo incluyendo seguridad y visualización de "
 "mensajes, aquí"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Configure la ortografía, firmas y el editor de mensajes aquí"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configure sus cuentas de correo aquí"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Control de configuración de cuentas de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Redactor de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Control de configuración del redactor de correo de Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Componente del visor de carpetas de correo de Evolution"
-
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Control de preferencias de Evolution"
@@ -14192,6 +14333,10 @@ msgstr "Cuentas de correo"
 msgid "Mail Preferences"
 msgstr "Opciones de correo"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "Co_rreo"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está importando su correo antiguo de Elm"
@@ -14443,74 +14588,74 @@ msgstr "lista de correo %s"
 msgid "Add Filter Rule"
 msgstr "Añadir regla de filtrado"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d borrados"
 
-#: mail/mail-component.c:495
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d spam"
 
-#: mail/mail-component.c:518
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d borradores"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d enviar"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d sin enviar"
 
-#: mail/mail-component.c:526
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d en total"
 
-#: mail/mail-component.c:528
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d no leídos"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Mensaje de correo nuevo"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mensaje de correo"
 
-#: mail/mail-component.c:686
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Redacta un mensaje de correo nuevo"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nueva carpeta de correo"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Carpeta de correo"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Crea una carpeta de correo nueva"
 
-#: mail/mail-component.c:872
-msgid "URI of the mail source that the view will display"
-msgstr "URI de la fuente de correo que la vista mostrará"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config.c:911
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Comprobando el servicio"
 
-#: mail/mail-config.c:989 mail/mail-config.c:993
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Conectando al servidor..."
 
@@ -15176,395 +15321,532 @@ msgstr " "
 msgid "description"
 msgstr "descripción"
 
-#: mail/mail-errors.xml.in.h:1
-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."
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr "Añadir una línea de Asunto con significado al mensaje dará a sus destinatarios una idea de qué trata su correo."
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "¿Seguro que quiere borrar esta cuenta?"
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Autenticación inválida"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
-"¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
-"la carpeta «{0}»?"
+"Este servidor no soporta este  tipo de autenticación requerido y quizá no "
+"soporte ningún tipo de autenticación."
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
+#, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"¿Seguro que quiere eliminar todos los mensajes borrados en todas las "
-"carpetas?"
+"Verifique que su contraseña está escrita corractamente. Recuerde que muchas "
+"contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
+"puede estar activada."
 
-#: mail/mail-errors.xml.in.h:6
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "¿Seguro que quiere enviar un mensaje en formato HTML?"
 
-#: mail/mail-errors.xml.in.h:7
-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?"
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Por favor, asegúrese de que los siguientes destinatarios desean y son "
+"capaces de recibirmensajes formateados en HTML: ¿{0} Enviar de todas formas?"
 
-#: mail/mail-errors.xml.in.h:8
+#: 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 "_Enviar"
+
+#. 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 "¿Seguro que quiere enviar un mensaje sin un asunto?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
-msgstr "Porque «{0}»"
-
-#: mail/mail-errors.xml.in.h:10 widgets/misc/e-system-errors.xml.in.h:2
-msgid "Because \"{1}\"."
-msgstr "Porque «{1}»"
-
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
-msgstr "Porque «{2}»"
-
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "No se puede añadir la carpeta virtual «{0}»."
-
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "No se pudo copiar la carpeta: «{0}» a «{1}»."
-
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
-msgstr "No se pudo crear la carpeta: «{0}»."
-
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
-msgstr "No se pudo crear el directorio de guardado temporal."
+#. 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 ""
+"Añadir una línea de Asunto con significado al mensaje dará a sus "
+"destinatarios una idea de qué trata su correo."
 
-#: mail/mail-errors.xml.in.h:16
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
+#. 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 "¿Seguro que quiere enviar un mensaje con sólo destinatarios Cco?"
 
-#: mail/mail-errors.xml.in.h:17
-msgid "Cannot delete folder \"{0}\"."
-msgstr "No se puede borrar la carpeta «{0}»."
+#. mail:ask-send-only-bcc-contact secondary
+#: mail/mail-errors.xml.h:24
+#, fuzzy
+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 ""
+"La lista de contactos que está enviando está configurada para ocultar los "
+"destinatarios de la lista. 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/mail-errors.xml.in.h:18
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "No se pudo borrar la carpeta de sistema «{0}»."
+#. 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 ""
+"Muchos sistemas de correo-e añaden una cabecera «Apparentely-To» a los "
+"mensajes que sólo tienen destinatarios Cco. Esta cabecera, si se añade, "
+"listará todos los destinatarios de su mensaje de todas formas. Para evitar "
+"esto debería añadir al menos un destinatario «Para:» o «CC:»."
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "No se puede editar la carpeta virtual «{0}» porque no existe."
+#. 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"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "No se puede mover la carpeta «{0}» a «{1}»."
+#. 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 ""
+"Por favor, introduzca una dirección de correo válida en el campo «Para:» "
+"Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de "
+"la caja de entrada."
 
-#: mail/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "No se pudo abrir el origen «{1}»"
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "¿Quiere usar la carpeta de borradores predeterminada?"
 
-#: mail/mail-errors.xml.in.h:22
-msgid "Cannot open source \"{2}\"."
-msgstr "No se pudo abrir el origen «{2}»"
+#. 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 ""
+"No se pudo abrir la carpeta de borradores para esta cuenta. ¿Quiere usar la "
+"carpeta de borradores del sistema?"
 
-#: mail/mail-errors.xml.in.h:23
-msgid "Cannot open target \"{2}\"."
-msgstr "No se pudo abrir el destino «{2}»."
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "Usar _predeterminado"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "No se puede renombrar «{0}» a «{1}»."
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
+"¿Seguro que quiere eliminar permanentemente todos los mensajes borrados en "
+"la carpeta «{0}»?"
 
-#: mail/mail-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "No se pudo renombrar o mover la carpeta de sistema «{0}»."
+#. 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 "Si continua, no podrá recuperar estos mensajes."
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
-msgstr "No se puede guardar los cambios en la cuenta."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "C_ompactar"
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
-msgstr "No se pudo guardar al directorio «{0}»."
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"¿Seguro que quiere eliminar todos los mensajes borrados en todas las "
+"carpetas?"
 
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
-msgstr "No se pudo guardar al archivo «{0}»."
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "_Vaciar papelera"
 
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
-msgstr "No se puede establacer el script de firma «{0}»."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
-"Verifique que su contraseña está escrita corractamente. Recuerde que muchas "
-"contraseñas distinguen las mayúsculas, su tecla de bloqueo de mayúsculas "
-"puede estar activada."
+"Si sale, estos mensajes no serán enviados hasta que Evoluion sea iniciado de "
+"nuevo."
 
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "No se pudo guardar el archivo de firma."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr "Su mensaje, con el asunto «{0}» no fue entregado."
 
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "¿Borrar «{0}»?"
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
+#, fuzzy
+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 ""
+"El mensaje fue enviado por medio de la aplicación externa «sendmail». "
+"Sendmail informa el siguiente error: status 67: mail not sent. El mensaje "
+"está almacenado en la carpeta de Salida. Compruebe si el mensaje tiene "
+"errores y reenvíe."
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Error mientras «{0}»."
 
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
-msgstr "¿Borrar la cuenta?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "¿Descartar los cambios?"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Error al efectuar operación."
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "¿Desea guardar los cambios?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "No borrar"
+#. 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 "{0}"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 msgid "Enter password."
 msgstr "Introduzca la contraseña."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 msgid "Error loading filter definitions."
 msgstr "Error al cargar las definiciones de filtros."
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr "Error al efectuar operación."
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
+msgstr "No se pudo guardar al directorio «{0}»."
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
-msgstr "Error mientras «{0}»."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr "{1}"
 
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
-msgstr "El archivo existe pero no se puede sobreescribir."
+#. 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 "No se pudo guardar al archivo «{0}»."
 
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
-msgstr "El archivo existe pero no es un archivo regular."
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "No se pudo crear el directorio de guardado, debido a «{1}»"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr "Si continua, no podrá recuperar estos mensajes."
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
+msgstr "No se pudo crear el directorio de guardado temporal."
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
-"Si borra la carpeta, todo su contenido y el de sus subcarpetas será borrado "
-"permanentemente."
+#. 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 "Porque «{1}»"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
+msgstr "El archivo existe pero no se puede sobreescribir."
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"Si sale, estos mensajes no serán enviados hasta que Evoluion sea iniciado de "
-"nuevo."
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
+msgstr "El archivo existe pero no es un archivo regular."
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Autenticación inválida"
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+msgid "Cannot delete folder \"{0}\"."
+msgstr "No se puede borrar la carpeta «{0}»."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr "Filtros de correo actualizados automáticamente."
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "No se pudo borrar la carpeta de sistema «{0}»."
 
-#: mail/mail-errors.xml.in.h:49
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 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."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
-"Muchos sistemas de correo-e añaden una cabecera «Apparentely-To» a los "
-"mensajes que sólo tienen destinatarios Cco. Esta cabecera, si se añade, "
-"listará todos los destinatarios de su mensaje de todas formas. Para evitar "
-"esto debería añadir al menos un destinatario «Para:» o «CC:»."
+"Ximian Evolution requiere las carpetas de sistema para funcionar "
+"correctamente y no pueden ser renombradas, movidas o borradas."
 
-#: mail/mail-errors.xml.in.h:50
-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 ""
-"Por favor, introduzca una dirección de correo válida en el campo «Para:» "
-"Puede buscar direcciones de correo pulsando en el botón «Para:» al lado de "
-"la caja de entrada."
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "No se pudo renombrar o mover la carpeta de sistema «{0}»."
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Por favor, asegúrese de que los siguientes destinatarios desean y son "
-"capaces de recibirmensajes formateados en HTML: ¿{0} Enviar de todas formas?"
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "¿Borrar «{0}»?"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "¿Seguro que quiere borrar la carpeta «{0}» y todas sus subcarpetas?"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
-"Ximian Evolution requiere las carpetas de sistema para funcionar "
-"correctamente y no pueden ser renombradas, movidas o borradas."
-
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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 "La lista de contactos que está enviando está configurada para ocultar los destinatarios de la lista. 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:"
+"Si borra la carpeta, todo su contenido y el de sus subcarpetas será borrado "
+"permanentemente."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-"La(s) siguiente(s) reglas de filtros: {0} usaban la carpeta eliminada:{1}»Y "
-"han sido actualizadas."
+#. 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 "No se puede renombrar «{0}» a «{1}»."
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-rename-folder-exists 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 ""
-"La(s) siguiente(s) carpeta(s) virtual(es): {0} Usaban la carpeta borrada: "
-"«{1}» y han sido actualizadas."
-
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr "El mensaje fue enviado por medio de la aplicación externa «sendmail». Sendmail informa el siguiente error: status 67: mail not sent. El mensaje está almacenado en la carpeta de Salida. Compruebe si el mensaje tiene errores y reenvíe."
+"Ya existe una carpeta llamada «{1}». Por favor, use un nombre diferente."
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr "El archivo de script debe extistir y ser ejecutable."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "Porque «{2}»"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr "Esta carpeta puede haber sido añadida implícitamente, vaya al editor de carpetas virtuales para añadirla explícitamente, si lo desea."
+#. mail:no-move-folder-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/mail-errors.xml.in.h:60
-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:no-move-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/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"Este servidor no soporta este  tipo de autenticación requerido y quizá no "
-"soporte ningún tipo de autenticación."
+#. mail:no-move-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/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
-msgstr "Esta firma ha cambiado, pero no ha sido guardada."
+#. mail:no-copy-folder-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}»."
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"No se pudo abrir la carpeta de borradores para esta cuenta. ¿Quiere usar la "
-"carpeta de borradores del sistema?"
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "No se pudo crear la carpeta: «{0}»."
 
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "Usar _predeterminado"
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "No se pudo abrir el origen «{1}»"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "¿Quiere usar la carpeta de borradores predeterminada?"
+#. mail:account-incomplete 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."
 
-#: mail/mail-errors.xml.in.h:66
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
 msgid "You have not filled in all of the required information."
 msgstr "No ha rellenado toda la información requerida."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Tiene mensajes no enviados, ¿quiere salir de todas formas?"
-
-#: mail/mail-errors.xml.in.h:68
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
 msgid "You may not create two accounts with the same name."
 msgstr "No puede crear dos cuentas con el mismo nombre."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Su inicio de sesión en su servidor «{0}» como «{0}» falló."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
+msgstr "¿Borrar la cuenta?"
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr "Su mensaje, con el asunto «{0}» no fue entregado."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "¿Seguro que quiere borrar esta cuenta?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "Si continúa, la información de la cuenta se borrará permanentemente."
+
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "No borrar"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "No se pudo guardar el archivo de firma."
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "Porque «{0}»"
+
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
+msgstr "No se puede establacer el script de firma «{0}»."
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr "El archivo de script debe extistir y ser ejecutable."
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "¿Descartar los cambios?"
 
-#: mail/mail-errors.xml.in.h:71
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "¿Desea guardar los cambios?"
+
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "Esta firma ha cambiado, pero no ha sido guardada."
+
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr "_Descartar los cambios"
 
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "_Vaciar papelera"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "No se puede editar la carpeta virtual «{0}» porque no existe."
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "C_ompactar"
+#. 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."
+msgstr ""
+"Esta carpeta puede haber sido añadida implícitamente, vaya al editor de "
+"carpetas virtuales para añadirla explícitamente, si lo desea."
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
-msgstr "_Enviar"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "No se puede añadir la carpeta virtual «{0}»."
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr "Carpetas virtuales automáticamente actualizadas."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+#, fuzzy
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"La(s) siguiente(s) carpeta(s) virtual(es): {0} Usaban la carpeta borrada: "
+"«{1}» y han sido actualizadas."
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "Filtros de correo actualizados automáticamente."
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"La(s) siguiente(s) reglas de filtros: {0} usaban la carpeta eliminada:{1}»Y "
+"han sido actualizadas."
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr "{1}."
+#. 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-errors.xml.h:216
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr "_Sobreescribir"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Haciendo ping a %s"
@@ -15841,26 +16123,26 @@ msgstr "Introduzca un nombre para esta firma."
 msgid "Name:"
 msgstr "Nombre:"
 
-#: mail/mail-tools.c:116
+#: mail/mail-tools.c:114
 #, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "No se pudo crear el directorio spool «%s»: %s"
 
-#: mail/mail-tools.c:143
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr "Intentando mover correo desde un origen que no es un buzón «%s»"
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Mensaje reenviado - %s"
 
-#: mail/mail-tools.c:280
+#: mail/mail-tools.c:278
 msgid "Forwarded message"
 msgstr "Mensaje reenviado"
 
-#: mail/mail-tools.c:321
+#: mail/mail-tools.c:319
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Carpeta inválida: «%s»"
@@ -15870,84 +16152,89 @@ msgstr "Carpeta inválida: «%s»"
 msgid "Setting up vfolder: %s"
 msgstr "Configurando carpeta virtual: %s"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Actualizando carpetas virtuales para la URI: %s"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Actualizando carpetas virtuales para la URI: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Carpetas virtuales"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Editar carpeta virtual"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nueva carpeta virtual"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Sin leer"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Contestado"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples mensajes sin leer"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Múltiples mensajes"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "La más baja"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Más baja"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Más alta"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "La más alta"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Hoy %l:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Ayer %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3124
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generando la lista de mensajes"
 
@@ -16121,31 +16408,29 @@ msgstr "correo"
 msgid "Brought to you by"
 msgstr "Producido por"
 
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Atención: Evolution no pudo actualizar todos sus datos de la versión %d.%d.%"
-"d.\n"
-"Los datos no se han borrado, pero no se verán con esta versión de "
-"Evolution.\n"
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d de %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Error desconocido"
 
-#: shell/e-shell.c:1081
+#: shell/e-shell.c:1101
 msgid "Invalid arguments"
 msgstr "Argumentos inválidos"
 
-#: shell/e-shell.c:1083
+#: shell/e-shell.c:1103
 msgid "Cannot register on OAF"
 msgstr "No se pudo registrar en OAF"
 
-#: shell/e-shell.c:1085
+#: shell/e-shell.c:1105
 msgid "Configuration Database not found"
 msgstr "No se encontró la base de datos de configuración"
 
-#: shell/e-shell.c:1087
+#: shell/e-shell.c:1107
 msgid "Generic error"
 msgstr "Error genérico"
 
@@ -16285,7 +16570,7 @@ msgstr "Imposible ejecutar importador"
 msgid "_Import"
 msgstr "_Importar"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Cerrando conexiones..."
 
@@ -16333,54 +16618,61 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' y '..' son nombres reservados de carpetas."
 
 #: shell/e-shell-window.c:336
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
 msgstr ""
 "Ximian Evolution está conectado.  Pulse este botón para trabajar "
 "desconectado."
 
 #: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
+#, fuzzy
+msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution está en proceso de desconectarse."
 
 #: shell/e-shell-window.c:349
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
 msgstr ""
 "Ximian Evolution está desconectado.  Pulse este botón para trabajar "
 "conectado."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Enviar a %s"
+
+#: shell/e-shell-window-commands.c:64
 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."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Error ejecutando %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug Buddy no está instalado."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "No se ha podido ejecutar bug Buddy."
 
-#: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
 msgstr "Acerca de Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Trabajar conectado"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Trabajar desconectado"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Trabajar desconectado"
 
@@ -16602,13 +16894,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution puede importar datos de los siguiente s archivos:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16639,56 +16931,48 @@ msgstr ""
 "\n"
 "esperamos que disfrute de nuestro duro trabajo y esperamos su contribución.\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Gracias\n"
 "El equipo de Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "No preguntarme más veces"
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "No se pudo registrar la shell de Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar Evolution activando el componente especificado"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Iniciar en modo desconectado"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Iniciar en modo conectado"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forzar el cierre de todos los componentes de Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Fuerza la re-emigración desde Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Envía la salida de depurado de todos los componente a un archivo."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16697,6 +16981,72 @@ msgstr ""
 "%s: --online y --offline no pueden usarse a la vez.\n"
 "  use %s --help para más información\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "No se pudo registrar la shell de Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Asistente de cuentas de Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17287,7 +17637,8 @@ msgid "_Preview Pane"
 msgstr "Panel de vista _previa"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "G_uardar como vCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17993,7 +18344,8 @@ msgid "Open the selected message in a new window"
 msgstr "Abre el mensaje seleccionado en una nueva ventana"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Abre el mensaje seleccionado para reenviarlo"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18108,58 +18460,46 @@ msgstr "Carpeta virtual según el a_sunto..."
 msgid "_Attached"
 msgstr "_Adjunto"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copiar a la carpeta"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Crear un filtro según el _mensaje"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Ir a"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Incluido en línea"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Ma_yor"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Mostrar mensaje"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Mover a la carpeta"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Mensaje _siguiente"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Vista _normal"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Abrir mensaje"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Mensaje a_nterior"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citado"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Reexpedir..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Herramientas"
@@ -18556,6 +18896,11 @@ msgstr "_Referencia rápida"
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Ventana nueva"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _compañía"
@@ -18620,10 +18965,6 @@ msgstr "Con fecha de _vencimiento"
 msgid "With _Status"
 msgstr "Con _estado"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tareas"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18779,26 +19120,26 @@ msgstr "Otro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 msgid "Evolution Error"
 msgstr "Error de Evolution"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Advertencia de Evolution"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 msgid "Evolution Information"
 msgstr "Información de Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 msgid "Evolution Query"
 msgstr "Consulta de Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:430
+#: widgets/misc/e-error.c:410
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -18919,29 +19260,25 @@ msgstr "Texto"
 msgid "Find _Now"
 msgstr "Buscar _ahora"
 
-#: widgets/misc/e-system-errors.xml.in.h:1
-msgid "Because \"{1}\""
-msgstr "Porque «{1}»"
-
-#: widgets/misc/e-system-errors.xml.in.h:3
-msgid "Cannot open file \"{0}\"."
-msgstr "No se pudo abrir el archivo «{0}»."
-
-#: widgets/misc/e-system-errors.xml.in.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "No se pudo guardar el archivo {0}."
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr "El archivo existe «{0}»."
 
-#: widgets/misc/e-system-errors.xml.in.h:5
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "¿Quiere sobreescribirlo?"
 
-#: widgets/misc/e-system-errors.xml.in.h:6
-msgid "File exists \"{0}\"."
-msgstr "El archivo existe «{0}»."
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
+msgstr "No se pudo guardar el archivo {0}."
 
-#: widgets/misc/e-system-errors.xml.in.h:8
-msgid "_Overwrite"
-msgstr "_Sobreescribir"
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
+msgstr "No se pudo abrir el archivo «{0}»."
 
 #: widgets/misc/e-task-widget.c:211
 #, c-format
@@ -18953,6 +19290,89 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completado)"
 
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "UID de la fuente de contactos que la vista mostrará"
+
+#~ msgid "The URI that the address book will display"
+#~ msgstr "La URI que mostrará la libreta de direcciones"
+
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Visor de carpetas de la libreta de direcciones de Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "No se pudo inicializar gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "No se pudo abrir la carpeta en «%s»"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "La URI que mostrará la agenda"
+
+#~ msgid "The type of view to show"
+#~ msgstr "El tipo de vista a mostrar"
+
+#~ msgid "Display a message"
+#~ msgstr "Mostrar un mensaje"
+
+#~ msgid "Select source"
+#~ msgstr "Seleccionar origen"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "El archivo de agenda no pudo ser actualizado\n"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Visor de la agenda de Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Visor de tareas de Evolution"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "La URI que mostrará la carpeta de tareas"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "No se pudo cargar las tareas en «%s»"
+
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
+#~ "\""
+#~ msgstr ""
+#~ "El nombre de la carpeta «%s» es inválido porque contiene el carácter «%c»"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Falló  al migrar las cachés de identificación de usuario pop3 : %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Falló  al migrar el estado de expansión de la carpeta : %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Fallo al abrir almacén para «%s»: %s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Componente del visor de carpetas de correo de Evolution"
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI de la fuente de correo que la vista mostrará"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Atención: Evolution no pudo actualizar todos sus datos de la versión %d.%"
+#~ "d.%d.\n"
+#~ "Los datos no se han borrado, pero no se verán con esta versión de "
+#~ "Evolution.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "No se pudo inicializar la shell de Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Reexpedir..."
+
+#~ msgid "Because \"{1}\""
+#~ msgstr "Porque «{1}»"
+
 #~ msgid "Address 2:"
 #~ msgstr "Dirección 2:"
 
@@ -18971,9 +19391,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "S3kr3t 0pt10n."
 #~ msgstr "S3kr3t 0pt10n."
 
-#~ msgid "Replies to %s"
-#~ msgstr "Responde a %s"
-
 #~ msgid "Alerts"
 #~ msgstr "Avisos"
 
@@ -18983,9 +19400,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "_General"
 #~ msgstr "_General"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Seleccione destino %s"
-
 #~ msgid "calendar"
 #~ msgstr "agenda"
 
@@ -19182,13 +19596,6 @@ msgstr "%s (%d%% completado)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "No se pudo copiar el descriptor de archivo:  %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19376,9 +19783,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Cónyuge:"
 
-#~ msgid "_Add"
-#~ msgstr "_Añadir"
-
 #~ msgid "_Categories..."
 #~ msgstr "_Categorías..."
 
@@ -19604,9 +20008,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "[script]"
 #~ msgstr "[script]"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Las siguientes conexiones están actualmente activas:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Bu_scar contactos"
 
@@ -21662,9 +22063,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Asia"
 #~ msgstr "Asia"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22712,9 +23110,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22778,9 +23173,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25763,9 +26155,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -29651,9 +30040,6 @@ msgstr "%s (%d%% completado)"
 #~ msgid "Delete news feed"
 #~ msgstr "Borrar proveedor de noticias"
 
-#~ msgid "_Mail"
-#~ msgstr "Co_rreo"
-
 #~ msgid "De_lete"
 #~ msgstr "_Borrar"
 
diff --git a/po/et.po b/po/et.po
index 3ef7d92dc0..c18e3ce74b 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-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-10 08:41+0300\n"
 "Last-Translator: Priit Laes <amd@tt.ee>\n"
 "Language-Team: Estonian <gnome-et@linux.ee>\n"
@@ -117,44 +117,46 @@ msgstr "_Kontaktide grupp"
 msgid "Create a new contacts group"
 msgstr "Uue kontaktide grupi loomine"
 
-#: addressbook/gui/component/addressbook-config.c:463
+#: addressbook/gui/component/addressbook-component.c:182
+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:487
+#: 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:515
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:820
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1222
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1243
+#: 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:1251
+#: 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:1069
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Siirdamine..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184
-#: mail/em-migrate.c:1110
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirdamine `%s':"
@@ -168,13 +170,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:438
-#: 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:243
+#: 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"
 
@@ -185,16 +184,10 @@ 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:446
-#: 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:923
-#: mail/mail-config.c:78
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: 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
 msgid "Personal"
 msgstr "Isiklik"
@@ -215,11 +208,13 @@ msgstr "Automaatlõpetamise sätted"
 
 #: addressbook/gui/component/addressbook-migrate.c:1076
 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..."
 
@@ -250,46 +245,31 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook-view.c:687
+#: addressbook/gui/component/addressbook-view.c:674
 #, 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:774
+#: addressbook/gui/component/addressbook-view.c:761
 msgid "New Address Book"
 msgstr "Uus aadressiraamat"
 
-#: addressbook/gui/component/addressbook-view.c:775
+#: 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
+#: 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
+#: 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:776
-#: calendar/gui/calendar-component.c:431
-#: calendar/gui/tasks-component.c:367
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
 msgid "Properties..."
 msgstr "Omadused..."
 
-#: addressbook/gui/component/addressbook-view.c:1001
-#, fuzzy
-msgid "UID of the contacts source that the view will display"
-msgstr "URI, mida kalender näitab"
-
-#: addressbook/gui/component/addressbook-view.c:1006
-#, fuzzy
-msgid "The URI that the address book will display"
-msgstr "URI, mida kaustalehitseja näitab"
-
 #  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);
@@ -302,9 +282,8 @@ msgstr "URI, mida kaustalehitseja näitab"
 #. 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:1031
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: addressbook/gui/component/addressbook-view.c:1002
+#: 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"
@@ -319,61 +298,76 @@ 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"
 msgstr ""
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Automaatne lõpetamine"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#  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
+#  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/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontaktid"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Sertifikaadid"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Seadista automaatlõpetamist siit"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Evolution'i aadressiraamat"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolutioni aadressiraamatu aadressikuva"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolutioni aadressiraamatu kaardikuva"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Evolutioni aadressiraamatu komponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolutioni aadressiraamatu aadressikuva"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 #, fuzzy
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Evolution'i sõnumikausta kuvamise komponent."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: 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
@@ -396,10 +390,8 @@ 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:2
-#: 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:2
+#: 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 "*"
@@ -468,8 +460,7 @@ msgstr "Lisa kontaktide grupp"
 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:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Alati"
@@ -488,8 +479,7 @@ 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
+#: 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"
@@ -520,8 +510,10 @@ 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"
+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
 msgid "Find Possible Search Bases"
@@ -530,13 +522,11 @@ msgstr "Leia võimalikud otsingubaasid"
 #: addressbook/gui/component/ldap-config.glade.h:31
 #: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: 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:84 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:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Mitte kunagi"
@@ -572,32 +562,42 @@ msgstr "Otsin"
 
 #: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
-"Selecting this option means that Evolution will only connect to your LDAP server if\n"
+"Selecting this option means that Evolution will only connect to your LDAP "
+"server if\n"
 "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
 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"
+"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"
+"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
 #, 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"
+"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 ""
-"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."
 
@@ -616,40 +616,56 @@ msgstr "Toetatud otsingubaasid"
 
 #: addressbook/gui/component/ldap-config.glade.h:52
 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 \n"
+"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
 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 \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"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:58
-msgid "This is the full name of your ldap server. For example, \"ldap.mycompany.com\"."
+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
 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 \n"
 "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."
+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
 msgid ""
-"This is the name for this server that will appear in your Evolution folder list.\n"
+"This is the name for this server that will appear in your Evolution folder "
+"list.\n"
 "It is for display purposes only. "
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
-"This is the port on the LDAP server that Evolution will try to connect to. A \n"
+"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 ""
@@ -677,8 +693,7 @@ msgstr "Eraldusnime (DN) kasutamine"
 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:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kui võimalik"
@@ -705,8 +720,7 @@ 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:170
+#: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nimi:"
 
@@ -753,8 +767,7 @@ msgstr "üldine-sakk"
 
 #: addressbook/gui/component/ldap-config.glade.h:89
 #: 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:22 filter/filter.glade.h:17
 #: mail/mail-config.glade.h:182
 msgid "minutes"
 msgstr "minutit"
@@ -880,9 +893,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:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
@@ -916,7 +929,7 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -924,7 +937,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktiredaktor"
 
@@ -945,7 +958,7 @@ msgid "Full _Name..."
 msgstr "T_äisnimi..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Kodu"
@@ -992,65 +1005,68 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Muu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Sidejaoskonna postkast:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Isiklik info"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Profession:"
 msgstr "Amet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "State/Province:"
 msgstr "Maakond/Provints:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: 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:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "Webcam:"
 msgstr "Veebikaamera:"
 
 #  red
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: 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-im.c:244
-#: filter/filter-label.c:122
-#: mail/em-migrate.c:922
-#: mail/mail-config.c:77
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Töö"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "Zip/Postal Code:"
 msgstr "Postiindeks:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Categories"
 msgstr "_Kategooriad"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_File under:"
 msgstr "_Salvesta kui:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Where:"
 msgstr "_Kus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item7"
 msgstr "element7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "item8"
 msgstr "element8"
 
@@ -1071,13 +1087,13 @@ msgstr ""
 "kustutada seda kontakti?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Aadress"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2058,65 +2074,82 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Lähteraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Sihtraamat"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Tegemist on uue kontaktiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Muudetavad väljad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Muudetud"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Kategooriaredaktor pole saadaval."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Antud kontakt kuulub järgnevatesse kategooriatesse:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2592
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Kustuta valitud kontaktid"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 "Ei leidnud vidinat väljale: `%s'"
@@ -2369,95 +2402,96 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Laiendatud otsing"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(kaart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "kaart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Nimekirja liikmed"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisatsioon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Ametikoht"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Videokonverents"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "töö"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "isiklik"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Märkus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Ametinimetus"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Kodulehekülg"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Õnnestus"
 
@@ -2465,23 +2499,23 @@ msgstr "Õnnestus"
 #  E_BOOK_ERROR_BUSY
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 #, fuzzy
 msgid "Backend busy"
 msgstr "Kataloog on töös"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Hoidla offlain"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "Aadressiraamatut ei eksisteeri"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 #, fuzzy
 msgid "No Self Contact defined"
 msgstr "Ühtegi valikut pole määratud"
@@ -2489,37 +2523,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:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Juurdepääs keelatud"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Kontakti ei leitud"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "Kontakti ID on juba olemas"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Mitte toetatud protokoll"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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:626
-#: 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"
@@ -2527,59 +2557,77 @@ msgstr "Katkestatud"
 
 #  E_BOOK_ERROR_COULD_NOT_CANCEL
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 #, fuzzy
 msgid "Could not cancel"
 msgstr "Kuulamist ei õnnestunud peatada"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Autentimine ebaõnnestus."
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autentimine on vajalik"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 #, fuzzy
 msgid "No such source"
 msgstr "%s: sellist partitsiooni ei ole\n"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Muu viga"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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: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:109
-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: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:114
-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: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:123
-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: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:140
+#: 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:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2587,7 +2635,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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"
@@ -2595,53 +2643,53 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "See päring ei lõpetanud edukalt."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: 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:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Unusta"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Viga listi lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Viga kontakti lisamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Viga listi muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Viga kontakti muutmisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Viga listi eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Viga kontakti eemaldamisel"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2650,7 +2698,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:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2659,49 +2707,49 @@ msgstr ""
 "%s on juba olemas\n"
 "Kas soovid üle kirjutada?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Kirjuta üle"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: 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:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "kaart.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "nimekiri"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Liiguta kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Kopeeri kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Liiguta kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Kopeeri kontaktid"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Vali sihtaadressiraamat."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "Mitu VKaarti"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VKaart %s kohta"
@@ -2756,9 +2804,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"
 
@@ -2775,12 +2828,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-minicard-view.c:467
 #: addressbook/gui/widgets/e-minicard-view-widget.c:112
-#, c-format
 msgid "Query"
 msgstr "Päring"
 
@@ -2835,9 +2893,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Salvesta VKaardina"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2877,14 +2936,10 @@ msgstr "Edasta kontakt"
 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: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
 msgid "Print"
 msgstr "Trüki"
 
@@ -2901,28 +2956,24 @@ 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
+#: 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
+#: 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
 #: 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
+#: 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:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Käesolev vaade"
 
@@ -2935,7 +2986,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Suvaline kategooria"
@@ -3155,18 +3206,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 ""
 
@@ -3418,7 +3469,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
@@ -3426,7 +3478,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
@@ -3471,8 +3524,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:37 calendar/gui/e-pub-utils.c:301
 #: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Sisesta parool"
@@ -3536,24 +3588,24 @@ msgstr "_Muuda kokkusaamist"
 msgid "_Snooze"
 msgstr "_Lükka edasi"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Ava"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Tühista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Tühista kõik"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Kirjeldus puudub."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3562,12 +3614,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Hoiatus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3579,10 +3631,11 @@ msgstr ""
 "meili teel.  Evolution kuvab selle asemel hariliku\n"
 "meeldetuletusdialoogi."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: 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"
@@ -3595,7 +3648,7 @@ msgstr ""
 "\n"
 "Oled sa kindel, et soovid seda programmi käivitada?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ära selle programmi kohta enam küsi."
 
@@ -3604,15 +3657,11 @@ msgstr "Ära selle programmi kohta enam küsi."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Alarmi teenus"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ei saa laadida Bonobot"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Ei saa gnome-vfs initsialiseerida"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3728,31 +3777,34 @@ msgid "Weekday the week starts on"
 msgstr "Nädalapäev, millal nädal algab"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Kas küsida nõusolekut kohtumiste kustutamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Kas küsida nõusolekut kausta puhastamisel"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Kas peita lõpetatud ülesanded"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Kas näidata kellaaega 24 tunni formaadis või kasutada am/pm formaati."
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 
-#: calendar/gui/calendar-commands.c:116
-#: calendar/gui/calendar-component.c:552
+#: 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
@@ -3760,72 +3812,59 @@ msgstr "Kas kuvada nädalate numbreid kuupäevasirvijas"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "on väiksem kui"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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:19 filter/filter.glade.h:15
 msgid "days"
 msgstr "päeva"
 
-#: calendar/gui/calendar-commands.c:431
-#: 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:434
-#: calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1589
-#: 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:436
-#: calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
-#: 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:460
-#: calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472
-#: calendar/gui/calendar-commands.c:474
-#: 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:464
-#: 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"
 
@@ -3838,69 +3877,76 @@ msgstr "Kalender '%s' kustutatakse. Oled sa kindel, et soovid jätkata?"
 msgid "New Calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:908
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Kalendri laadimine..."
+
+#: 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:920
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:954
-msgid "Selected calendar is read-only, events cannot be created. Please select a read-write calendar."
+#: 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:1062
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Kalendrid"
 
-#: calendar/gui/calendar-component.c:1225
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Uus kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1226
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1227
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Lisab uue kokkusaamise"
 
-#: calendar/gui/calendar-component.c:1233
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/calendar-component.c:1234
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "K_oosolek"
 
-#: calendar/gui/calendar-component.c:1235
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Loo uus koosoleku kutse"
 
-#: calendar/gui/calendar-component.c:1241
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Uus, kogu päeva hõlmav kohtumine"
 
-#: calendar/gui/calendar-component.c:1242
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Kogu _päeva hõlmav kokkusaamine"
 
-#: calendar/gui/calendar-component.c:1243
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Lisab uue, kogu päeva hõlmava kokkusaamise"
 
-#: calendar/gui/calendar-component.c:1249
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Uus kalender"
 
-#: calendar/gui/calendar-component.c:1250
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_Kalender"
 
-#: calendar/gui/calendar-component.c:1251
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Loo uus kalender"
 
@@ -3946,21 +3992,20 @@ msgstr "Kommentaar sisaldab"
 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:366 camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr "Puudub"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Viga xbase faili avamisel."
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr " Sul ei ole õigusi avada Piloti seadet."
@@ -3970,19 +4015,6 @@ msgstr " Sul ei ole õigusi avada Piloti seadet."
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Ei saa avada kausta '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, mida kalender näitab"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Vaate tüüp näitamiseks"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Helialarmi häälestus"
@@ -4037,8 +4069,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:47
 msgid "dialog1"
 msgstr "dialog1"
 
@@ -4047,12 +4078,11 @@ 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:20 filter/filter.glade.h:16
 msgid "hours"
 msgstr "tundi"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Tegevus/Päästik"
 
@@ -4071,35 +4101,30 @@ 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:448
-msgid "Display a message"
-msgstr "Näita teadet"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5
-#: 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
+msgid "Pop up an alert"
+msgstr ""
+
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 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:927
-#: calendar/gui/e-itip-control.glade.h:11
+#: calendar/gui/e-itip-control.c:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Kokkuvõte:"
 
@@ -4159,7 +4184,9 @@ msgstr ""
 
 #: calendar/gui/dialogs/calendar-setup.c:278
 #, 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
@@ -4178,8 +4205,7 @@ msgstr "_Värv:"
 msgid "Calendar Properties"
 msgstr "Kalendri atribuudid"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:7
-#: mail/mail-config.glade.h:107
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
 msgid "Pick a color"
 msgstr "Vali värvus"
 
@@ -4219,8 +4245,7 @@ msgstr "_Tüüp:"
 msgid "_URL:"
 msgstr "_URL:"
 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23
-#: filter/filter.glade.h:23
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
 msgid "weeks"
 msgstr "nädalat"
 
@@ -4230,10 +4255,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"
 
@@ -4247,24 +4270,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"
@@ -4459,17 +4476,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:160
-#: 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:160 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"
@@ -4515,24 +4527,36 @@ 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?"
+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?"
+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?"
+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?"
@@ -4553,7 +4577,8 @@ msgstr "Antud päeviku sissekanne on kustutatud."
 #: calendar/gui/dialogs/changed-comp.c:75
 #, 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
 #, c-format
@@ -4575,7 +4600,9 @@ msgstr "Antud päeviku sissekannet on muudetud."
 #: calendar/gui/dialogs/changed-comp.c:99
 #, 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
 #, c-format
@@ -4615,9 +4642,8 @@ 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:1037
-#: composer/e-msg-composer.c:1191
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvesta kui..."
 
@@ -4636,28 +4662,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 "
 
@@ -4701,10 +4722,27 @@ 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
+#, 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] "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
+msgstr[1] "Kas sa tõesti soovid kustutada kokkusaamist '%s'?"
+
 #: 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] "Kas sa tõesti soovid kustutada ülesannet '%s'?"
+msgstr[1] "Kas sa tõesti soovid kustutada ülesannet '%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] "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
+msgstr[1] "Kas sa tõesti soovid kustutada päeviku sissekannet '%s'?"
+
 #: calendar/gui/dialogs/delete-error.c:52
-#, c-format
 msgid "The event could not be deleted due to a corba error"
 msgstr "Seda sündmust ei saa tänu corba veale kustutada"
 
@@ -4764,29 +4802,27 @@ msgstr "Delegeerida:"
 msgid "Enter Delegate"
 msgstr "Sisesta Delegaat"
 
-#: calendar/gui/dialogs/event-editor.c:200
-#: calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Kokkusaamine"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Meeldetuletaja"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Kordumine"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Planeering"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441
-#: 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 "Koosolek"
 
@@ -4798,8 +4834,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"
 
@@ -4883,25 +4918,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:618
-#: composer/e-msg-composer.c:2110
-#: mail/em-account-prefs.c:427
-#: mail/em-folder-view.c:911
-#: mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:2039
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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"
 
@@ -4924,18 +4949,12 @@ 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:1312
-#: calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2614
-#: mail/em-folder-view.c:902
-#: 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:1310 calendar/gui/e-calendar-view.c:1342
+#: mail/em-folder-tree.c:2557 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"
 
@@ -4976,8 +4995,7 @@ msgid "Member"
 msgstr "Liige"
 
 #: 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:1054 calendar/gui/e-meeting-list-view.c:263
 #: calendar/gui/e-meeting-time-sel.etspec.h:8
 msgid "RSVP"
 msgstr "RSVP"
@@ -4985,8 +5003,7 @@ 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
+#: calendar/gui/e-meeting-time-sel.etspec.h:10 filter/libfilter-i18n.h:62
 #: mail/message-list.etspec.h:12
 msgid "Status"
 msgstr "Olek"
@@ -5054,7 +5071,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
@@ -5204,11 +5222,10 @@ msgstr "_Loobu muudatustest"
 msgid "Save Event"
 msgstr "Salvesta sündmus"
 
-#  create the dialog
-#  create the dialog
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Vali lähte "
+#, fuzzy
+msgid "Select destination"
+msgstr "Vali tegevus"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5245,53 +5262,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:624
-#: 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:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 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:622
-#: calendar/gui/e-cal-model-tasks.c:697
+#: 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:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 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:875
-#: mail/message-list.c:927
+#: calendar/gui/e-calendar-table.c:375 calendar/gui/e-cal-model.c:909
+#: mail/message-list.c:957
 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:620
-#: 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"
 
@@ -5341,10 +5348,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: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:982 calendar/gui/e-itip-control.glade.h:6
+#: composer/e-msg-composer-attachment.glade.h:3 mail/mail-config.glade.h:69
 msgid "Description:"
 msgstr "Kirjeldus:"
 
@@ -5412,12 +5417,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"
 
@@ -5461,14 +5495,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:2308
+#: 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:750
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Nimetu"
 
@@ -5495,21 +5527,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"
@@ -5558,33 +5586,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:747
 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:1292
-#: calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:877
-#: 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:1290 calendar/gui/e-calendar-view.c:1370
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_va"
 
@@ -5592,64 +5613,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:1293
-#: calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:879
-#: 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:1291 calendar/gui/e-calendar-view.c:1376
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: 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:1271
-#: calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376
-#: 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:124
+#: 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
 #: 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:1299
-#: calendar/gui/e-calendar-view.c:1342
-#: 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:1297 calendar/gui/e-calendar-view.c:1340
+#: 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:1300
-#: calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2607
-#: 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: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
+#: 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:1275
-#: calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374
-#: 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:122
-#: 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: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
 msgid "_Paste"
 msgstr "_Aseta"
 
@@ -5669,8 +5669,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"
 
@@ -5684,10 +5683,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"
 
@@ -5708,8 +5705,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"
 
@@ -5717,76 +5713,67 @@ msgstr "Kokkuvõte"
 msgid "Task sort"
 msgstr "Ülesannete sorteerimine"
 
-#: calendar/gui/e-calendar-view.c:1264
-#: calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Uus _kokkusaamine..."
 
-#: calendar/gui/e-calendar-view.c:1265
-#: calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Uus kogu päeva _sündmus"
 
-#: calendar/gui/e-calendar-view.c:1266
-#: calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Uus koosolek"
 
-#: calendar/gui/e-calendar-view.c:1267
-#: calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/e-calendar-view.c:1281
-#: ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Vali _tänane kuupäev"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Kuupäeva valimine..."
 
-#: calendar/gui/e-calendar-view.c:1286
-#: ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publitseeri vaba/hõivatud infot"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Kop_eeri kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "_Liiguta kalendrisse..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Ajasta koosolek..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Edasta i_Kalendrina"
 
-#: calendar/gui/e-calendar-view.c:1313
-#: calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Ku_stuta see sündmus"
 
-#: calendar/gui/e-calendar-view.c:1314
-#: calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Kustuta k_õik sündmused"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Mine tänasele _päevale"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Mine kuupäevale..."
 
-#: calendar/gui/e-calendar-view.c:1380
-#: ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Sätted..."
 
@@ -5799,53 +5786,42 @@ 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:967
-#: calendar/gui/e-itip-control.c:1169
+#: 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-meeting-store.c:150
-#: calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674
-#: camel/camel-gpg-context.c:1725
+#: calendar/gui/e-meeting-list-view.c:158 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:1034
+#: 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:1046
-#: shell/e-component-registry.c:170
+#: 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"
 
-#: calendar/gui/e-cal-model.c:877
+#: calendar/gui/e-cal-model.c:911
 msgid "Recurring"
 msgstr "Korduv"
 
-#: calendar/gui/e-cal-model.c:879
+#: calendar/gui/e-cal-model.c:913
 msgid "Assigned"
 msgstr "Määratud"
 
-#: calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-cal-model-tasks.c:980
-#: calendar/gui/e-meeting-list-view.c:168
-#: 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:168 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:881
-#: calendar/gui/e-cal-model-tasks.c:980
-#: calendar/gui/e-meeting-list-view.c:169
-#: 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:169 calendar/gui/e-meeting-store.c:171
 msgid "No"
 msgstr "Ei"
 
@@ -5857,8 +5833,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:629
 msgid "E"
 msgstr "Ida"
 
@@ -5866,7 +5841,7 @@ msgstr "Ida"
 msgid "W"
 msgstr "Lä"
 
-#: calendar/gui/e-cal-model-tasks.c:572
+#: calendar/gui/e-cal-model-tasks.c:601
 msgid ""
 "The geographical position must be entered in the format: \n"
 "\n"
@@ -5877,23 +5852,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"
@@ -5910,39 +5875,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818
-#: calendar/gui/e-week-view.c:593
+#: 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:821
-#: calendar/gui/e-week-view.c:596
+#: 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:1572
-#: 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:1605
-#: 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"
@@ -5957,10 +5910,27 @@ msgid "Yes. (Complex Recurrence)"
 msgstr "Jah. (Lihtne kordumine)"
 
 #: calendar/gui/e-itip-control.c:603
+#, fuzzy, c-format
+msgid "Every day"
+msgid_plural "Every %d days"
+msgstr[0] "Vahemikuga"
+msgstr[1] "Vahemikuga"
+
 #: calendar/gui/e-itip-control.c:608
+#, 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:610
-#: calendar/gui/e-itip-control.c:618
 #, c-format
+msgid "Every week on "
+msgid_plural "Every %d weeks on "
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/e-itip-control.c:618
 msgid " and "
 msgstr " ja "
 
@@ -5975,10 +5945,27 @@ msgid "The %s %s of "
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:645
+#, 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:649
+#, 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:660
-#: calendar/gui/e-itip-control.c:669
 #, 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
 msgid ", ending on "
 msgstr ", lõpeb"
 
@@ -5998,8 +5985,7 @@ msgstr "<b>Lõpetatud:</b>"
 msgid "<b>Due:</b> "
 msgstr "<b>Tähtaeg:</b>"
 
-#: calendar/gui/e-itip-control.c:771
-#: calendar/gui/e-itip-control.c:827
+#: calendar/gui/e-itip-control.c:771 calendar/gui/e-itip-control.c:827
 msgid "iCalendar Information"
 msgstr "iKalendri informatsioon"
 
@@ -6008,51 +5994,44 @@ msgstr "iKalendri informatsioon"
 msgid "iCalendar Error"
 msgstr "iKalendri viga"
 
-#: 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:859 calendar/gui/e-itip-control.c:875
+#: calendar/gui/e-itip-control.c:886 calendar/gui/e-itip-control.c:903
 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:910
-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."
+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:925
 msgid "<i>None</i>"
 msgstr "<i>Puudub</i>"
 
-#: calendar/gui/e-itip-control.c:955
-#: calendar/gui/e-meeting-list-view.c:180
-#: calendar/gui/e-meeting-store.c:179
-#: calendar/gui/e-meeting-store.c:202
+#: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
+#: 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:959
-#: calendar/gui/itip-utils.c:425
+#: calendar/gui/e-itip-control.c:959 calendar/gui/itip-utils.c:425
 msgid "Tentatively Accepted"
 msgstr "Proovinõusolek antud"
 
-#: calendar/gui/e-itip-control.c:963
-#: calendar/gui/e-meeting-list-view.c:181
-#: 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:963 calendar/gui/e-meeting-list-view.c:181
+#: 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: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: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
 msgid "Choose an action:"
 msgstr "Vali tegevus"
 
@@ -6060,14 +6039,10 @@ msgstr "Vali tegevus"
 msgid "Update"
 msgstr "Uuenda"
 
-#: 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:1079
-#: widgets/misc/e-cell-date-edit.c:265
+#: 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
 msgid "OK"
 msgstr "Olgu"
 
@@ -6096,10 +6071,8 @@ msgstr "GGV juhtimise staatus"
 msgid "Send Latest Information"
 msgstr "Saadab värskeima informatsiooni"
 
-#: calendar/gui/e-itip-control.c:1116
-#: calendar/gui/itip-utils.c:442
-#: mail/mail-send-recv.c:410
-#: mail/mail-send-recv.c:464
+#: calendar/gui/e-itip-control.c:1116 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"
@@ -6163,8 +6136,7 @@ msgstr "<b>%s</b> tühistas koosoleku."
 msgid "Meeting Cancellation"
 msgstr "Koosoleku tühistamine"
 
-#: calendar/gui/e-itip-control.c:1234
-#: calendar/gui/e-itip-control.c:1302
+#: calendar/gui/e-itip-control.c:1234 calendar/gui/e-itip-control.c:1302
 #: calendar/gui/e-itip-control.c:1337
 #, fuzzy, c-format
 msgid "<b>%s</b> has sent an unintelligible message."
@@ -6284,63 +6256,56 @@ msgstr "Manus ei sisalda arusaadavat kalendriteadet"
 msgid "The attachment has no viewable calendar items"
 msgstr "Manus ei sisalda vaadeldavaid kalendri elemente"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalendrifaili ei saa uuendada!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Uuendamine lõpetatud\n"
 
-#: calendar/gui/e-itip-control.c:1798
-#: calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814
-#: calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objekti ei suudetud leida\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Osavõtja olek uuendatud\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Osavõtja olekut ei ole võimailk uuendada!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Eemaldamine lõpetatud"
 
-#: calendar/gui/e-itip-control.c:1921
-#: calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Kirje saadetud!\n"
 
-#: calendar/gui/e-itip-control.c:1923
-#: calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Kirje saatmine ebaõnnestus!\n"
 
@@ -6398,83 +6363,66 @@ msgstr "Võimalikud osalejad"
 msgid "Resources"
 msgstr "Ressursid"
 
-#: calendar/gui/e-meeting-list-view.c:140
-#: 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:140 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:141
-#: calendar/gui/e-meeting-store.c:92
+#: calendar/gui/e-meeting-list-view.c:141 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:142 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:143
-#: calendar/gui/e-meeting-store.c:96
+#: calendar/gui/e-meeting-list-view.c:143 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:154
-#: calendar/gui/e-meeting-store.c:125
+#: calendar/gui/e-meeting-list-view.c:154 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:155
-#: 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:155 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:156
-#: calendar/gui/e-meeting-store.c:129
+#: calendar/gui/e-meeting-list-view.c:156 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:157
-#: calendar/gui/e-meeting-store.c:131
+#: calendar/gui/e-meeting-list-view.c:157 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:179
-#: 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:179 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:182
-#: 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:182 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:183
-#: calendar/gui/e-meeting-store.c:185
+#: calendar/gui/e-meeting-list-view.c:183 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"
 
@@ -6543,28 +6491,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"
 
@@ -6573,8 +6509,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:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6583,8 +6518,7 @@ msgstr ""
 "Viga tegevusel %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:612
-#: calendar/gui/gnome-cal.c:2057
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
 msgid "The task backend for '%s' has crashed."
 msgstr ""
@@ -6621,10 +6555,8 @@ msgstr "Puhastamine"
 
 #: calendar/gui/e-tasks.c:960
 #: 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:637
-#: calendar/gui/tasks-control.c:516
+#: calendar/gui/print.c:1819 calendar/gui/tasks-component.c:402
+#: calendar/gui/tasks-component.c:648 calendar/gui/tasks-control.c:405
 #: calendar/importers/icalendar-importer.c:79
 #: calendar/importers/icalendar-importer.c:705
 msgid "Tasks"
@@ -6655,43 +6587,41 @@ msgid "Purging"
 msgstr "Puhastamine"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Kalender ja ülesanded"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Häälesta siin oma ajavöönd, kalender ja ülesannete nimekiri"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolutioni kalender ja ülesanded"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Calendar configuration control"
 msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
 # !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Evolution'i kalendri iTip/iMip vaataja"
 
-# !PARANDA!
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution'i kalendrivaa"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 #, fuzzy
 msgid "Evolution Calendar/Task editor"
 msgstr "Evolution'i intelligentne kalendriimportija"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution'i kalendrivaa"
-
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 #, fuzzy
 msgid "Evolution's Calendar component"
@@ -6702,6 +6632,16 @@ msgstr "Evolutioni aadressiraamatu komponent"
 msgid "Evolution's Tasks component"
 msgstr "Evolutioni aadressiraamatu komponent"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendrid"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Ülesanded"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprill"
@@ -6758,8 +6698,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."
@@ -6768,23 +6707,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"
 
@@ -6820,22 +6755,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..."
 
@@ -6845,11 +6784,27 @@ 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
+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 "Kalendrit '%s' ei saa avada."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Ei saa avada mooduli faili \"%s\"."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7007,8 +6962,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"
 
@@ -7016,8 +6970,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"
@@ -7070,10 +7023,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:173
+#: 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"
 
@@ -7095,68 +7046,79 @@ msgid "New Task List"
 msgstr "Uus ülesannete nimekiri"
 
 #: calendar/gui/tasks-component.c:398
-#: calendar/gui/tasks-component.c:400
-#: mail/mail-component.c:532
-#: calendar/gui/tasks-component.c:515
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d kokku"
+msgstr[1] "%d kokku"
+
+#: calendar/gui/tasks-component.c:400 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:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Ülesannete laadimine"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:527
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:565
-msgid "Selected task list is read-only, events cannot be created. Please select a read-write calendar."
+#: calendar/gui/tasks-component.c:576
+msgid ""
+"Selected task list is read-only, events cannot be created. Please select a "
+"read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:793
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Uus ülesanne"
 
-#: calendar/gui/tasks-component.c:794
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Ülesanne"
 
-#: calendar/gui/tasks-component.c:795
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Lisab uue ülesande"
 
-#: calendar/gui/tasks-component.c:801
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "Uus ülesannet grupp"
 
-#: calendar/gui/tasks-component.c:802
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "Ü_lesannete grupp"
 
-#: calendar/gui/tasks-component.c:803
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Loo uus kontaktide grupp"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Kuvatava ülesannete kausta URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Ei saa laadida '%s' ülesandeid"
-
-#: calendar/gui/tasks-control.c:478
+#: 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:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Seda küsimust rohkem mitte esitada."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Trüki ülesanded"
 
@@ -8808,7 +8770,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "kirjete ettevalmistamine võrdlemiseks"
@@ -8817,15 +8779,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"
@@ -8836,19 +8796,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"
@@ -8870,14 +8827,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"
 
@@ -8902,10 +8857,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."
@@ -8941,7 +8896,7 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Uute sõnumite filtreerimine"
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8950,25 +8905,42 @@ msgstr ""
 "Otsinguavaldist ei ole võimalik analüüsida: %s\n"
 "%s"
 
-#: camel/camel-folder-search.c:358
+#: 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:569
-#: camel/camel-folder-search.c:598
+#: 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"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, 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
+#, 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
 #, fuzzy, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Täidetakse päring tundmatul päisel: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8979,15 +8951,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, fuzzy, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8997,31 +8969,28 @@ msgstr ""
 "Te vajate kasutaja salajase võtme lahtilukustamiseks\n"
 "parooli: \""
 
-#: camel/camel-gpg-context.c:781
-#: camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425
-#: camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624
-#: 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Loobutud."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Salajase võtme avamine ebaõnnestus: sisestati 3 valet parooli."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ootamatu vastus IMAP serverilt: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ei saa krüptida sõnumit: saajate aadressid on määramata."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9029,75 +8998,65 @@ msgid ""
 "%s"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "gpg käivitamine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1246
-#: 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:1260
-#: camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284
-#: camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510
-#: camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617
-#: camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695
-#: camel/camel-gpg-context.c:1746
+#: 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."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1384
-#: camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717
-#: camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Ei saa kontrollida sõnumit: Ajutise faili loomine ebaõnnestus: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "%s: Ei õnnestu lugeda autentimisandmeid"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "See on sõnumi digitaalselt allkirjastatud osa"
 
-#: camel/camel-gpg-context.c:1648
-#: camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Krüpteeritud sisu"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 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!"
@@ -9127,8 +9086,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"
@@ -9187,14 +9145,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"
 
@@ -9202,8 +9158,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"
 
@@ -9233,8 +9188,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."
@@ -9247,8 +9201,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."
 
@@ -9284,16 +9237,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"
@@ -9329,7 +9290,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
@@ -9337,19 +9300,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
@@ -9369,12 +9340,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:1207
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Serverilt saadi vigane autentimise vastus."
 
@@ -9409,8 +9378,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."
 
@@ -9424,7 +9392,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
@@ -9477,14 +9447,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"
@@ -9562,8 +9530,7 @@ msgstr "Ei suuda kindlaks teha Teie kasutajanime"
 msgid "Cannot add CMS SigningTime"
 msgstr "CMS andmeid ei saa manustada"
 
-#: 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."
@@ -9579,7 +9546,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Vali sertifikaat [%1] krüptimise jaoks"
 
 #: camel/camel-smime-context.c:360
@@ -9597,8 +9564,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:890
+#: 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"
@@ -9656,8 +9622,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"
@@ -9667,97 +9632,97 @@ 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:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Sertifikaadi importimine ebaõnnestus"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Ei leia tühja kohta"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allkirjastaja: %s <%s>: %s\n"
 
 #  we should have gotten instructions on how to use the DATA command:
 #  * 354 Enter mail, end with "." on a line by itself
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Dekooder ebaõnnestus"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Sertifikaadi leidmine \"%s\" jaoks nurjus."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #  PORT_GetError(); ??
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "CMS sõnumit ei saa luua"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "CMS EnvelopedData-t ei saa luua"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "CMS EnvelopedData-t ei saa manustada"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "CMS andmeobjekti ei saa manustada"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "CMS RecipientInfo-t ei saa luua"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "CMS RecipientInfo-t ei saa lisada"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "ei suuda luua objekti '%s'"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Ei saa lugeda METAR andmeid.\n"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, fuzzy, c-format
 msgid "Decoder failed, error %d"
 msgstr "KIRC viga - meetod ebaõnnestus: "
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekrüpteerimine: Krüpteeritud sisu ei leitud"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "võtmete importimine: pole veel teostatud"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "võtmete eksportimine: pole veel teostatud"
 
@@ -9774,20 +9739,27 @@ msgstr "Kausta `%s' ei saa luua: kaust juba eksisteerib"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379
-#: camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kausta kustutamine nurjus: %s: vigane operatsioon"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Prügikast"
 
-#: camel/camel-store.c:795
-#: filter/libfilter-i18n.h:35
-#: mail/mail-config.glade.h:92
-#: ui/evolution-mail-message.xml.h:48
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
+#: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Rämps"
 
@@ -9922,8 +9894,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"
@@ -9936,13 +9907,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"
 
@@ -10025,13 +9994,12 @@ msgstr "URL'i `%s' ei saa töödelda"
 msgid "Error storing `%s': %s"
 msgstr "Viga `%s' salvestamisel: %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Sõnumit %s ei ole %s seas"
 
-#: camel/camel-vee-folder.c:839
-#: camel/camel-vee-folder.c:845
+#: 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"
 
@@ -10040,11 +10008,6 @@ msgstr "Sõnumeid ei saa koppeerida või liigutaad Virtuaalkausta"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kausta kustutamine nurjus: %s: kausta ei ole olemas"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kausta ümbernimetamine nurjus: %s: vigane operatsioon"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10071,7 +10034,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
@@ -10099,8 +10064,7 @@ msgstr ""
 #: 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:105
 msgid "Password"
 msgstr "Parool"
 
@@ -10239,25 +10203,26 @@ 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:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, 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:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: 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/pop3/camel-pop3-store.c:175
@@ -10268,15 +10233,15 @@ 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:548
+#: 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:563
-#: camel/providers/imap/camel-imap-store.c:810
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10286,12 +10251,14 @@ 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:644
-#: camel/providers/imap/camel-imap-store.c:675
+#: camel/providers/imap/camel-imap-store.c:649
+#: camel/providers/imap/camel-imap-store.c:680
 #, fuzzy, c-format
 msgid "Failed to connect to IMAP server %s in secure mode: %s"
 msgstr "Ei saa luua ühendust LDAP serveriga"
@@ -10300,14 +10267,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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 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
@@ -10326,8 +10293,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
-#, c-format
-msgid "The folder name \"%s\" is invalid because it containes the character \"%c\""
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+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
@@ -10355,31 +10325,31 @@ msgstr "Kausta `%s' ei saa kustutada: Vigane kirjakasti nimi"
 msgid "Cannot delete folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa kustutada: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:1032
+#: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
 msgstr ""
 
-#: camel/providers/imap4/camel-imap4-store.c:1034
+#: camel/providers/imap4/camel-imap4-store.c:1039
 msgid "Bad command"
 msgstr "Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:1095
+#: camel/providers/imap4/camel-imap4-store.c:1100
 #, c-format
 msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1100
+#: camel/providers/imap4/camel-imap4-store.c:1105
 #, c-format
 msgid "Cannot subscribe to folder `%s': Bad command"
 msgstr "Kausta `%s' ei saa tellida: Puudulik käsk"
 
-#: camel/providers/imap4/camel-imap4-store.c:1144
+#: camel/providers/imap4/camel-imap4-store.c:1149
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
 msgstr "Kausta `%s' ei saa tellida: Vigane kirjakasti nimi name"
 
-#: camel/providers/imap4/camel-imap4-store.c:1149
+#: camel/providers/imap4/camel-imap4-store.c:1154
 #, fuzzy, c-format
 msgid "Cannot unsubscribe from folder `%s': Bad command"
 msgstr "Sõnumeid ei saa liigutada kaustast `%s' `%s' kausta: Puudulik käsk"
@@ -10401,12 +10371,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:3129
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operatsioon katekstatud"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3132
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server katkestas ootamatult: %s"
@@ -10457,21 +10427,21 @@ msgstr "Kataloogi %s ei saa luua: %s"
 msgid "Could not load summary for %s"
 msgstr "%s kokkuvõtet ei saa laadida"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kaust hävitati ja taasloodi serveris."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Kontrollin muudetud sõnumite olemasolu"
 
-#: camel/providers/imap/camel-imap-folder.c:1961
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Sõnumite ei saa vastu võtta: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: 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
@@ -10487,25 +10457,25 @@ msgstr ""
 "Sõnumit %s ei saadud: \n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: 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
 msgid "No such message"
 msgstr "Sõnumit ei leitud"
 
-#: camel/providers/imap/camel-imap-folder.c:2040
-#: camel/providers/imap/camel-imap-folder.c:2642
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "See sõnum ei ole hetkel kättesaadav"
 
-#: camel/providers/imap/camel-imap-folder.c:2306
-#: camel/providers/imap/camel-imap-folder.c:2376
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Võtan kokkuvõtvat infot uute sõnumite kohta"
 
-#: camel/providers/imap/camel-imap-folder.c:2680
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Ei leia sõnumi sisu FETCH vastuses."
 
@@ -10565,44 +10535,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:645
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:676
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:813
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1237
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1247
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1284
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Sa ei sisestanud parooli."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1318
 #, fuzzy, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10613,24 +10583,18 @@ msgstr ""
 "Serveri vastus:\n"
 "%2"
 
-#: camel/providers/imap/camel-imap-store.c:1800
-#: camel/providers/imap/camel-imap-store.c:1990
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Kausta %s ei leitud"
 
-#: camel/providers/imap/camel-imap-store.c:1818
-#: camel/providers/imap/camel-imap-store.c:2196
-#, fuzzy, c-format
-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/imap/camel-imap-store.c:1876
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1931
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10638,7 +10602,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:2207
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Tundmatu ülemkaust: %s"
@@ -10660,7 +10624,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"
 
@@ -10718,7 +10683,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
@@ -10748,61 +10715,63 @@ 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:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Hoidla juurikas %s ei ole absoluutne tee"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, fuzzy, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Fail '%s' ei ole tavaline fail ega kataloog."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: camel/providers/local/camel-local-store.c:158
+#: camel/providers/local/camel-local-store.c:166
+#: camel/providers/local/camel-local-store.c:264
 #, fuzzy, c-format
 msgid "Cannot get folder: %s: %s"
 msgstr "Kausta `%s' ei saadud: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 #, fuzzy
 msgid "Local stores do not have an inbox"
 msgstr "Suurused ei klapi (lokaalne %ld) -- laen uuesti.\n"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Kohaliku posti fail %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ei saa ümber nimetada '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kausta kokkuvõttefaili `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kausta indeksfaili `%s' ei saa kustutada: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10869,7 +10838,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11205,7 +11174,7 @@ 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:258
+#: 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
@@ -11214,8 +11183,8 @@ msgid "User cancelled"
 msgstr "Kasutaja tühistas"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11226,46 +11195,46 @@ msgstr ""
 "Sõnumit %s ei saadud: \n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Sisemine viga: uid on vigases vormingus: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Viga uudistegruppi postitamisel: %s: sõnumit ei postitatud"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Sõnumeid ei saa NNTP kaustast kopeerida!"
 
@@ -11285,7 +11254,8 @@ 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
@@ -11301,7 +11271,9 @@ 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
@@ -11433,9 +11405,8 @@ 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:1223
-#: composer/e-msg-composer.c:1244
+#: 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"
 
@@ -11452,8 +11423,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:104
+#: camel/providers/pop3/camel-pop3-provider.c:54 mail/mail-config.glade.h:104
 msgid "POP"
 msgstr "POP"
 
@@ -11462,11 +11432,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
@@ -11489,7 +11466,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
@@ -11533,7 +11512,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
@@ -11549,7 +11530,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
@@ -11579,8 +11561,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:119
+#: camel/providers/smtp/camel-smtp-provider.c:37 mail/mail-config.glade.h:119
 msgid "SMTP"
 msgstr "SMTP"
 
@@ -11871,8 +11852,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295
-#: mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "manus"
 
@@ -11916,67 +11896,72 @@ msgstr "MIME tüüp:"
 msgid "Suggest automatic display of attachment"
 msgstr "Soovita manuse automaatset kuvamist"
 
-#: composer/e-msg-composer.c:703
+#: composer/e-msg-composer.c:704
 #, fuzzy
-msgid "Cannot sign outgoing message: No signing certificate set for from 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:709
+#: composer/e-msg-composer.c:711
 #, fuzzy
-msgid "Cannot encrypt outgoing message: No encryption certificate set for from 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:1281
+#: composer/e-msg-composer.c:1283
 #, fuzzy
 msgid "Could not open file"
 msgstr "Faili avamine ebaõnnestus"
 
-#: composer/e-msg-composer.c:1289
+#: composer/e-msg-composer.c:1291
 #, fuzzy
 msgid "Unable to retrieve message from editor"
 msgstr "Sõnumi vastuvõtmine nurjus"
 
-#: composer/e-msg-composer.c:1559
+#: composer/e-msg-composer.c:1561
 msgid "Untitled Message"
 msgstr "Pealkirjata sõnum"
 
-#: composer/e-msg-composer.c:1589
+#: composer/e-msg-composer.c:1591
 msgid "Open file"
 msgstr "Ava fail"
 
-#: composer/e-msg-composer.c:1996
-#: mail/mail-account-gui.c:1479
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
 msgid "Autogenerated"
 msgstr "Automaatselt genereeritud"
 
-#: composer/e-msg-composer.c:2095
+#: composer/e-msg-composer.c:2097
 msgid "Signature:"
 msgstr "Allkiri:"
 
-#: composer/e-msg-composer.c:2296
-#: composer/e-msg-composer.c:2325
+#: 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 "_Manuseriba peitmine (tõsta manused siia)"
 
-#: composer/e-msg-composer.c:2328
-#: composer/e-msg-composer.c:3232
+#: 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:2345
-#: composer/e-msg-composer.c:3111
-#: composer/e-msg-composer.c:3112
+#: 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"
 
-#: composer/e-msg-composer.c:3145
+#: 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:3173
+#: composer/e-msg-composer.c:3175
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component.\n"
@@ -11988,7 +11973,7 @@ msgstr ""
 "Palun tee kindlaks, et õiged gtkhtml ja libgtkhtml\n"
 "versioonid on paigaldatud.\n"
 
-#: composer/e-msg-composer.c:3277
+#: composer/e-msg-composer.c:3279
 msgid ""
 "Could not create composer window:\n"
 "Unable to activate HTML editor component."
@@ -11996,8 +11981,10 @@ msgstr ""
 "Ei saa luua sõnumiredaktori akent:\n"
 "Ei saa aktiveerida HTML redaktori komponenti."
 
-#: composer/e-msg-composer.c:4282
-msgid "<b>(The composer contains a non-text message body, which cannot be edited.)<b>"
+#: 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
@@ -12060,7 +12047,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
@@ -12085,110 +12074,140 @@ msgstr "Vea valimiseks numbri järgi klõpsa siia"
 msgid "Attach file(s)"
 msgstr "Faili(de) manustamine"
 
-#: composer/mail-composer-errors.xml.in.h:1
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+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.in.h:2
-#, fuzzy
-msgid "All accounts have been removed."
-msgstr "Kas võib KÕIK tõlked failist '%s' eemaldada?"
+#. 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 "Fail `${0}' ei ole tavafail ja seda ei saa sõnumis saata."
 
-#: composer/mail-composer-errors.xml.in.h:3
-#, fuzzy
-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:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Katalooge ei saa sõnumeile manustada."
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr "Kuna \"${0}\", pead sa valima teised kirjade sätted."
+#. 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."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr "Kuna \"${1}\"."
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Topeltkirju ei leitud."
 
-#: composer/mail-composer-errors.xml.in.h:6
-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."
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
+"Kas tõesti kustutada %n kiri?\n"
+"Kas tõesti kustutada %n kirja?"
 
-#: composer/mail-composer-errors.xml.in.h:7
+#. 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."
+msgstr ""
+
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Sõnumi saatmine ebaõnnestus"
+msgid "Don't Recover"
+msgstr "Ä_ra taasta"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Signatuurifaili: %s ei õnnestu salvestada"
+msgid "Recover"
+msgstr "_Taasta"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. 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."
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr "Katalooge ei saa sõnumeile manustada."
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "unustatakse muudatused"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
-"Kas tõesti kustutada %n kiri?\n"
-"Kas tõesti kustutada %n kirja?"
+"Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" "
+"üldse teha."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ä_ra taasta"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Hoiatus: salvestamata sõnum"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Viga faili salvestamisel. Kontrolli, kas sul on õigus seda asukohas \"%1\" üldse teha."
+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?"
 
-#: composer/mail-composer-errors.xml.in.h:15
-msgid "Evolution quit unexpectedly while you were composing a new message. Recovering the message will allow you to continue where you left off."
+#. 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/mail-composer-errors.xml.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "_Taasta"
+msgid "Discard Changes"
+msgstr "unustatakse muudatused"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Sõnumi salvestamine..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-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:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Sõnumi saatmine ebaõnnestus"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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:no-build-message secondary
+#: composer/mail-composer-errors.xml.h:34
+msgid "Because \"${0}\", you may need to select different mail options."
+msgstr "Kuna \"${0}\", pead sa valima teised kirjade sätted."
 
-#: composer/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Topeltkirju ei leitud."
+msgid "Could not read signature file \"{0}\"."
+msgstr "Signatuurifaili: %s ei õnnestu salvestada"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Hoiatus: salvestamata sõnum"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr "Kuna \"${1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:22
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Faili manustamine sõnumile"
+msgid "All accounts have been removed."
+msgstr "Kas võib KÕIK tõlked failist '%s' eemaldada?"
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -12225,7 +12244,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"
@@ -12265,8 +12285,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
@@ -12295,7 +12317,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
@@ -12306,8 +12330,8 @@ msgstr ""
 "Antud nimega fail eksisteerib.\n"
 "Kirjutada üle?"
 
-#: e-util/e-dialog-utils.c:251
-#: widgets/misc/e-system-errors.xml.in.h:7
+#. 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 "Fail üle kirjutada?"
 
@@ -12342,10 +12366,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"
 
@@ -12355,10 +12376,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"
 
@@ -12437,39 +12455,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"
 
@@ -12479,19 +12483,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"
 
@@ -12510,69 +12554,88 @@ msgstr "Vali aeg, millega võrrelda"
 msgid "_Filter Rules"
 msgstr "_Filtri reeglid"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "Vigane regulaaravaldis \"{0}\"."
-
-#: filter/filter-errors.xml.in.h:2
-#, fuzzy
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "ei vasta regulaaravaldisele"
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Faili \"{0}\" ei eksisteeri või see pole tavaline fail."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Puuduv kuupäev."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Kuupäeva valimine on kohustuslik."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Puuduv faili nimi."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Failinime andmine on kohustuslik"
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Faili \"{0}\" ei eksisteeri või see pole tavaline fail."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Puuduv kaust."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Puuduv nimi."
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "Nimi \"{0}\" on juba kasutusel."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Kausta valimine on kohustuslik."
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "Ühtegi allikat pole valitud."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "Vigane regulaaravaldis \"{0}\"."
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Palun vali mõni teine nimi."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+#, fuzzy
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "ei vasta regulaaravaldisele"
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Kuupäeva valimine on kohustuslik."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Puuduv nimi."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Sa pead sellele filtrile nime määrama."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "Sa pead sellele vKaustale nime andma."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Failinime andmine on kohustuslik"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "Nimi \"{0}\" on juba kasutusel."
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Kausta valimine on kohustuslik."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Palun vali mõni teine nimi."
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "Ühtegi allikat pole valitud."
 
-#: filter/filter-errors.xml.in.h:16
-msgid "You must specify at least one folder as a source. Either by selecting the folders individually, and/or by selecting all local folders, all remote folders, or both."
+#. 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-file.c:288
@@ -12587,8 +12650,7 @@ msgstr "Vali faili"
 msgid "<b>Then</b>"
 msgstr "<b>siis</b>"
 
-#: filter/filter-folder.c:237
-#: filter/vfolder-rule.c:492
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
 #: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Kausta valimine"
@@ -12653,8 +12715,7 @@ msgstr "tagasi"
 msgid "months"
 msgstr "kuud"
 
-#: filter/filter.glade.h:19
-#: mail/mail-config.glade.h:183
+#: filter/filter.glade.h:19 mail/mail-config.glade.h:183
 msgid "seconds"
 msgstr "sekundit"
 
@@ -12686,20 +12747,15 @@ msgstr "koos kõigi kohalike kalatoogidega"
 msgid "years"
 msgstr "aastat"
 
-#: filter/filter-label.c:121
-#: filter/libfilter-i18n.h:26
-#: mail/em-migrate.c:921
-#: mail/mail-config.c:76
-#: mail/mail-config.glade.h:90
+#: 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
 msgid "Important"
 msgstr "Tähtis"
 
 #  forest green
 #  forest green
 #. forest green
-#: filter/filter-label.c:124
-#: mail/em-migrate.c:924
-#: mail/mail-config.c:79
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
 #: mail/mail-config.glade.h:145
 msgid "To Do"
 msgstr "Ülesanne"
@@ -12707,43 +12763,60 @@ msgstr "Ülesanne"
 #  blue
 #  blue
 #. blue
-#: filter/filter-label.c:125
-#: mail/em-migrate.c:925
-#: mail/mail-config.c:80
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
 #: mail/mail-config.glade.h:94
 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"
 
-#: filter/filter-rule.c:746
+#: filter/filter-rule.c:790
 msgid "Rule name:"
 msgstr "Reegli nimi:"
 
-#: filter/filter-rule.c:773
+#: filter/filter-rule.c:817
 msgid "<b>If</b>"
 msgstr "<b>kui</b>"
 
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Tegevused viiakse täide"
-
-#: filter/filter-rule.c:808
+#: filter/filter-rule.c:854
 msgid "if all criteria are met"
 msgstr "kui kõik tingimused on täidetud"
 
-#: filter/filter-rule.c:813
+#: filter/filter-rule.c:854
 msgid "if any criteria are met"
 msgstr "kui üks tingimustest on täidetud"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Tegevused viiakse täide"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegeeritud"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Adressaadid"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Vastatud kellele"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Lisa:"
+
+#: filter/filter-rule.c:974
 msgid "incoming"
 msgstr "sissetulev"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:974
 msgid "outgoing"
 msgstr "väljaminev"
 
@@ -12877,8 +12950,7 @@ msgstr "ei ole märgistatud"
 msgid "Junk Test"
 msgstr "Rämpsukontroll"
 
-#: filter/libfilter-i18n.h:37
-#: mail/em-folder-view.c:910
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Silt"
@@ -12916,8 +12988,7 @@ msgstr "Käivitatav programm"
 msgid "Play Sound"
 msgstr "Mängi heli"
 
-#: filter/libfilter-i18n.h:46
-#: mail/message-tag-followup.c:79
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Loetud"
 
@@ -12949,9 +13020,7 @@ msgstr "tagastab vähem kui"
 msgid "Run Program"
 msgstr "Käivita programm"
 
-#: filter/libfilter-i18n.h:54
-#: filter/score-rule.c:184
-#: filter/score-rule.c:186
+#: 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"
@@ -12988,13 +13057,9 @@ msgstr "algab"
 msgid "Stop Processing"
 msgstr "Peata töötlemine"
 
-#: filter/libfilter-i18n.h:64
-#: mail/em-format.c:747
-#: mail/em-format-html.c:1533
-#: mail/em-format-quote.c:301
-#: mail/em-mailer-prefs.c:89
-#: mail/message-list.etspec.h:13
-#: mail/message-tag-followup.c:329
+#: 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"
@@ -13057,7 +13122,12 @@ msgstr "Teema ei sisalda"
 msgid "Virtual _Folders"
 msgstr "Virtuaalsed _kaustad"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "_Lisa"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VKausta allikas"
 
@@ -13075,9 +13145,8 @@ msgstr "Konto nimi"
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:305
-#: mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1049
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Nimetu"
 
@@ -13093,11 +13162,11 @@ msgstr "Lisa allkirjaskript"
 msgid "Signature(s)"
 msgstr "Allkiri(jad)"
 
-#: mail/em-composer-utils.c:883
+#: mail/em-composer-utils.c:888
 msgid "-------- Forwarded Message --------"
 msgstr "-------- Edastatud sõnum --------"
 
-#: mail/em-composer-utils.c:1494
+#: mail/em-composer-utils.c:1499
 msgid "an unknown sender"
 msgstr "tundmatu saatja"
 
@@ -13105,11 +13174,11 @@ 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:1504
+#: mail/em-composer-utils.c:1509
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a. %Y-%m-%d, kell %H:%M %%+05d, %%s kirjutas:"
 
-#: mail/em-folder-browser.c:134
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Loo otsingu baasil _Virtuaalne Kaust..."
 
@@ -13145,135 +13214,146 @@ msgstr "<kausta valimiseks kliki siia>"
 msgid "Create New Folder"
 msgstr "Loo uus kaust"
 
-#: mail/em-folder-selector.c:166
-#: mail/em-folder-tree.c:2339
-#: mail/mail-component.c:732
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Kirjelda, kuhu tuleb kaust luua:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Kataloogi loomine"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Kausta nimi:"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Kausta %s liigutamine"
 
-#: mail/em-folder-tree.c:937
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kausta %s kopeerimine"
 
-#: mail/em-folder-tree.c:944
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sõnumite liigutamine %s kausta"
 
-#: mail/em-folder-tree.c:946
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Sõnumite kopeerimine %s kausta"
 
-#: mail/em-folder-tree.c:962
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kontrolli uusi sõnumeid kõikides kaustades"
 
-#: mail/em-folder-tree.c:2113
-#: mail/em-folder-tree.c:2126
-#: mail/em-folder-view.c:781
-#: mail/em-folder-view.c:795
+#: mail/em-folder-tree.c:956 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
+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:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Liiguta"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Tühista ülesanne"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Kataloogi valimine"
 
-#: mail/em-folder-tree.c:2153
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopeeri"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Kataloogi `%s' loomine"
 
-#: mail/em-folder-tree.c:2339
-#: mail/mail-component.c:732
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Kataloogi loomine"
 
-#: mail/em-folder-tree.c:2531
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeta kaust \"%s\" uue nimega:"
 
-#: mail/em-folder-tree.c:2533
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Kataloogi ümbernimetamine"
 
-#: mail/em-folder-tree.c:2602
-#: 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:2545 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
 msgid "_View"
 msgstr "_Vaade"
 
-#: mail/em-folder-tree.c:2603
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Uues _aknas avamine"
 
-#: mail/em-folder-tree.c:2608
-msgid "_Move"
-msgstr "_Liiguta"
-
 #  FIXME: need to disable for nochildren folders
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2612
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Uus kataloog..."
 
-#: mail/em-folder-tree.c:2615
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Nimeta ümber"
 
-#: mail/em-folder-tree.c:2618
-#: ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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:851
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "VKaustad"
 
 #  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:468
-#: mail/em-folder-tree-model.c:777
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
 msgid "Loading..."
 msgstr "Laadimine..."
 
-#: mail/em-folder-view.c:407
-#: 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:540
-#: mail/mail-component.c:583
+#: 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
 msgid "Mail"
 msgstr "E-Post"
 
@@ -13281,324 +13361,288 @@ 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:878
-#: mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigeeri kui uut kirja..."
 
-#: mail/em-folder-view.c:880
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Trüki"
 
-#: mail/em-folder-view.c:883
-#: ui/evolution-mail-message.xml.h:126
+#: 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:884
-#: mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vasta postiloendisse"
 
-#: mail/em-folder-view.c:885
-#: mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vasta _kõigile"
 
-#: mail/em-folder-view.c:886
-#: mail/em-popup.c:813
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Edasta"
 
-#: mail/em-folder-view.c:889
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Vastu_kaja..."
 
-#: mail/em-folder-view.c:890
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Märgista kui lõpetatud"
 
-#: mail/em-folder-view.c:891
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Eemalda silt"
 
-#: mail/em-folder-view.c:894
-#: 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"
 
-#: mail/em-folder-view.c:895
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Märgi _mitteloetuks"
 
-#: mail/em-folder-view.c:896
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Märgi _tähtsaks "
 
-#: mail/em-folder-view.c:897
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Märgi m_ittetähtsaks"
 
-#: mail/em-folder-view.c:898
-#: 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:899
-#: 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"
 
-#: mail/em-folder-view.c:903
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "T_aasta"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Tõsta kausta..."
 
-#: mail/em-folder-view.c:907
-#: 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:915
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Lisa saatja _aadressiraamatusse"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Rakenda _filtrid"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "_Rämpsu filtreerimine"
 
-#: mail/em-folder-view.c:922
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Loo sõnumi baasil reegel"
 
-#: mail/em-folder-view.c:923
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VKaust _teema järgi"
 
-#: mail/em-folder-view.c:924
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VKaust _saatja järgi"
 
-#: mail/em-folder-view.c:925
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VKaust _adressaatide järgi"
 
-#: mail/em-folder-view.c:926
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VKaust _meililoendi järgi"
 
-#: mail/em-folder-view.c:930
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter t_eema järgi"
 
-#: mail/em-folder-view.c:931
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter saat_ja järgi"
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter a_dressaatide järgi"
 
-#: mail/em-folder-view.c:933
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter  p_ostiloendi järgi"
 
 #  default charset used in mail view
 #. default charset used in mail view
-#: mail/em-folder-view.c:1701
-#: mail/em-folder-view.c:1739
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "UTF-8"
 
-#: mail/em-folder-view.c:1784
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Sõnumi trükkimine"
 
-#: mail/em-folder-view.c:2049
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "Kopeeri _lingi asukoht"
 
-#: mail/em-folder-view.c:2303
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kirja saatmiseks kliki %s"
 
-#: mail/em-format.c:742
-#: mail/em-format-html.c:1427
-#: mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:84
-#: 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:743
-#: mail/em-format-html.c:1427
-#: mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:85
+#: 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:744
-#: mail/em-format-html.c:1427
-#: mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:86
-#: 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:745
-#: mail/em-format-html.c:1427
-#: mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:87
+#: 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:746
-#: mail/em-format-html.c:1427
-#: mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:88
+#: 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:748
-#: mail/em-format-html.c:1577
-#: mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:90
-#: mail/message-list.etspec.h:2
+#: 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:749
-#: mail/em-format-html.c:1598
-#: mail/em-mailer-prefs.c:91
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Uudisegrupid"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "\"%s\" tüüpi manus"
 
-#: mail/em-format.c:1065
-#: mail/em-format.c:1184
+#: 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"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "MIME sõnumit ei saa analüüsida. Kuvatakse lähtekoodina."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Toetamata allkirjavorming"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Viga allkirja tõestamisel"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Tundmatu viga allkirja tõestamisel"
 
-#: mail/em-format-html.c:453
-#: mail/em-format-html.c:455
+#: 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:560
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Allkirjastamata"
 
-#: mail/em-format-html.c:561
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Kehtiv allkiri"
 
-#: mail/em-format-html.c:562
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Vigane allkiri"
 
-#: mail/em-format-html.c:563
-#: mail/em-format-html-display.c:649
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Kehtiv allkiri, saatjat ei saa tuvastada"
 
-#: mail/em-format-html.c:569
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Krüpteerimata"
 
-#: mail/em-format-html.c:570
-#: mail/em-format-html-display.c:656
+#: 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:571
-#: mail/em-format-html-display.c:657
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Krüptitud"
 
-#: mail/em-format-html.c:572
-#: mail/em-format-html-display.c:658
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Krüptitud, tugevalt"
 
-#: mail/em-format-html.c:834
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:864
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Viide FTP saidile (%s)"
 
-#: mail/em-format-html.c:875
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:877
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Viide kohalikule failile (%s)"
 
-#: mail/em-format-html.c:898
+#: mail/em-format-html.c:884
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Saadetavad nõude andmed"
 
-#: mail/em-format-html.c:909
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1151
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Sõnumi vormindamine"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537
-#: mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:935
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Postiprogramm:"
 
@@ -13609,7 +13653,7 @@ msgstr "Postiprogramm:"
 #  translators: strftime format for local time equivalent in Date header display, with day
 #  translators: strftime format for local time equivalent in Date header display, with day
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
@@ -13618,7 +13662,7 @@ msgstr "<I> (%a, %R %Z)</I>"
 #  translators: strftime format for local time equivalent in Date header display, without day
 #  translators: strftime format for local time equivalent in Date header display, without day
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13630,124 +13674,176 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Sobivaid: %d"
 
-#: mail/em-format-html-display.c:646
-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: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."
 
-#: mail/em-format-html-display.c:647
-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: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."
 
-#: mail/em-format-html-display.c:648
-msgid "The signature of this message cannot be verified, it may have been altered in transit."
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid "This message is signed with a valid signature, but the sender of the message cannot be verified."
+#: mail/em-format-html-display.c:647
+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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid "This message is not encrypted.  Its content may be viewed in transit across The Internet."
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid "This message is encrypted.  It would be difficult for an outsider to view the content of this message."
+#: 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 ""
 
-#: mail/em-format-html-display.c:658
-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."
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Sertifikaadi kuvamine"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "See sertifikaat ei ole kuvatav"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Lõpetatud %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Tähtaja ületanud:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Sisekuva"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Peida"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Lehekülg %d %d-st"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisseehitatud)"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Iga kord"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Kord päevas"
 
-#: mail/em-mailer-prefs.c:104
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Kord nädalas"
 
-#: mail/em-mailer-prefs.c:105
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Kord kuus"
 
-#: mail/em-migrate.c:1077
+#: mail/em-migrate.c:1072
 #, 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..."
 
-#: mail/em-migrate.c:1932
-#: mail/em-migrate.c:1947
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kausta `%s' ei saa luua: %s"
 
-#: mail/em-migrate.c:2035
-#: mail/em-migrate.c:2136
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Kausta %s ei saa ümber nimetada %s-ks: %s"
+
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Faili %1 avamine %2 järjehoidjate jaoks ei õnnestunud."
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Autentimine LDAP serverile nurjus"
 
-#: mail/em-migrate.c:2337
-#: mail/em-migrate.c:2511
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
+
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Kataloogi '%s' loomine ebaõnnestus: %s"
 
-#: mail/em-migrate.c:2349
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "'%s' avamine kirjutamiseks ebaõnnestus: %s"
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Väljundfaili %s loomine ebaõnnestus\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13783,53 +13879,53 @@ msgstr "_Lisa aadressiraamatusse"
 msgid "Open in %s..."
 msgstr "Ava programmiga %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "IMAP serveri vastus ei sisaldanud %s infot"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Tellitud"
 
-#: mail/em-subscribe-editor.c:637
-#: 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"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Palun vali server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Serverit ei ole valitud"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Seda teadet ära enam uuesti näita."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtrid"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "sõnum"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Sõnumi salvestamine..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Aadressi lisamine"
 
 #  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:989
+#. Drop filename for messages from a mailbox
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Andmed (%s -st)"
@@ -13944,7 +14040,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
@@ -13965,7 +14064,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
@@ -13973,7 +14074,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
@@ -13981,7 +14084,7 @@ msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:36
-msgid "List of protocol names whose license has been accepted"
+msgid "List of protocol names whose license has been accepted."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:37
@@ -13989,8 +14092,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"
@@ -14064,7 +14173,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
@@ -14078,13 +14188,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"
@@ -14174,7 +14288,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
@@ -14282,7 +14400,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
@@ -14294,52 +14414,51 @@ msgid "spamd port"
 msgstr "spamd port"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
 msgid "Composer Preferences"
 msgstr "Kella häälestus"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid "Configure mail preferences, including security and message display, here"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
 msgid "Configure your email accounts here"
 msgstr "Sisesta siia oma meiliaadress"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolutioni meiliklient"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
 msgid "Evolution Mail accounts configuration control"
 msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
 msgid "Evolution Mail component"
 msgstr "Evolutioni aadressiraamatu komponent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolutioni kirjakoostaja"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
 msgid "Evolution Mail composer configuration control"
 msgstr "Evolutioni kaustasätete konfiguratsiooni juhtimine"
 
-# !PARANDA!
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Saa&detud kirjade kaust:"
-
 #: mail/GNOME_Evolution_Mail.server.in.in.h:11
 #, fuzzy
 msgid "Evolution Mail preferences control"
@@ -14349,11 +14468,15 @@ 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:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Meili häälestus"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Post:"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution impordib sinu sõnumeid programmist Elm'i"
@@ -14361,16 +14484,14 @@ 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/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/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Palun oota"
 
@@ -14536,7 +14657,7 @@ msgstr "Pine"
 
 #  give our dialog an OK button and title
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution kontoassistent"
 
@@ -14554,18 +14675,15 @@ msgstr ""
 msgid "%s License Agreement"
 msgstr "&Litsents"
 
-#: mail/mail-account-gui.c:954
-#: mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Host:"
 
-#: mail/mail-account-gui.c:958
-#: mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Kasutajanimi:"
 
-#: mail/mail-account-gui.c:962
-#: mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Otsingutee:"
 
@@ -14593,129 +14711,141 @@ msgstr "%s meililist"
 msgid "Add Filter Rule"
 msgstr "Lisa filtreerimisreegel"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d kustutatud"
 
-#: mail/mail-component.c:495
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d rämps"
 
-#: mail/mail-component.c:518
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d mustandid"
 
-#: mail/mail-component.c:520
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d saadetud"
 
-#: mail/mail-component.c:522
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d saatmata"
 
-#: mail/mail-component.c:526
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d kokku"
 
-#: mail/mail-component.c:528
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d lugemata"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Uus meilisõnum"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:654
 #, fuzzy
 msgid "_Mail Message"
 msgstr "GNU meilisõnum"
 
-#: mail/mail-component.c:686
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Loo uus eemalolekusõnum"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Uus kirjakaust"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Kirjakaust"
 
-#: mail/mail-component.c:694
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Uue kirjakausta loomine"
 
-#: mail/mail-component.c:872
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, mida kalender näitab"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config.c:899
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Teenuse kontrollimine"
 
-#: mail/mail-config.c:977
-#: mail/mail-config.c:981
+#: 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:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 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:116
 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:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 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:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 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:1
@@ -14885,8 +15015,7 @@ msgstr ""
 msgid "Attach original message"
 msgstr "Originaalsõnumi manustamine"
 
-#: mail/mail-config.glade.h:45
-#: mail/message-list.etspec.h:1
+#: mail/mail-config.glade.h:45 mail/message-list.etspec.h:1
 msgid "Attachment"
 msgstr "Manus"
 
@@ -14982,8 +15111,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:72
-#: shell/glade/evolution-startup-wizard.glade.h:1
+#: mail/mail-config.glade.h:72 shell/glade/evolution-startup-wizard.glade.h:1
 msgid "Done"
 msgstr "Valmis"
 
@@ -15066,7 +15194,9 @@ msgid "Message Composer"
 msgstr "Sõnumiredaktor"
 
 #: mail/mail-config.glade.h:101
-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:102
@@ -15085,7 +15215,9 @@ msgstr "Helifail, mida mängitakse uute kirjade saabumisel."
 #: mail/mail-config.glade.h:109
 #, 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:110
 #, fuzzy
@@ -15205,7 +15337,10 @@ msgid ""
 msgstr ""
 
 #: mail/mail-config.glade.h:144
-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:146
@@ -15318,332 +15453,495 @@ msgstr "värv"
 msgid "description"
 msgstr "kirjeldus"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Kaust nimega \"{1}\" juba eksisteerib. Palun kasuta teistsugust nime."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Vigane autentimine"
 
-#: mail/mail-errors.xml.in.h:2
-msgid "Adding a meaningful Subject line to your messages will give your recipients an idea of what your mail is about."
+#. 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."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Kas sa tõesti soovid kustutada seda kontot?"
-
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
-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:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 #, fuzzy
-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"
+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/mail-errors.xml.in.h:6
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Oled sa kindel, et soovid seda sõnumit saata HTML vormingus?"
 
-#: mail/mail-errors.xml.in.h:7
-#, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult pimekoopia adressaadid"
+#. 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"
+"{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
+msgid "_Send"
+msgstr "_Saada"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 ""
 "Kas sa tõesti soovid\n"
 "kustutada seda kontakti?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
-msgstr "Kuna \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:10
-#: widgets/misc/e-system-errors.xml.in.h:2
-msgid "Because \"{1}\"."
-msgstr "Kuna \"{1}\"."
-
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
-msgstr "Kuna \"{2}\"."
-
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "vKausta \"{0}\" ei saa lisada."
-
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kausta \"{0}\" ei saa kopeerida \"{1}\" kausta."
-
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kausta \"{0}\" ei saa luua."
+#. 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-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
-msgstr "Ajutist salvestuskataloogi ei saa luua."
+#. 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 ""
+"Täpsustus, kui püütakse saata sõnumit, millel on kirjeldatud ainult "
+"pimekoopia adressaadid"
 
-#: mail/mail-errors.xml.in.h:16
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Salvestuskataloogi ei saa luua, sest \"{1}\""
+#. 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-errors.xml.in.h:17
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Kausta \"{0}\" ei saa kustutada."
+#. 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-errors.xml.in.h:18
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
+#. 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-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei eksisteeri."
+#. 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-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kausta \"{0}\" ei saa liigutada \"{1}\" kausta."
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "Vaikekausta kasutamine mustandite jaoks?"
 
-#: mail/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "Allikat \"{1}\" ei saa avada"
+#. 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?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-msgid "Cannot open source \"{2}\"."
-msgstr "Allikat \"{2}\" ei saa avada."
+#  default charset used in mail view
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "Kasuta _vaikekodeeringut"
 
-#: mail/mail-errors.xml.in.h:23
-msgid "Cannot open target \"{2}\"."
-msgstr "Sihtkohta \"{2}\" ei saa avada."
+#. 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 "Eemaldab lõplikult sellest kaustadest kõik kustutatud sõnumid"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "\"{0}\"-a ei saa ümber nimetada \"{1}\"-ks."
+#. 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-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Süsteemikausta \"{0}\" ei saa ümber nimetada ega liigutada."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "_Puhasta"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
-msgstr "Konto muudatusi ei saa salvestada."
+#. 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 "Eemaldab lõplikult kõikidest kaustadest kõik kustutatud sõnumid"
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kataloogi \"{0}\" ei saa salvestada."
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "_Tühjenda prügikast"
 
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
-msgstr "Faili \"{0}\" ei saa salvestada."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
 
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Signatuurifaili pole võimalik avada!"
+#. 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-errors.xml.in.h:30
-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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "Signatuurifaili ei saa salvestada."
+#. 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-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "Kustuta \"{0}\"?"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Viga {0} käigus."
 
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
-msgstr "Kustuta konto?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "Loobu muudatustest?"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Viga käsu täitmisel."
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "Kas soovid tehtud muudatused salvestada?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ära kustuta"
+#. 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 "{0}"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 msgid "Enter password."
 msgstr "Sisesta parool."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 msgid "Error loading filter definitions."
 msgstr "Viga filtridefinitsioonide laadimisel."
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr "Viga käsu täitmisel."
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Kataloogi \"{0}\" ei saa salvestada."
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
-msgstr "Viga {0} käigus."
+#. 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
+msgid "Cannot save to file \"{0}\"."
+msgstr "Faili \"{0}\" ei saa salvestada."
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Salvestuskataloogi ei saa luua, sest \"{1}\""
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
+msgstr "Ajutist salvestuskataloogi ei saa luua."
+
+#. 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 "Kuna \"{1}\"."
+
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
 msgstr "Fail juba eksisteerib, kuid seda ei saa üle kirjutada."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 msgid "File exists but is not a regular file."
 msgstr "Fail juba eksisteerib, aga see ei ole tavaline fail."
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Kausta \"{0}\" ei saa kustutada."
 
-#: mail/mail-errors.xml.in.h:44
-msgid "If you delete the folder, all of its contents and its subfolders contents will be deleted permanently."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Süsteemikausta \"{0}\" ei saa kustutada."
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid "If you quit, these messages will not be sent until Evolution is started again."
-msgstr ""
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Süsteemikausta \"{0}\" ei saa ümber nimetada ega liigutada."
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Vigane autentimine"
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "Kustuta \"{0}\"?"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr "Postifiltrid automaatselt uuendatud."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. 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-errors.xml.in.h:50
-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:no-rename-folder-exists primary
+#: 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/mail-errors.xml.in.h:51
-msgid "Please make sure the following recipients are willing and able to receive HTML email: {0} Send anyway?"
-msgstr ""
+#. mail:no-rename-folder-exists 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 "Kaust nimega \"{1}\" juba eksisteerib. Palun kasuta teistsugust nime."
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Kas tõesti kustutada kaust \"{0}\" ja selle kõik alamkaustad?"
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "Kuna \"{2}\"."
 
-#: mail/mail-errors.xml.in.h:53
-msgid "System folders are required for Ximian Evolution to function correctly and cannot be renamed, moved, or deleted."
-msgstr ""
+#. mail:no-move-folder-nostore primary
+#: 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/mail-errors.xml.in.h:54
-msgid "The contact list you are sending to is configured to hide list recipients. 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:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+msgid "Cannot open source \"{2}\"."
+msgstr "Allikat \"{2}\" ei saa avada."
 
-#: mail/mail-errors.xml.in.h:55
-msgid "The following filter rule(s): {0} Used the now removed folder: \"{1}\" And have been updated."
-msgstr ""
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+msgid "Cannot open target \"{2}\"."
+msgstr "Sihtkohta \"{2}\" ei saa avada."
 
-#: mail/mail-errors.xml.in.h:56
-msgid "The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have been updated."
-msgstr ""
+#. mail:no-copy-folder-nostore primary
+#: 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."
 
-#: mail/mail-errors.xml.in.h:57
-msgid "The message was sent via the \"sendmail\" external application. Sendmail reports the following error: status 67: mail not sent. The message is stored in the Outbox folder. Check the message for errors and resend."
-msgstr ""
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kausta \"{0}\" ei saa luua."
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "Allikat \"{1}\" ei saa avada"
 
-#: mail/mail-errors.xml.in.h:59
-msgid "This folder may have been added implictly, go to the virtual folder editor to add it explictly, if required."
-msgstr ""
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
+msgstr "Konto muudatusi ei saa salvestada."
 
-#: mail/mail-errors.xml.in.h:60
-msgid "This message cannot be sent because you have not specified any Recipients"
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-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:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Sa ei saa luua ühe nimega kahte kontot."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
+msgstr "Kustuta konto?"
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
-msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Kas sa tõesti soovid kustutada seda kontot?"
 
-#: mail/mail-errors.xml.in.h:63
-msgid "Unable to open the drafts folder for this account. Use the system drafts folder instead?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
 
-#  default charset used in mail view
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "Kasuta _vaikekodeeringut"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ära kustuta"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "Vaikekausta kasutamine mustandite jaoks?"
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "Signatuurifaili ei saa salvestada."
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr ""
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "Kuna \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Sul on saatmata sõnumeid, kas tõesti soovid lõpetada?"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Signatuurifaili pole võimalik avada!"
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Sa ei saa luua ühe nimega kahte kontot."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Sisselogimine serverisse \"{0}\" kasutajana \"{0}\" ebaõnnestus."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "Loobu muudatustest?"
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr ""
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "Kas soovid tehtud muudatused salvestada?"
 
-#: mail/mail-errors.xml.in.h:71
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "Seda allkirja on muudetud, kuid seda ei ole salvestatud."
+
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr "_Muudatustest loobumine"
 
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "_Tühjenda prügikast"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "vKausta \"{0}\" ei saa redigeerida, kuna seda ei eksisteeri."
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "_Puhasta"
+#. 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
-msgstr "_Saada"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "vKausta \"{0}\" ei saa lisada."
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr "vKaustad automaatselt uuendatud."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "Postifiltrid automaatselt uuendatud."
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr "{1}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
+msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#. 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-errors.xml.h:216
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr "_Kirjuta üle"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "_Saada"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Kontrollin %s"
@@ -15748,8 +16046,7 @@ msgstr "Konto %s salvestamine"
 msgid "Refreshing folder"
 msgstr "Kausta värskendamine"
 
-#: mail/mail-ops.c:1560
-#: mail/mail-ops.c:1611
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Kataloogi puhtastamine"
 
@@ -15768,7 +16065,19 @@ msgid "Retrieving message %s"
 msgstr "Sõnumi %s vastuvõtt"
 
 #: mail/mail-ops.c:1764
+#, 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:1850
+#, 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:1900
 #, c-format
 msgid ""
@@ -15870,8 +16179,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..."
 
@@ -15908,26 +16216,26 @@ msgstr "Sisesta nimi sellele allkirja jaoks."
 msgid "Name:"
 msgstr "Nimi:"
 
-#: mail/mail-tools.c:116
+#: mail/mail-tools.c:114
 #, fuzzy, c-format
 msgid "Could not create spool directory `%s': %s"
 msgstr "Ajutise kataloogi loomine nurjus: %s"
 
-#: mail/mail-tools.c:143
+#: mail/mail-tools.c:141
 #, c-format
 msgid "Trying to movemail a non-mbox source `%s'"
 msgstr ""
 
-#: mail/mail-tools.c:278
+#: mail/mail-tools.c:276
 #, c-format
 msgid "Forwarded message - %s"
 msgstr "Edastatud sõnum - %s"
 
-#: mail/mail-tools.c:280
+#: mail/mail-tools.c:278
 msgid "Forwarded message"
 msgstr "Edastatud sõnum"
 
-#: mail/mail-tools.c:321
+#: mail/mail-tools.c:319
 #, c-format
 msgid "Invalid folder: `%s'"
 msgstr "Vigane kaust: `%s'"
@@ -15937,84 +16245,89 @@ msgstr "Vigane kaust: `%s'"
 msgid "Setting up vfolder: %s"
 msgstr "vKausta ülesseadmine: %s"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "vkaustade uri: %s uuendamine"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "vkaustade uri: %s uuendamine"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "VKaustad"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "vKausta redigeerimine"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Uus vKaust"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nägemata"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Nähtud"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Vastatud"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Mitu nägemata sõnumit"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Mitu sõnumit"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Madalaim"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Alumine"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Kõrge"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Kõrgeim"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Täna %l:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Eile %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a, %d. %b %Y"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%a, %d.%m.%Y %I:%M:%S %p"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%a, %d. %Y"
 
-#: mail/message-list.c:3124
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Sõnumiloetelu genereerimine"
 
@@ -16064,8 +16377,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"
 
@@ -16074,13 +16386,11 @@ 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: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"
 
@@ -16088,8 +16398,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"
@@ -16158,15 +16467,20 @@ 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
@@ -16185,31 +16499,33 @@ msgstr "kirjad"
 msgid "Brought to you by"
 msgstr "Teieni tõid"
 
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of Evolution.\n"
-msgstr ""
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d. %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Tundmatu viga"
 
-#: shell/e-shell.c:1081
+#: shell/e-shell.c:1101
 msgid "Invalid arguments"
 msgstr "Vigased argumendid"
 
-#: shell/e-shell.c:1083
+#: shell/e-shell.c:1103
 msgid "Cannot register on OAF"
 msgstr "OAF'i ei saa registreerida"
 
-#: shell/e-shell.c:1085
+#: shell/e-shell.c:1105
 msgid "Configuration Database not found"
 msgstr "Ei leia häälestusandmebaasi"
 
-#: shell/e-shell.c:1087
+#: shell/e-shell.c:1107
 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)"
 
@@ -16219,17 +16535,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:"
 
@@ -16241,8 +16558,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"
@@ -16255,8 +16571,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:1026
 #, c-format
 msgid "File %s does not exist"
 msgstr "Faili %s pole olemas"
@@ -16270,8 +16585,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"
@@ -16310,8 +16624,7 @@ 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:723 shell/e-shell-startup-wizard.c:571
 msgid ""
 "Please wait...\n"
 "Scanning for existing setups"
@@ -16324,8 +16637,7 @@ msgstr ""
 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:853 shell/e-shell-startup-wizard.c:698
 #, c-format
 msgid "From %s:"
 msgstr "Programmist %s:"
@@ -16343,7 +16655,7 @@ msgstr "Importijat ei saa käivitada"
 msgid "_Import"
 msgstr "_Importimine"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Sulgen ühendused..."
 
@@ -16357,7 +16669,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 ""
@@ -16383,49 +16697,60 @@ msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' on reserveeritud kaustanimed."
 
 #: shell/e-shell-window.c:336
-msgid "Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse siirdumiseks vajuta seda nuppu."
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution on hetkel võrku ühendatud.  Autonoomsesse olekusse "
+"siirdumiseks vajuta seda nuppu."
 
 #: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
+#, fuzzy
+msgid "Evolution is in the process of going offline."
 msgstr "Ximian Evolution siirdub autonoomsesse olekusse."
 
 #: shell/e-shell-window.c:349
-msgid "Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution on hetkel autonoomses olekus. Võrku ühendumiseks vajuta seda nuppu."
+#, 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."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Meiliaadressile"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Viga %s käivitamisel."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Veateatamisprogramm ei ole paigaldatud."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy (veateatamisprogramm) ei saa käivitada."
 
-#: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
 msgstr "Ximian Evolutionist"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Ühendu v_õrku"
 
-#: shell/e-shell-window-commands.c:394
-#: ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Siirdu aut_onoomsesse olekusse"
 
-#: shell/e-shell-window-commands.c:407
-#: ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Siirdu autonoomsesse olekusse"
 
@@ -16618,8 +16943,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"
 
@@ -16636,13 +16960,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution suudab importida andmeid järgnevatest failidest:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16656,84 +16980,137 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Tänud\n"
 "Ximian Evolution'i meeskond\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ära küsi enam uuesti"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-"Tänud\n"
-"Ximian Evolution'i meeskond\n"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Alusta offlainrežiimis"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Alusta onlainrežiimis"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
-#: smime/gui/certificate-manager.c:128
-#: smime/gui/certificate-manager.c:325
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Ühendamine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr ""
+"Tänud\n"
+"Ximian Evolution'i meeskond\n"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution'i kontoassistent"
+
+#. 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 ""
+
+#. 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 ""
+
+#: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 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:243 smime/gui/certificate-manager.c:409
 #: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Sertifikaati nimi"
 
-#: smime/gui/certificate-manager.c:251
-#: smime/gui/certificate-manager.c:425
+#: smime/gui/certificate-manager.c:251 smime/gui/certificate-manager.c:425
 msgid "Purposes"
 msgstr "Eesmärgid"
 
-#: smime/gui/certificate-manager.c:259
-#: smime/gui/smime-ui.glade.h:36
+#: smime/gui/certificate-manager.c:259 smime/gui/smime-ui.glade.h:36
 #: smime/lib/e-cert.c:517
 msgid "Serial Number"
 msgstr "Seerianumber"
@@ -16759,6 +17136,7 @@ msgstr "Sisesta sisesta parool '%s' jaoks"
 #  we're setting the password initially
 #  we're setting the password initially
 #  we're setting the password initially
+#. we're setting the password initially
 #: smime/gui/component.c:68
 #, fuzzy
 msgid "Enter new password for certificate database"
@@ -16771,6 +17149,7 @@ msgstr "Sisesta uus parool"
 #  FIXME: add serial no, validity date, uses
 #  FIXME: add serial no, validity date, uses
 #  FIXME: add serial no, validity date, uses
+#. FIXME: add serial no, validity date, uses
 #: smime/gui/e-cert-selector.c:121
 #, fuzzy, c-format
 msgid ""
@@ -16838,11 +17217,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:1024
 msgid "Certificate"
 msgstr "Sertifikaat"
 
@@ -16913,13 +17293,11 @@ 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:766
 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:770
 msgid "SSL Server Certificate"
 msgstr "SSL-serveri sertifikaat"
 
@@ -16952,7 +17330,8 @@ msgid "You have certificates from these organizations that identify you:"
 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 certificate authorities:"
 msgstr ""
 
 #: smime/gui/smime-ui.glade.h:45
@@ -16963,8 +17342,7 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Sinu sertifikaadid"
 
-#: smime/lib/e-cert.c:234
-#: smime/lib/e-cert.c:244
+#: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
 
@@ -17076,13 +17454,11 @@ msgstr "Teema avaliku võtme info"
 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:757 smime/lib/e-cert.c:806
 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:778 smime/lib/e-cert.c:790
 msgid "Object Signer"
 msgstr "Objekti allkirjastaja"
 
@@ -17128,8 +17504,7 @@ msgstr "CRL allkirjastaja"
 msgid "Critical"
 msgstr "Kriitiline"
 
-#: smime/lib/e-cert.c:888
-#: smime/lib/e-cert.c:891
+#: smime/lib/e-cert.c:888 smime/lib/e-cert.c:891
 msgid "Not Critical"
 msgstr "Mittekriitiline"
 
@@ -17142,8 +17517,7 @@ msgstr "Laiendused"
 msgid "%s = %s"
 msgstr "%s = %s"
 
-#: smime/lib/e-cert.c:1039
-#: smime/lib/e-cert.c:1159
+#: smime/lib/e-cert.c:1039 smime/lib/e-cert.c:1159
 msgid "Certificate Signature Algorithm"
 msgstr "Sertifikaadi allkirja algoritm"
 
@@ -17227,8 +17601,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"
 
@@ -17236,8 +17609,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"
 
@@ -17253,8 +17625,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"
 
@@ -17262,10 +17633,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"
@@ -17315,24 +17684,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:25
 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..."
 
@@ -17340,13 +17702,13 @@ 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"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Salvesta VKaardina"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17397,8 +17759,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"
 
@@ -17406,8 +17767,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"
 
@@ -17419,8 +17779,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"
 
@@ -17460,8 +17819,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"
@@ -17482,19 +17840,16 @@ 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-message-composer.xml.h:3 ui/evolution-signature-editor.xml.h:2
 #: ui/evolution.xml.h:3
 msgid "Close"
 msgstr "Sulge"
@@ -17503,15 +17858,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:11
 msgid "Main toolbar"
 msgstr "Peatööriistariba"
 
@@ -17519,27 +17871,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"
@@ -17553,13 +17901,11 @@ 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-signature-editor.xml.h:13 ui/evolution-subscribe.xml.h:11
 #: ui/evolution.xml.h:27
 msgid "_File"
 msgstr "_Fail"
@@ -17568,8 +17914,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"
 
@@ -17581,8 +17926,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"
@@ -17638,13 +17982,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"
 
@@ -17729,13 +18071,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"
 
@@ -17756,7 +18096,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
@@ -17767,8 +18108,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"
 
@@ -17816,8 +18156,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"
 
@@ -17825,14 +18164,12 @@ 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:4
 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-message-composer.xml.h:41 ui/evolution-subscribe.xml.h:9
 #: ui/evolution.xml.h:26
 msgid "_Close"
 msgstr "Sul_ge"
@@ -18075,7 +18412,8 @@ msgid "Open the selected message in a new window"
 msgstr "Avab valitud sõnumi uues aknas"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Valitud sõnumi uuesti saatmiseks ava see sõnumiredaktoris"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18194,61 +18532,48 @@ msgstr "VKaust _teema järgi..."
 msgid "_Attached"
 msgstr "_Manustatud"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopeeri kausta"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Loo sõnumi baasil filter"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Liigu"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Inline"
 msgstr "Edasta tekst&ina..."
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Suurem"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Sõnumi kuvamine"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Tõsta kausta"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Järgmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Tavaline kuva"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Sõnumi _avamine"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Eelmine sõnum"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Tsiteeritud"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Uuestisaatmine..."
-
-#: ui/evolution-mail-message.xml.h:129
-#: ui/evolution.xml.h:34
+#: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "T_ööriistad"
 
@@ -18264,8 +18589,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"
 
@@ -18281,8 +18605,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"
 
@@ -18649,6 +18972,11 @@ msgstr "_Kiirviide"
 msgid "_Send / Receive"
 msgstr "_Saada / Võta vastu"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Uus _aken"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Firma järgi"
@@ -18714,10 +19042,6 @@ msgstr "_Tähtajaga"
 msgid "With _Status"
 msgstr "_Staatusega"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Ülesanded"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18737,7 +19061,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"
@@ -18776,8 +19101,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"
 
@@ -18838,16 +19162,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"
 
@@ -18864,8 +19185,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"
 
@@ -18881,31 +19201,32 @@ msgstr "Muu..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76
-#: widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolutioni viga"
 
-#: widgets/misc/e-error.c:78
-#: widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Evolutioni hoiatus"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 msgid "Evolution Information"
 msgstr "Evolutioni info"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 msgid "Evolution Query"
 msgstr "Evolutioni päring"
 
 #  setup a dummy error
-#: widgets/misc/e-error.c:430
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
 #, 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"
@@ -18924,7 +19245,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
@@ -18973,18 +19296,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..."
 
@@ -19000,8 +19320,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"
 
@@ -19021,29 +19340,25 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "_Otsing"
 
-#: widgets/misc/e-system-errors.xml.in.h:1
-msgid "Because \"{1}\""
-msgstr "Kuna \"${1}\""
-
-#: widgets/misc/e-system-errors.xml.in.h:3
-msgid "Cannot open file \"{0}\"."
-msgstr "Faili \"{0}\" ei saa avada."
-
-#: widgets/misc/e-system-errors.xml.in.h:4
-msgid "Cannot save file \"{0}\"."
-msgstr "Faili \"{0}\" pole võimalik salvestada."
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr "Fail \"{0}\" on juba olemas."
 
-#: widgets/misc/e-system-errors.xml.in.h:5
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
 msgid "Do you wish to overwrite it?"
 msgstr "Kas sa soovid seda üle kirjutada?"
 
-#: widgets/misc/e-system-errors.xml.in.h:6
-msgid "File exists \"{0}\"."
-msgstr "Fail \"{0}\" on juba olemas."
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
+msgstr "Faili \"{0}\" pole võimalik salvestada."
 
-#: widgets/misc/e-system-errors.xml.in.h:8
-msgid "_Overwrite"
-msgstr "_Kirjuta üle"
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
+msgstr "Faili \"{0}\" ei saa avada."
 
 #: widgets/misc/e-task-widget.c:211
 #, c-format
@@ -19055,3 +19370,83 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmis)"
 
+#, fuzzy
+#~ msgid "UID of the contacts source that the view will display"
+#~ msgstr "URI, mida kalender näitab"
+
+#, fuzzy
+#~ msgid "The URI that the address book will display"
+#~ msgstr "URI, mida kaustalehitseja näitab"
+
+#, fuzzy
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolutioni aadressiraamatu aadressikuva"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Ei saa gnome-vfs initsialiseerida"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Ei saa avada kausta '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, mida kalender näitab"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Vaate tüüp näitamiseks"
+
+#~ msgid "Display a message"
+#~ msgstr "Näita teadet"
+
+#  create the dialog
+#  create the dialog
+#~ msgid "Select source"
+#~ msgstr "Vali lähte "
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalendrifaili ei saa uuendada!\n"
+
+# !PARANDA!
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution'i kalendrivaa"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution'i kalendrivaa"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Kuvatava ülesannete kausta URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Ei saa laadida '%s' ülesandeid"
+
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
+#~ "\""
+#~ msgstr "Kausta nimi \"%s\" on vigane kuna see sisaldab \"%c\" kirjamärki"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Sõnumi %s puhverdamine ebaõnnestus: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "'%s' avamine kirjutamiseks ebaõnnestus: %s"
+
+# !PARANDA!
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Saa&detud kirjade kaust:"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, mida kalender näitab"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Uuestisaatmine..."
+
+#~ msgid "Because \"{1}\""
+#~ msgstr "Kuna \"${1}\""
diff --git a/po/eu.po b/po/eu.po
index 78b0f39de9..7f7daa70ec 100644
--- a/po/eu.po
+++ b/po/eu.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: eu\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -21,6 +21,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution-en helbide-liburua"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "kontaktu-goiburua: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution-en txarteltxoa"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "uneko helbide-liburuaren karpeta"
@@ -41,14 +49,6 @@ msgstr " txartelak"
 msgid " card"
 msgstr " txartel"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "kontaktu-goiburua: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution-en txarteltxoa"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Sinkronizazio-helbide lehenetsia:"
@@ -63,63 +63,20 @@ msgstr "Ezin izan da helbide-liburua kargatu"
 msgid "Could not read pilot's Address application block"
 msgstr "Ezin izan da pilot-aren Helbidearen aplikazio-blokea irakurri"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Osatze automatikoa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Ziurtagiria:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Konfiguratu osatze automatikoa hemen"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktuak"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution-en helbide-liburua"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution-en helbide-liburuko helbide-leihoa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution-en helbide-liburuaren osagaia"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution-en helbide-liburuaren karpeten ikustailea"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP zerbitzarian anonimoki sartzea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Huts egin du autentifikatzean.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -160,41 +117,45 @@ msgstr "_Kontaktuak:"
 msgid "Create a new contacts group"
 msgstr "Sortu lasterbide-talde berria"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Errorea eskema-informazioa eskuratzean"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migratzen..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' migratzen:"
@@ -202,8 +163,8 @@ msgstr "'%s' migratzen:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -211,7 +172,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Pertsonala"
@@ -258,20 +219,41 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP zerbitzarian anonimoki sartzea"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Huts egin du autentifikatzean.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Helbide-liburu berria"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sIdatzi %s(r)en pasahitza (%s erabiltzailea)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -291,6 +273,60 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Osatze automatikoa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontaktuak"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Ziurtagiria:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfiguratu osatze automatikoa hemen"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution-en helbide-liburua"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution-en helbide-liburuko helbide-leihoa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution-en helbide-liburuko helbide-ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution-en helbide-liburuko txartel-ikustailea"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution-en helbide-liburuaren osagaia"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution-en S/MIME ziurtagiri kudeaketaren kontrola"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution-en karpeta-ezarpenak konfiguratzeko kontrola"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  E_rakutsi onartzen diren oinarriak "
@@ -312,6 +348,7 @@ msgstr "  E_rakutsi onartzen diren oinarriak "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -383,7 +420,7 @@ msgstr "_Kontaktuak:"
 msgid "Address Book Properties"
 msgstr "Helbide-liburuaren propietateak"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Beti"
@@ -398,110 +435,100 @@ msgid "Basic"
 msgstr "Oinarrizkoa"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Koloreak"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Konektatzea"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Izen bereizia (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Izen bereizia (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Des_karga-muga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Onartutako Bilaketa Oinarriak"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Inoiz ere ez"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Bat"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Aukeratu kolorea"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Bilaketa-_esparrua: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Bilaketa-oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Bilaketa-oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Bilaketa-_esparrua: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Bilaketa"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -510,7 +537,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -527,7 +554,7 @@ msgstr ""
 "lanean, Evolution-ek ez dauka SSL/TLS erabili beharrik, \n"
 "zure konexioa dagoeneko segurua baita."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -540,19 +567,19 @@ msgstr ""
 "esan nahi du zure konexioa ez dela segurua izango, eta segurtasun-zuloak "
 "izan ditzakezula."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Onartutako Bilaketa Oinarriak"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -563,7 +590,7 @@ msgstr ""
 "bilaketa-oinarria.\n"
 " Hutsik uzten baduzu, bilaketa direktorio-zuhaitzaren erroan hasiko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -578,7 +605,7 @@ msgstr ""
 "\"one\" bilaketa-esparruak oinarritik maila bat beherago arteko sarrerak "
 "bakarrik hartuko ditu.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -586,7 +613,7 @@ msgstr ""
 "LDAP zerbitzariaren izen osoa eman behar da. Adibidez, \"ldap.nireenpresa.com"
 "\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -597,7 +624,7 @@ msgstr ""
 "baduzu, \n"
 "helbide-liburua mantso ibiliko da."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -607,7 +634,7 @@ msgstr ""
 "hemen \"Helbide elektronikoa\" ezartzen bada, anonimoki sartu behar dela "
 "LDAP zerbitzarian."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -616,7 +643,7 @@ msgstr ""
 "Hau da zerbitzariak zure Evolution karpeta-zerrendan izango duen izena.\n"
 "Bistaratzeko bakarrik erabiliko da. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -628,128 +655,136 @@ msgstr ""
 "estandarren zerrenda bat ematen da. Galdetu sistema-administratzaileari\n"
 "zein ataka ezarri behar duzun."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Ordu-formatua:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "_Erabili SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Erabili izen bereizia (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Erabili helbide elektronikoa"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Ahal den guztietan"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktuak:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Des_karga-muga:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Helbide elektronikoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Saioa hasteko metodoa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Ataka-zenbakia:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Lehentasuna:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Bilaketa-oinarria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Zerbitzariaren izena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Zerbitzaria:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Denbora-muga (minututan):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "E_rabili konexio segurua (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "txartel"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "konektatzeko fitxa"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "fitxa orokorra"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minutu"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "bilaketa-fitxa"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution-en helbide-liburuko izenak hautatzeko interfazea"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Kendu denak"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Kendu"
 
+#: 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 "Izena"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Kendu denak"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Ikusi kontaktuen zerrenda"
@@ -772,23 +807,15 @@ msgstr "Gehitu kontaktuei"
 msgid "Unnamed Contact"
 msgstr "Kontaktu izengabea"
 
-#: 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
-msgid "Name"
-msgstr "Izena"
-
 #: 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
 msgid "Source"
 msgstr "Iturburua"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution-en helbide-liburuko izenak hautatzeko interfazea"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -860,143 +887,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "_2. helbidea:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "Helbi_dea:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Urteurrena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Laguntzailea"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "U_rtebetetzea:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bologna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "E_gutegia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Herria:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Enpresakoa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktu-editorea"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Es_tatua:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Saila:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Libre/okupatuta URLa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Izen-abizenak..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Etxekoa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Mezua"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Fusionatu helbide elektronikoa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Zuzendaria"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Goitizena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Oharrak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Bestelakoa"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Posta-kutxa:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1024,9 +1051,9 @@ msgstr "Orrialdea"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Lanekoa"
@@ -1059,23 +1086,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ziur zaude kontaktu hauek\n"
+"ezabatu nahi dituzula?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ziur zaude kontaktu hau\n"
+"ezabatu nahi duzula?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Editagarria"
 
@@ -2054,98 +2097,116 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbawe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Zerbitzua prest"
-
-#: 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 "Kokalekua:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Erabiltzaile-izena:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Taldea"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Iturburua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontaktu berria"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Eremu editagarriak"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Aldatuta"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Kontaktu hau kategoria hauetakoa da:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Hautatu ondorengo aukeretako bat"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Konexio hauek aktibo daude:"
+
+#: 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-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 "Zerbitzua prest"
+
+#: 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 "Kokalekua:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Erabiltzaile-izena:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Gehitu kontaktua azkar"
@@ -2163,22 +2224,6 @@ msgstr "_Izen-abizenak:"
 msgid "E-_mail:"
 msgstr "_Helb. el:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ziur zaude kontaktu hauek\n"
-"ezabatu nahi dituzula?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ziur zaude kontaktu hau\n"
-"ezabatu nahi duzula?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. helbidea:"
@@ -2329,8 +2374,8 @@ msgstr "kontaktu-zerrendaren editorea"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Liburua"
 
@@ -2391,6 +2436,457 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Bilaketa aurreratua"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+#, fuzzy
+msgid "map"
+msgstr "Amapala"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Kideak"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Helb. el."
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Erakundea"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Taldea"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefonoa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#, fuzzy
+msgid "Fax"
+msgstr "Lan fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Lanekoa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Telefono mugikorra"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Pertsonala"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Oharra"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Kar_gua:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Helb. el."
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Etxeko faxa"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Behar bezala egin da"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Biltegia deskonektatuta"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Baimena ukatuta"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, 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
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokoloa ez da onartzen"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Bertan behera utzita"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ezin izan da objektua eguneratu"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Autentifikazioak huts egin du"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Autentifikazioa behar da"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Ez dago horrelako mezurik"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Beste errore bat"
+
+#: 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 ""
+"Ezin izan da helbide-liburu hori ireki.  Egiaztatu bide-izena ondo dagoela "
+"eta sarbidea baduzula."
+
+#: 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 ""
+"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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Kontsulta honetan txartel gehiago datoz bat, konfigurazioaren\n"
+"arabera zerbitzariak itzul ditzakeenak edo Evolution-ek bistara\n"
+"ditzakeenak baino. Zehaztu gehiago bilaketa, edo gehitu emaitzen\n"
+"gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
+"hobespenetan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Kontsulta egiteko denborak zerbitzariaren muga edo helbide-liburuan\n"
+"konfiguratuta duzuna gainditu du.  Zehaztu gehiago bilaketa,\n"
+"edo gehitu denbora-muga, helbide-liburu honen\n"
+"direktorio-zerbitzariaren hobespenetan."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+msgid "Error adding list"
+msgstr "Errorea zerrenda gehitzean"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Errorea txartela gehitzean"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Errorea zerrenda aldatzean"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Errorea txartela aldatzean"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Errorea zerrenda kentzean"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Errorea txartela kentzean"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"%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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s badago lehendik\n"
+"Gainidatzi nahi duzu?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "zerrenda"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Eraman txartela hona:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopiatu txartela hemen:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Eraman txartelak hona:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopiatu txartelak hemen:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Hautatu kontaktuak helbide-liburutik"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "VCard anitz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s - VCard-a"
+
+#.
+#. * 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 "(bat ere ez)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Helb. el. nagusia"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "2. helb. el."
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "3. helb. el."
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Hautatu ekintza bat"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Sortu \"%s\" kontaktu berria"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Gehitu helbidea lehendik dagoen \"%s\" kontaktuari"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Helbide-liburuan kontsulta egiten..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Editatu kontaktu-informazioa"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Fusionatu helbide elektronikoa"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "eta beste txartel bat."
+msgstr[1] "eta beste txartel bat."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Erakutsi _goiburu osoak"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Gorde kontaktua VCard gisa"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gorde helbide-liburuan"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2406,8 +2902,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Kontsulta"
 
@@ -2462,9 +2958,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Gorde VCard gisa"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2532,7 +3029,7 @@ msgid "Cut"
 msgstr "Ebaki"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2543,18 +3040,8 @@ msgstr "Kopiatu"
 msgid "Paste"
 msgstr "Itsatsi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Ezabatu"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Uneko ikuspegia"
 
@@ -2570,7 +3057,7 @@ msgstr ""
 " Berriro erabili ahal izateko, Evolution berrabiarazi beharko duzu"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Edozein kategoria"
@@ -2611,21 +3098,6 @@ msgstr "Kategoriak"
 msgid "Company Phone"
 msgstr "Enpresako telefonoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Helb. el."
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "2. helb. el."
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "3. helb. el."
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Deitura"
@@ -2665,29 +3137,14 @@ msgstr "Jordania"
 msgid "Manager"
 msgstr "Zuzendaria"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Telefono mugikorra"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Goitizena"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Oharra"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Bulegoa"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Erakundea"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Beste fax bat"
@@ -2741,21 +3198,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Web gunea"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Zabalera"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Altuera"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Fokua du"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Hautatuta"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Kurtsorea du"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Eremua"
@@ -2772,10 +3237,6 @@ msgstr "Testu-eredua"
 msgid "Max field name length"
 msgstr "Eremu-izenaren geh. luzera"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Zutabe-zabalera"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2804,431 +3265,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Moldagailua"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Hautatuta"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Kurtsorea du"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-#, fuzzy
-msgid "map"
-msgstr "Amapala"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Kideak"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Helb. el."
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Taldea"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefonoa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#, fuzzy
-msgid "Fax"
-msgstr "Lan fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Lanekoa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Pertsonala"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Kar_gua:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Etxeko faxa"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Behar bezala egin da"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Biltegia deskonektatuta"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Baimena ukatuta"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Ez da txartela aurkitu"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, 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:60
-msgid "Protocol not supported"
-msgstr "Protokoloa ez da onartzen"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Bertan behera utzita"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Ezin izan da objektua eguneratu"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Autentifikazioak huts egin du"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Autentifikazioa behar da"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Ez dago horrelako mezurik"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Beste errore bat"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Ezin izan da helbide-liburu hori ireki.  Egiaztatu bide-izena ondo dagoela "
-"eta sarbidea baduzula."
-
-#: 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 LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Ezin da helbide-liburua ireki"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Kontsulta honetan txartel gehiago datoz bat, konfigurazioaren\n"
-"arabera zerbitzariak itzul ditzakeenak edo Evolution-ek bistara\n"
-"ditzakeenak baino. Zehaztu gehiago bilaketa, edo gehitu emaitzen\n"
-"gehienezko kopurua, helbide-liburu honen direktorio-zerbitzariaren\n"
-"hobespenetan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Kontsulta egiteko denborak zerbitzariaren muga edo helbide-liburuan\n"
-"konfiguratuta duzuna gainditu du.  Zehaztu gehiago bilaketa,\n"
-"edo gehitu denbora-muga, helbide-liburu honen\n"
-"direktorio-zerbitzariaren hobespenetan."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Kontsulta ez da behar bezala egin."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Aldaketak gorde nahi dituzu?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Ez"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Errorea zerrenda gehitzean"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Errorea txartela gehitzean"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Errorea zerrenda aldatzean"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Errorea txartela aldatzean"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Errorea zerrenda kentzean"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Errorea txartela kentzean"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"%d txartel irekitzen badituzu, %d leiho irekiko dira.\n"
-"Ziur zaude txartel horiek guztiak bistaratu nahi dituzula?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s badago lehendik\n"
-"Gainidatzi nahi duzu?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Gainidatzi"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "zerrenda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Eraman txartela hona:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopiatu txartela hemen:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Eraman txartelak hona:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopiatu txartelak hemen:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Hautatu kontaktuak helbide-liburutik"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "VCard anitz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s - VCard-a"
-
-#.
-#. * 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 "(bat ere ez)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Helb. el. nagusia"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Hautatu ekintza bat"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Sortu \"%s\" kontaktu berria"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Gehitu helbidea lehendik dagoen \"%s\" kontaktuari"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Helbide-liburuan kontsulta egiten..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editatu kontaktu-informazioa"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Fusionatu helbide elektronikoa"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "eta beste txartel bat."
-msgstr[1] "eta beste txartel bat."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Erakutsi _goiburu osoak"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Gorde kontaktua VCard gisa"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Gorde helbide-liburuan"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Zutabe-zabalera"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3272,11 +3311,6 @@ msgstr "Evolution-en Vcard inportatzailea"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Inprimatu gutun-azala"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3288,6 +3322,11 @@ msgstr "Inprimatu hautatutako kontaktuak"
 msgid "Print contact"
 msgstr "Inprimatu hautatutako kontaktuak"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Inprimatu gutun-azala"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3474,18 +3513,6 @@ msgstr "K_ontaktuen zerrenda"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Ezin da mezua ireki"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Ez da txartela aurkitu"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3543,6 +3570,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Ezin da mezua ireki"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Ez da txartela aurkitu"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Errorea helbide-liburu lehenetsia kargatzean."
@@ -3555,11 +3594,12 @@ msgstr "Sarrera-fitxategia"
 msgid "No filename provided."
 msgstr "Ez da fitxategi-izenik eman."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Zerrenda izengabea"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Idatzi pasahitza"
@@ -3592,120 +3632,55 @@ msgstr "Lehentasun lehenetsia:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Ezin izan da pilot-aren Egitekoen aplikazio-blokea irakurri"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Egutegia eta zereginak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Egutegia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfiguratu hemen zure ordu-zona, egutegia eta zereginen zerrenda "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution-en egutegia eta zereginak"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution-en egutegia konfiguratzeko kontrola"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution-en egutegiko antolaketako mezuen ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution-en egutegi-ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution-en egutegiaren/zereginen editorea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution-en zeregin-ikustailea"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution-en egutegiaren eta zereginen osagaia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution-en probaren osagaia"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zereginak"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Hasi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Amaitu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution-en alarma"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s alarma"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Itxi"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Alarma-er_repikapena"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Alarma-errepikaren denbora (minututan)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Editatu hitzordua"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Alarma-er_repikapena"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Ireki"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Ez dago azalpen erabilgarririk."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3714,12 +3689,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Kontuz"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3731,7 +3706,7 @@ msgstr ""
 "oroigarri hau mezua bidaltzeko konfiguratuta dago.  \n"
 "dago. Oroigarri normala bistaratuko da."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3748,19 +3723,19 @@ msgstr ""
 "\n"
 "Ziur zaude programa hori exekutatu nahi duzula?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ez galdetu programa horri buruz berriro."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution-en egutegiaren alarma bidezko jakinarazpen-zerbitzua"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ezin izan da Bonobo hasieratu"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Ezin izan da gnome-vfs hasieratu"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Ezin izan da sortu alarma bidezko jakinarazpen-zerbitzuaren fabrika"
 
@@ -3873,61 +3848,46 @@ 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 "Eskatu _berrespena elementuak ezabatzeko"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Eskatu _berrespena elementuak ezabatzeko"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Ezabatu osatutako zereginak"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Laburpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Azalpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Iruzkinak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Azalpenak hau dauka"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Sailkatu gabeak"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Egutegia"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3939,123 +3899,134 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "hau baino txikiagoa ematen du"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "egun"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %Y %B %d"
 
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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, %b %d"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%Y %B %d"
 
 #. 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:464
+#: 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 "%B %d"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Kaledonia Berria"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Propietateak..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Egutegia kargatzen ari da..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Hitzordua"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Sortu hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Bilera"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Sortu bilera-eskaera berria"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Egun osoko hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Egun _osoko hitzordua"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Sortu egun osoko hitzordu berria"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Kaledonia Berria"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "E_gutegia:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Sortu karpeta berria"
@@ -4086,15 +4057,36 @@ msgstr "Asteko ikuspegia"
 msgid "Month View"
 msgstr "Hileko ikuspegia"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Laburpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Iruzkinak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Azalpenak hau dauka"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Sailkatu gabeak"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Errorea egutegia irekitzean"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metodo hori ez da onartzen egutegia irekitzean"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Egutegia irekitzeko baimena ukatu egin da"
 
@@ -4103,19 +4095,6 @@ msgstr "Egutegia irekitzeko baimena ukatu egin da"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Ezin izan da '%s'(e)ko karpeta ireki"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "Egutegiak bistaratuko duen URIa"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Bistaratzeko ikuspegi-mota"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Audio alarmaren aukerak"
@@ -4181,7 +4160,7 @@ msgstr "bider, maiztasun honekin:"
 msgid "hours"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4200,14 +4179,14 @@ msgstr "Oinarriak"
 msgid "Date/Time:"
 msgstr "Data/Ordua:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Bistaratu mezua"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Jo soinua"
 
+#: 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 "Oroigarriak"
@@ -4222,6 +4201,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
 msgid "Summary:"
 msgstr "Laburpena:"
@@ -4260,10 +4240,109 @@ msgstr "minutu"
 msgid "start of appointment"
 msgstr "hitzordu-hasiera baino"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Kaledonia Berria"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Zereginen zerrenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Kaledonia Berria"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Mota:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URLa:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "aste"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Gaituta"
 
@@ -4279,19 +4358,19 @@ msgstr "Ez inportatu"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Desgaitu"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Gaitu"
 
@@ -4316,163 +4395,177 @@ msgid "60 minutes"
 msgstr "60 minutu"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Abisuak"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Falta:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Falta:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Zereginen zerrenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Falta:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Falta:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Egutegiaren eta zereginen ezarpenak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Atzeratutako zereginen kolorea"
 
-#: 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 "Gaurko zereginen kolorea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Eg_unaren amaiera:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "egun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Bistaratzea"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Gaitu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Ostirala"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "ordu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "minutu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Astelehena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_ig."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Larunbata"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Era_kutsi oroigarria hitzordua hasi baino"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "E_rakutsi aste-zenbakiak data-nabigatzailean"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Igandea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "_Gaurko zereginak:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "o_g."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Zereginen zerrenda"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Osteguna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Ordua"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "_Ordu-zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Ordu-formatua:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Asteartea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Astearen _hasiera:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Asteazkena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Lan-astea"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Lanegunak:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 ordu (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 ordu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Gehitu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Eskatu _berrespena elementuak ezabatzeko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Konprimatu asteburuak hileko ikuspegian"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Egunaren hasiera:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Bistaratzea"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4482,145 +4575,46 @@ msgstr "_Bistaratzea"
 msgid "_Edit"
 msgstr "E_ditatu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Libre/okupatuta eskaera"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_or."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Orokorra"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Ezkutatu _burututako zereginak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_al."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Atzeratutako zereginak:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_lr."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Erakutsi hitzorduen amaiera-orduak asteko eta hileko ikuspegietan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Or_duen zatiketa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "a_r."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "a_z."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "lehenago"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Kaledonia Berria"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Zereginen zerrenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar errorea"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Kaledonia Berria"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Mota:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URLa:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "aste"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4702,81 +4696,81 @@ msgstr "%s  Aldaketak egin dituzu. Aldaketak ahaztu eta editorea eguneratu?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ez duzu aldaketarik egin; editorea eguneratu?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Balidazio-errorea: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Eginda "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Falta: "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Falta: "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Ezin izan da objektua eguneratu"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Editatu hitzordua"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Hitzordua - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Zeregina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Egunkariko sarrera - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Laburpenik ez"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gorde honela..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Eguneratze bat heltzen bada, honi egindako aldaketak galdu egin litezke"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Ezin da uneko bertsioa lortu!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Balidazio-errorea: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Eginda "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Falta: "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Falta: "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4905,27 +4899,27 @@ msgstr "Delegatu:"
 msgid "Enter Delegate"
 msgstr "Sartu delegatua"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Hitzordua"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Oroigarria"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Errepikapena"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Antolaketa"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Bilera"
 
@@ -4938,7 +4932,7 @@ msgstr "Mugaeguna hasiera-eguna baino lehenagokoa da!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Hasierako data gaizki dago"
 
@@ -5024,10 +5018,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5046,15 +5040,15 @@ msgstr "Antolatzailea behar da."
 msgid "At least one attendee is required."
 msgstr "Partaide bat behar da gutxienez."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegatu ..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5337,26 +5331,18 @@ msgstr "_Ez gorde"
 msgid "Save Event"
 msgstr "Gorde gertaera"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Hautatu inportatzailea"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Bidalketa-helburua"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Egutegia"
+msgid "_Destination"
+msgstr "Ezabatu karpeta hau"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
 msgstr "Zereginen zerrenda"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5387,38 +5373,44 @@ msgid "% _Complete"
 msgstr "Osatuta %"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Eginda"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Handia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Egiten ari da"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Txikia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Ez da hasi"
 
@@ -5455,11 +5447,11 @@ msgstr "_Web orriaren helbidea:"
 msgid "Assignment"
 msgstr "Esleipena"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Mugaeguna gaizki dago"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ezin da helbide-liburua ireki"
@@ -5468,8 +5460,9 @@ msgstr "Ezin da helbide-liburua ireki"
 msgid "Con_fidential"
 msgstr "Kon_fidentziala"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Azalpena:"
@@ -5624,101 +5617,56 @@ msgstr "%s - %s"
 msgid "%s for an unknown trigger type"
 msgstr "abiarazle-mota ezezagunaren %s"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Publikoa"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Pribatua"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Konfidentziala"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Amaiera-eguna"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Hasiera-data"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Laburpena"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Okupatuta"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "I"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Egin klik zeregina gehitzeko"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "H"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Izengabea"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Ha_siera-data:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "M"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Mugaeguna:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Egoera:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Lehentasuna:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ez"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Web orriaren helbidea:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ezezaguna"
+#: 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 "Publikoa"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Errepikatua"
+#: 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 "Pribatua"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Esleitua"
+#: 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 "Konfidentziala"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5764,17 +5712,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: 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 "Okupatuta"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Hautatutako objektuak ezabatzen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Ireki"
 
@@ -5784,41 +5741,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Itsatsi"
 
@@ -5876,78 +5834,157 @@ msgstr "Lehentasuna"
 msgid "Start date"
 msgstr "Hasiera-data"
 
+#: 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 "Laburpena"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Zereginen ordena"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Hitz_ordu berria..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Egun osoko gertaera _berria"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Bilera berria"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Hautatu _haria"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Argitaratu libre/okupatuta informazioa"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiatu karpeta honetan..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Eraman karpeta honetara..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Antolatu Bilera..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Birbidali iCalendar gisa..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Ezabatu _agerraldi hau"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Ezabatu agerraldi _guztiak"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "_Joan gaurko egunera"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Joan data jakin batera..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Ezarpenak..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Amaiera-eguna"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Ezezaguna"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Errepikatua"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Ez"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "H"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "M"
+
+#: 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 ""
+"Kokaleku geografikoa formatu honetan idatzi behar da: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5971,36 +6008,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutu-zatiketa"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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, %B %d"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 "%b %d"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutu-zatiketa"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6108,10 +6145,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Bat ere ez</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Egoera:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6141,7 +6174,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ados"
 
@@ -6354,59 +6387,55 @@ msgstr "Eranskinak ez du baliozko egutegi-mezurik"
 msgid "The attachment has no viewable calendar items"
 msgstr "Eranskinak ez du ikusteko moduko egutegi-elementurik"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Eguneratzea osatu da\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Errorea izan da CORBA sisteman\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objektua ezin izan da aurkitu\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Partaidearen egoera eguneratu da\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Partaidearen egoera ezin izan da eguneratu\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Kentzea osatu da"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Elementua bidali da!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Elementua ezin izan da bidali!\n"
 
@@ -6523,28 +6552,6 @@ msgstr "Delegatua"
 msgid "In Process"
 msgstr "Egiten ari da"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y.eko %Bren %da"
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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, %Y/%m/%d"
-
-#. 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 "%Y/%m/%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Bulegotik kanpo"
@@ -6605,7 +6612,34 @@ msgstr "Bilera _hasteko ordua:"
 msgid "Meeting _end time:"
 msgstr "Bilera amai_tzeko ordua:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %Y.eko %Bren %da"
+
+#. 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, %Y/%m/%d"
+
+#. 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 "%Y/%m/%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Idatzi %s(r)en pasahitza"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6614,21 +6648,19 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6637,53 +6669,109 @@ msgstr ""
 "Errorea %s(e)n:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Irudi-kargatzea"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Zereginak egiten..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Hautatutako objektuak ezabatzen..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Betiko borratzen"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zereginak"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Hitzordurik ez."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "%s - zereginak irekitzen"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Ireki honekin: %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Egutegia eta zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfiguratu hemen zure ordu-zona, egutegia eta zereginen zerrenda "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution-en egutegia eta zereginak"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution-en egutegia konfiguratzeko kontrola"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution-en egutegiko antolaketako mezuen ikustailea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution-en egutegiaren/zereginen editorea"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution-en egutegiaren eta zereginen osagaia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution-en probaren osagaia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Egutegia"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zereginak"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "apirila"
@@ -6821,6 +6909,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Egutegia irekitzeko baimena ukatu egin da"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Ezin da helbide-liburua ireki"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7040,7 +7145,7 @@ msgid "Contacts: "
 msgstr "Kontaktuak: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Inprimatzeko aurrebista"
 
@@ -7052,68 +7157,78 @@ msgstr "Inprimatu elementua"
 msgid "Print Setup"
 msgstr "Prestatu inprimatzeko"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d hautatuta"
+msgstr[1] "%d hautatuta"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Irudi-kargatzea"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Zeregina"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Zeregin berria"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Zereginen zerrenda"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sortu zeregin berria"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7125,11 +7240,11 @@ msgstr ""
 "\n"
 "Benetan borratu nahi dituzu?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ez galdetu berriro."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Inprimatu zereginak"
 
@@ -8778,7 +8893,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "'%s' karpeta prestatzen lineaz kanpo erabiltzeko"
@@ -8871,33 +8986,6 @@ msgstr "Argumentu baliogabeak: (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Errorea iragazki-bilaketa exekutatzean: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Errorea bilaketa-adierazpena exekutatzean: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Kontsulta egiten goiburu ezezagunean: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8930,7 +9018,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "%d mezu eskuratzen"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Ezin izan da bilaketa-adierazpena analizatu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Errorea bilaketa-adierazpena exekutatzean: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(bat-etorri-guztiekin)ek emaitza boolear bakarra behar du"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Kontsulta egiten goiburu ezezagunean: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8941,15 +9074,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Huts egin du gpg erabiltzaile-IDaren aholkua analizatzean."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Errorea gpg pasaesaldi-eskaera analizatzean."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8958,28 +9091,28 @@ msgstr ""
 "Pasaesaldia behar da erabiltzaile honen gakoa \n"
 "desblokeatzeko: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Bertan behera utzita."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Huts egin du gako sekretua desblokeatzean: 3 pasaesaldi oker eman dira."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Ustekabeko erantzuna GnuPG-tik: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Huts egin du enkriptatzean: Ez da baliozko hartzailerik zehaztu."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8990,89 +9123,69 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Huts egin du GPG ezartzean %s mezuan: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Huts egin du gpg exekutatzean: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Huts egin du gpg exekutatzean."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Ezin da egiaztatu mezuaren sinadura: ezin izan da aldi baterako fitxategia "
 "sortu: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ezin da egiaztatu mezuaren sinadura: ezin izan da aldi baterako fitxategia "
 "sortu: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Hau digitalki sinatutako mezu-zatia da"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indexatu gorputzaren edukia"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Ezin da mezua eskuratu editoretik"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik sortu: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
-
-#: 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 "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ezin izan da '%s' blokeatu"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9095,6 +9208,26 @@ msgstr "Huts egin du fcntl(2) erabiliz blokeatzean: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Huts egin du flock(2) erabiliz blokeatzean: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ezin da blokeo-laguntzailearentzat kanalizaziorik sortu: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ezin da blokeo-laguntzailea sardetu: %s"
+
+#: 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 "Ezin izan da '%s' blokeatu: protokolo-errorea blokeo-laguntzailearekin"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ezin izan da '%s' blokeatu"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9353,7 +9486,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Zerbitzariak autentifikazio-erantzun txarra eman du."
 
@@ -9556,7 +9689,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Ziurtagiri-IDa:"
 
 #: camel/camel-smime-context.c:360
@@ -9573,7 +9706,7 @@ msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
 msgid "Failed to add data to CMS encoder"
 msgstr "Huts egin du `Bidalitakoen' karpeta lokalean eranstean: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Huts egin du autentifikatzean.\n"
@@ -9644,99 +9777,99 @@ msgstr "Ezin da karpeta atzitu: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Ezin da %s mezua hartu: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Ziurtagiri-sinaduraren hutsegitea"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Editatu sinadura"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Zerbitzaria: %s, Mota: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP komandoak huts egin du: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Huts egin du \"%s\"(r)en ziurtagiria aurkitzean."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Huts egin du handizkako algoritmo arrunta aurkitzean."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Sortu _araua mezutik"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Ezin izan da S/MIME deskodetze-testuingurua sortu."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komandoa ez dago inplementatuta"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9753,16 +9886,26 @@ msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ezin da karpeta sortu: eragiketa baliogabea biltegi honetarako"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Zakarrontzia"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9884,7 +10027,7 @@ msgstr "Gako-erabilerak ez du onartzen ziurtagiri-sinatzea"
 msgid "Error in application verification"
 msgstr "Errorea aplikazioa egiaztatzean"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9897,11 +10040,11 @@ msgstr ""
 "Hatz-marka:       %s\n"
 "Sinadura:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "ONA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "TXARRA"
 
@@ -9925,7 +10068,7 @@ msgstr ""
 "Hala ere onartu nahi duzu?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9940,7 +10083,7 @@ msgstr ""
 "\n"
 "Onartu nahi duzu?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9949,7 +10092,7 @@ msgstr ""
 "Ziurtagiri-arazoa: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9958,7 +10101,7 @@ msgstr ""
 "Ziurtagiri-domeinu txarra: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9967,7 +10110,7 @@ msgstr ""
 "Ziurtagiria iraungita: %s\n"
 "Jaulkitzailea: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9981,17 +10124,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ezin izan da `%s' URLa analizatu"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Errorea `%s' gordetzean: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s mezurik ez dago %s(e)n"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
@@ -10000,11 +10143,6 @@ msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10021,10 +10159,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Begiratu mezu berririk dagoen"
 
 #: 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 "Karpeta guztietan begiratu mezurik dagoen"
@@ -10057,6 +10197,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10078,26 +10219,332 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lainobera itxia"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ezin da karpeta atzitu: %s: %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 "Zerbitzaria deskonektatu egin da ustekabean:: %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 "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ezin da karpeta atzitu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Ezin da mezua hartu: %s %s karpetatik\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ezin zaio mezua erantsi mh karpetari: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ezin zaio mezua erantsi mh karpetari: %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 ""
+"Ezin da mezua hartu: %s %s karpetatik\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 ""
+"Ezin da mezua hartu: %s %s karpetatik\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 ""
+"Ezin da mezua hartu: %s %s karpetatik\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 ""
+"Ezin da mezua hartu: %s %s karpetatik\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 "Karpetak"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Erakutsi harpidetutako karpetak soilik"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Gainidatzi zerbitzariak emandako karpetaren izen-lekua"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Izen-lekua"
+
+#: 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 zerbitzarietako posta irakurri eta gordetzeko."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Aukera honek IMAP zerbitzariarekin konektatuko zaitu testu arrunteko "
+"pasahitzaren bidez."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP zerbitzua:  %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:140
+#: 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 "Ezin da %s(r)ekin konektatu (%d ataka): %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Konexioa etenda"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Errore ezezaguna"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Ezin da %s POP zerbitzariarekin konektatu: ez du behar den autentifikazio-"
+"mekanismoa onartzen."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIdatzi %s@%s(r)en SMTP pasahitza"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Huts egin du %s POP zerbitzarian autentifikatzean: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Shell komandoa"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpeta ezabatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ezin da karpetaren izena aldatu: %s: Eragiketa baliogabea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Ustekabeko erantzuna IMAP zerbitzaritik: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Zereginik ez"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Eragiketa bertan behera utzi da"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Zerbitzaria deskonektatu egin da ustekabean:: %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:1089
-msgid "Unknown error"
-msgstr "Errore ezezaguna"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10142,21 +10589,21 @@ msgstr "Ezin izan da %s direktorioa sortu: %s"
 msgid "Could not load summary for %s"
 msgstr "Ezin izan da %s(r)en laburpena kargatu"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Karpeta deuseztatu egin da eta berriro sortu zerbitzarian."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Aldatutako mezuen bila eskaneatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ezin da mezua eskuratu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10172,25 +10619,25 @@ msgstr ""
 "Ezin da mezua hartu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Ez dago horrelako mezurik"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Mezu hau orain ez dago erabilgarri"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Mezu berrien laburpen-informazioa bilatzen"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Ezin izan da mezuaren gorputza aurkitu FETCH erantzunean."
 
@@ -10232,23 +10679,6 @@ msgstr "Huts egin du LDAP zerbitzariarekin konektatzean"
 msgid "Command:"
 msgstr "Shell komandoa"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Karpetak"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Erakutsi harpidetutako karpetak soilik"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Gainidatzi zerbitzariak emandako karpetaren izen-lekua"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Izen-lekua"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplikatu iragazkiak zerbitzari honetako sarrerako ontziko mezu berriei"
@@ -10271,87 +10701,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP zerbitzaria"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP zerbitzua:  %s - %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Ezin da %s(r)ekin konektatu (%d ataka): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS ez dago erabilgarri"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Konexioa etenda"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Ez duzu idatzi pasahitza."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10362,25 +10749,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "%s karpeta ez dago"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "\"%s\" karpeta-izena ez da baliozkoa, \"%c\" karakterea duelako."
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10388,7 +10768,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Karpeta guraso ezezaguna: %s"
@@ -10493,58 +10873,58 @@ msgstr ""
 "Mbox spool fitxategi estandarretan posta lokala irakurri eta gordetzeko.\n"
 "Elm, Pine, edo Mutt estiloko karpeten zuhaitzak irakurtzeko ere erabilliteke."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s gordetze-erroa ez da bide-izen absolutua"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s gordetze-erroa ez da direktorio erregularra"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Ezin da karpeta atzitu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Biltegi lokalek ez dute sarrerako ontzirik"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s posta-fitxategi lokala"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Ezin izan da karpeta-izena aldatu %s --> %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Ezin izan zaio izena aldatu '%s'(r)i: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Ezin izan da karpetaren `%s' laburpen-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Ezin izan da karpetaren `%s' indize-fitxategia ezabatu: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10612,7 +10992,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10950,7 +11330,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10959,8 +11339,8 @@ msgid "User cancelled"
 msgstr "Erabiltzaileak bertan behera utzi du"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10969,48 +11349,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Errorea mezua automatikoki gordetzean: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
@@ -11136,7 +11516,7 @@ msgstr "Ezin izan da taldea hartu: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Ezin izan da mezua bidali: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11189,8 +11569,8 @@ msgstr "Ez dago %s uid-a duen mezurik"
 msgid "Retrieving POP message %d"
 msgstr "%d POP mezua eskuratzen"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Arrazoi ezezaguna"
 
@@ -11645,7 +12025,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "eranskina"
 
@@ -11689,6 +12069,98 @@ msgstr "MIME mota:"
 msgid "Suggest automatic display of attachment"
 msgstr "Proposatu eranskina automatikoki bistaratzea"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ezin da mezua ireki"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ezin da mezua eskuratu editoretik"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Mezu izengabea"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Ireki fitxategia"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatikoki sortua"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Sinadura:"
+
+#: 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.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 "Prestatu mezua"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da helbidea hautatzeko kontrola aktibatu."
+
+#: 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 ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da HTML editorearen osagaia aktibatu.\n"
+"Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
+"bertsio zuzena duzula instalatuta.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Ezin izan da mezua prestatzeko leihoa sortu:\n"
+"Ezin da HTML editorearen osagaia aktibatu."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak).<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Bidalketa-helburua"
@@ -11771,207 +12243,135 @@ msgstr "<egin klik hemen karpeta hautatzeko>"
 msgid "Attach file(s)"
 msgstr "Erantsi fitxategia(k)"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "_Beti sinatu kontu honetatik bidalitako mezuak"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ezin da mezua ireki"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Ezin da mezua eskuratu editoretik"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Mezu izengabea"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Ireki fitxategia"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatikoki sortua"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Sinadura:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Prestatu mezua"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Erantsi fitxategi bat mezuari"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da helbidea hautatzeko kontrola aktibatu."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da HTML editorearen osagaia aktibatu.\n"
-"Egiazta ezazu gtkhtml eta libgtkhtml-ren\n"
-"bertsio zuzena duzula instalatuta.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Ezin izan da mezua prestatzeko leihoa sortu:\n"
-"Ezin da HTML editorearen osagaia aktibatu."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(Testua ez den mezu-gorputz editaezina du mezu-prestatzaileak).<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Hurrengo _irakurri gabeko mezua"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Aldaketak gorde nahi dituzu?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Ezin izan da kanalizaziorik sortu: %s"
+msgid "Don't Recover"
+msgstr "Ez inportatu"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
+msgid "Recover"
+msgstr "Kendu"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Ez gorde"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Aldaketak gorde nahi dituzu?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Errorea lasterbideak gordetzean."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ez inportatu"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Kontuz: mezua aldatu egin da"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Errorea lasterbideak gordetzean."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Ziur zaude izenik gabeko hitzordu hau ezabatu nahi duzula?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Kendu"
+msgid "Discard Changes"
+msgstr "_Ez gorde"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Gorde mezua honela..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Ezin izan da kanalizaziorik sortu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Hurrengo _irakurri gabeko mezua"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Kontuz: mezua aldatu egin da"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Erantsi fitxategi bat mezuari"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Kontu bat konfiguratu behar duzu mezuak idatzi ahal izateko."
 
@@ -12105,7 +12505,8 @@ msgstr ""
 "Izen hori duen fitxategi bat badago lehendik.\n"
 "Gainidatzi?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Fitxategia gainidatzi?"
 
@@ -12282,81 +12683,97 @@ msgstr "Hautatu ordua"
 msgid "_Filter Rules"
 msgstr "Iragazteko arauak"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Errorea '%s' adierazpen erregularrean:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Bilera-eguneratzea"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Data bat hautatu behar duzu."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "_Izen bereizia (DN):"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Fitxategi-izen bat zehaztu behar duzu."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "%s karpeta kentzen"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Esleipena"
+msgid "Missing folder."
+msgstr "%s karpeta kentzen"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Karpeta bat zehaztu behar duzu."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Ez da zerbitzaririk hautatu"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Errorea '%s' adierazpen erregularrean:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Data bat hautatu behar duzu."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Esleipena"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Iragazkiari izena eman behar diozu."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Karpeta birtualari izena eman behar diozu."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Fitxategi-izen bat zehaztu behar duzu."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Karpeta bat zehaztu behar duzu."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ez da zerbitzaririk hautatu"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12369,66 +12786,11 @@ msgstr "Aukeratu fitxategi bat"
 msgid "<b>Then</b>"
 msgstr "<b>Falta:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Hautatu karpeta"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Garrantzitsua"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Egitekoa"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Geroago"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Arauaren izena: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Izengabea"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Falta:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Exekutatu ekintzak"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "irizpide guztiak betetzen badira"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "irizpideren bat betetzen bada"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "sarrerakoa"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "irteerakoa"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12520,6 +12882,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Geroago"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Arauaren izena: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Falta:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "irizpide guztiak betetzen badira"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "irizpideren bat betetzen bada"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Exekutatu ekintzak"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegatua"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Hartzailea"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Erantzunda"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Sartu:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "sarrerakoa"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "irteerakoa"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12650,7 +13083,7 @@ msgstr "ez da Banderaduna"
 msgid "Junk Test"
 msgstr "ekaina"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketa"
@@ -12690,7 +13123,7 @@ msgstr "Programatik irten"
 msgid "Play Sound"
 msgstr "Jo soinua"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Irakurrita"
 
@@ -12760,9 +13193,9 @@ msgstr "honela hasten da"
 msgid "Stop Processing"
 msgstr "Utzi prozesatzeari"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12825,105 +13258,64 @@ msgstr "gaiak ez dauka hau"
 msgid "Virtual _Folders"
 msgstr "Karpeta birtualak"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Gehitu"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Karpeta birtualen iturburua"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Mezuak prestatzeko hobespenak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
-"besteak beste."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfiguratu hemen zure posta-kontuak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution-en posta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution-en postako kontuak konfiguratzeko kontrola"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution-en postaren osagaiak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution-en mezu-prestatzailea"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution-en posta-karpeten ikustailea"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution-en postaren hobespenen kontrola"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Posta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Posta-kontuak"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Posta-hobespenak"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[lehenetsia]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Kontuaren izena"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoloa"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Izengabea"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Hizkuntza(k)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Gehitu sinadura"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Sinadura(k)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Birbidalitako mezua"
+
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+"Jatorrizko mezua:\n"
+"data: %a, %Y-%m-%d %H:%M, egilea: %%s"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sortu _karpeta birtuala bilaketatik..."
 
@@ -12961,274 +13353,454 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Adierazi karpeta non sortu behar den:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Karpetaren izena:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Karpeta birtualak"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Sarrerako ontzia"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Kargatzen..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ezin dira mezuak Karpeta Birtual batera kopiatu edo eraman"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Eraman"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Bertan behera utzi zeregina"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Hautatu karpeta"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopiatu"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" karpetaren izena aldatu eta jarri:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Karpetaren izena aldatu"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Ikusi"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Ireki leiho berrian"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Eraman"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "Kar_peta berria..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Izena aldatu"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "Karpeta birtualak"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Sarrerako ontzia"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editatu mezu berri gisa..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Inprimatu"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Erantzun zerre_ndari"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Erantzun g_uztiei"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Birbidali"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "_Jarraitu..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Ban_dera osatuta"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Garbitu bandera"
 
-#: mail/em-folder-view.c:787 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 "Mar_katu irakurritako gisa"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Mar_katu ez-garrantzitsu gisa"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markatu i_rakurri gabeko gisa"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markatu garrantz_itsu gisa"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Desezabatu"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Eraman karpeta honetara..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opiatu karpeta honetan..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "_Aplikatu iragazkiak"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Iragazteko arauak"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Sortu _araua mezutik"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "_Gaiaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "_Bidaltzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "_Hartzailearen araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Po_sta-zerrendaren araberako karpeta birtuala"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "_Bidaltzailearen araberako karpeta birtuala"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "G_aiaren araberako iragazkia"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Bi_daltzailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Hart_zailearen araberako iragazkia"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Po_sta-zerrendaren araberako iragazkia"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Bi_daltzailearen araberako iragazkia"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Lehenetsia"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Inprimatu mezua"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiatu estekaren helbidea"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Egin klik zeregina gehitzeko"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Nork"
+
+#: 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 "Erantzun honi"
+
+#: 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 "Nori"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s eranskina"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Onartzen ez den eskema"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Errorea zerrenda aldatzean"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Ezin da egiaztatu 'leaf' sinadura"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Egin klik zeregina gehitzeko"
+msgid "Retrieving `%s'"
+msgstr "%s mezua eskuratzen"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Esleitua"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Editatu sinadura"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Gorde sinadura"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Etenda"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP enkriptatzea"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Kanpoko gorputz-zatia gaizki osatuta dago."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP gunerako erakuslea (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "(%s) fitxategi lokalerako erakuslea"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "(%s) urruneko datuetarako erakuslea"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Mezuak lekuz aldatzen"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Bidalketa-funtzioa"
+
+#. 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 ""
+
+#. 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
@@ -13236,45 +13808,30 @@ msgstr "Egin klik zeregina gehitzeko"
 msgid "Matches: %d"
 msgstr "Bat datozenak:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Esleitua"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Mezu honek sinadura digitala du eta egiazkoa da."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Editatu sinadura"
-
-#: mail/em-format-html-display.c:647
+#: 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 ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Gorde sinadura"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13282,236 +13839,95 @@ msgid ""
 msgstr ""
 "input_token -ek daukan sinadura bat ez da baliozkoa, edo ezin da egiaztatu."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Etenda"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "PGP enkriptatzea"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Ziurtagiri-IDa:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Ziurtagiria oraindik ez da baliozkoa"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr " - %Y %B %d, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Atzeratua:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr " - %Y %B %d, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Ikusi barnean"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Ezkutatu"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d orria"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s mezua eskuratzen"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Kanpoko gorputz-zatia gaizki osatuta dago."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP gunerako erakuslea (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Fitxategi lokalerako (%s) baliozko erakuslea \"%s\" gunean"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "(%s) fitxategi lokalerako erakuslea"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "(%s) urruneko datuetarako erakuslea"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Kanpoko datu ezezagunetarako erakuslea (\"%s\" mota)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Mezuak lekuz aldatzen"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Nork"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Erantzun honi"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Nori"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Bidalketa-funtzioa"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s eranskina"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Ezin izan da MIME mezua analizatu. Iturburu gisa bistaratzen."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Onartzen ez den eskema"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Errorea zerrenda aldatzean"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Ezin da egiaztatu 'leaf' sinadura"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Urtero"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Egun bat"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "_Astebete"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "_Hilabete"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13519,25 +13935,59 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+"Ezin izan da `%s' karpeta sortu:\n"
+"%s"
+
+#: mail/em-migrate.c:1532
+#, 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
+#, 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:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Huts egin du `%s' ostalaria ebaztean: %s"
+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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 #, fuzzy
@@ -13549,100 +13999,82 @@ msgstr "Gorde hone_la..."
 msgid "untitled_image.%s"
 msgstr "Mezu izengabea"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Erantzun bidal_tzaileari"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Ireki esteka arakatzailean"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Bidali _mezua zerrendara..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Gehitu bidaltzailea helbide-liburuan"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Ireki honekin: %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Harpidetu"
 
-#: mail/em-subscribe-editor.c:637 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 "Karpeta"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Hautatu zerbitzari bat."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Ez da zerbitzaririk hautatu"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ez erakutsi mezu hau berriro."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Iragazkiak"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Birbidalitako mezua"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-"Jatorrizko mezua:\n"
-"data: %a, %Y-%m-%d %H:%M, egilea: %%s"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Mezua"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gorde mezua honela..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Helbidea"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mezu-bidaltzailea: %s"
@@ -13660,11 +14092,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13773,164 +14205,165 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Posta-kontuak"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Posta-kontuak"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Exekutatu ekintzak"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Lehentasun lehenetsia:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Mezu berrien jakinarazpena"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "Abisatu _HTML formaturik nahi ez dutenei HTML mezuak bidali aurretik"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Abisatu B_cc hartzaileak bakarrik dituzten mezuak bidali aurretik"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13986,8 +14419,9 @@ msgid "Spell check inline"
 msgstr "O_rtografia-egiaztapena"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Lehentasun lehenetsia:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14130,33 +14564,66 @@ msgstr ""
 msgid "spamd port"
 msgstr "Inportatu"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution-en Elm inportatzailea"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution-en Netscape Mail inportatzailea"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Mezuak prestatzeko hobespenak"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution-en Outlook Express 4 inportatzailea"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfiguratu hemen posta-hobespenak, segurtasuna eta mezu-bistaratzea, "
+"besteak beste."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution-en Pine inportatzailea"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Konfiguratu hemen ortografia-egiaztatzailea, sinadurak eta mezu-prestatzailea"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution-en mbox inportatzailea"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfiguratu hemen zure posta-kontuak"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution-en posta"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution-en postako kontuak konfiguratzeko kontrola"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution-en postaren osagaiak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution-en mezu-prestatzailea"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution-en mezu-prestatzailea konfiguratzeko kontrola"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution-en postaren hobespenen kontrola"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Posta-kontuak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Posta-hobespenak"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Posta:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14164,15 +14631,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Itxaron"
 
@@ -14204,19 +14671,47 @@ msgid "Select folder to import into"
 msgstr "Hautatu karpeta"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Inportatzen"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Fitxategiak inportatzen"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution-en Elm inportatzailea"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution-en Netscape Mail inportatzailea"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution-en Outlook Express 4 inportatzailea"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution-en Pine inportatzailea"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution-en mbox inportatzailea"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s eskaneatzen"
@@ -14226,7 +14721,7 @@ msgstr "%s eskaneatzen"
 msgid "Priority Filter \"%s\""
 msgstr "Lehentasun-iragazkia: \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14251,7 +14746,7 @@ msgstr ""
 "erabiltzen dituzte lehentasunen ordez. Probatu inportatutako\n"
 "iragazkiak, behar bezala funtzionatzen dutela ziurtatzeko."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14263,7 +14758,7 @@ msgstr ""
 "dute, baina Evolution-ek ez du onartzen horrelako \n"
 "eginbiderik. Iragazki horiek baztertu egingo dira."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14277,24 +14772,24 @@ msgstr ""
 "Iragazki horiek aldatu egin dira, katea mezuaren \n"
 "gorputzean dagoen edo ez egiaztatzeko."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Netscape-ko datu zaharrak inportatzen ari da Evolution"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Posta-iragazkiak"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14328,128 +14823,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution-en kontu-editorea"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Ostalaria:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Erabiltzaile-izena:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Bide-izena:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Mezu-hartzailea: %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Gaia: %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mezu-bidaltzailea: %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta-zerrenda"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Erantzunda"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Gehitu iragazteko araua"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d hautatuta"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d bidali gabe"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Zirriborroak"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d bidali"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d bidali gabe"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d guztira"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d bidali gabe"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d hautatuta"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Posta-mezu berria"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mezua"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Prestatu posta-mezu berria"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Karpeta birtual berria"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Posta-iragazkiak"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sortu karpeta berria"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "Egutegiak bistaratuko duen URIa"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Zerbitzua egiaztatzen"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Zerbitzariarekin konektatzen..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitatea"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14459,12 +14965,12 @@ msgstr ""
 "eremuak ez dira nahitaez bete beharrekoak. Datu horiek zuk bidaltzen dituzun "
 "mezuetan agertzea nahi baduzu bakarrik bete behar dituzu."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Mezuak hartu"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14473,15 +14979,15 @@ msgstr ""
 "bazaude, galdetu sistema-administratzaileari edo Interneteko zerbitzu-"
 "hornitzaileari."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Hautatu ondorengo aukeretako bat"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Mezuak bidali"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14489,11 +14995,11 @@ msgstr ""
 "Idatzi posta bidaltzeko erabiliko duzun bidearen datuak. Ziur ez bazaude, "
 "galdetu sistema-administratzaileari edo Interneteko zerbitzu-hornitzaileari."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontuaren kudeaketa"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14506,14 +15012,6 @@ msgstr ""
 "egingo dira Evolution-eko posta-kontua sortzeko. Idatzi behean kontuari eman "
 "nahi diozun izena. Izen hori bistaratzeko bakarrik erabiliko da."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Zerbitzua egiaztatzen"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Zerbitzariarekin konektatzen..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14831,7 +15329,8 @@ msgid "Execute Command..."
 msgstr "Exekutatu komandoa..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Zabalera-finkoa:"
 
 #: mail/mail-config.glade.h:82
@@ -15161,352 +15660,457 @@ msgstr "kolorea"
 msgid "description"
 msgstr "azalpena"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "\"%s\" izeneko karpeta bat badago. Erabili beste izen bat."
+msgid "Invalid authentication"
+msgstr "Autentifikazioa"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr ""
+"%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"HTML formatuko mezua bidaltzera zoaz. Egiazta ezazu ondorengo\n"
+"hartzaileek HTML mezuak jaso ditzaketela eta jaso nahi dituztela:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
+msgid "_Send"
+msgstr "Bidali"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Ziur zaude %d mezuak berriro bidali nahi dituzula?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ezin da karpeta kopiatu: %s"
+msgid "Use default drafts folder?"
+msgstr "Zereginen karpeta lehenetsia irekitzen"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ezin da karpeta atzitu: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Ezin da kontu honetako zirriborroen karpeta ireki.\n"
+"Zirriborroen karpeta lehenetsia erabili nahi duzu?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
+msgid "Use _Default"
+msgstr "Lehenetsia"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Ezin da direktorioa sortu:\n"
-" %s\n"
-"Errorea: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Ziur zaude %d mezuak leiho banatan ireki nahi dituzula?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Ezin da karpeta ezabatu:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
+msgid "_Expunge"
+msgstr "_Borratu betiko"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "`%s' karpeta ez dago."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Betiko kendu ezabatutako mezu guztiak karpeta guztietatik"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ezin da karpeta eraman: %s"
+msgid "_Empty Trash"
+msgstr "Hustu _zakarrontzia"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Ezin izan da objektua eguneratu"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Bidali gabeko mezuak dituzu. Hala ere irten nahi duzu?"
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Ezin izan da objektua eguneratu"
+msgid "Error while {0}."
+msgstr ""
+"Errorea '%s' saiatu denean:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Ezin da mezua ireki"
+msgid "Error while performing operation."
+msgstr ""
+"Errorea eragiketa egitean:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
+msgid "Enter password."
+msgstr "Idatzi pasahitza"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Errorea iragazki-informazioa kargatzean:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Ezin izan da %s direktorioa sortu: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Ezin da gorde `%s'(e)n\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Gehitu sinadura"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Ezin da direktorioa sortu:\n"
+" %s\n"
+"Errorea: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Ezabatu \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Ezabatu hautatutako kontaktuak"
+msgid "Cannot create temporary save directory."
+msgstr "Ezin izan da aldi baterako direktorioa sortu: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Ez gorde"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Aldaketak gorde nahi dituzu?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ez ezabatu"
+msgid "File exists but cannot overwrite it."
+msgstr "Fitxategia badago; gainidatzi?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Idatzi pasahitza"
+msgid "File exists but is not a regular file."
+msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Errorea iragazki-informazioa kargatzean:\n"
+"Ezin da karpeta ezabatu:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Errorea eragiketa egitean:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ezin da karpeta ezabatu: %s: Ez dago horrelako karpetarik"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Errorea '%s' saiatu denean:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Fitxategia badago; gainidatzi?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ezin da karpetaren izena aldatu: %s: Ez dago horrelako karpetarik"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "`%s' fitxategia ez dago edo ez da fitxategi erregularra."
+msgid "Delete \"{0}\"?"
+msgstr "Ezabatu \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Ziur zaude \"%s\" karpeta ezabatu nahi duzula?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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\" izeneko karpeta bat badago. Erabili beste izen bat."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autentifikazioa"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ezin da karpeta eraman: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Ezin izan da objektua eguneratu"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Ezin da mezua ireki"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Ezin da karpeta kopiatu: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"HTML formatuko mezua bidaltzera zoaz. Egiazta ezazu ondorengo\n"
-"hartzaileek HTML mezuak jaso ditzaketela eta jaso nahi dituztela:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ezin da karpeta atzitu: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Ziur zaude \"%s\" karpeta ezabatu nahi duzula?"
+msgid "Cannot open source \"{1}\""
+msgstr "Ezin izan da objektua eguneratu"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Ez duzu eman eskatu zaizun informazio guztia."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Ezin dituzu izen bereko bi kontu izan."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Ezabatu hautatutako kontaktuak"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Ziur zaude kontu hau ezabatu nahi duzula?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Karpeta birtual hauek:\n"
-"%sKendutako karpeta bat erabiltzen zuten:\n"
-"    '%s'\n"
-"Eta eguneratu egin dira."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ez ezabatu"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Karpeta birtual hauek:\n"
-"%sKendutako karpeta bat erabiltzen zuten:\n"
-"    '%s'\n"
-"Eta eguneratu egin dira."
+msgid "Could not save signature file."
+msgstr "Ezin izan da sinadura-fitxategia gorde: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Gehitu sinadura"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Ez gorde"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr ""
-"%s SMTP zerbitzariak ez du onartzen eskatutako %s motako autentifikazioa."
+msgid "Do you wish to save your changes?"
+msgstr "Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15514,85 +16118,97 @@ msgstr ""
 "\n"
 "Aldaketak gorde nahi dituzu?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Ezin da kontu honetako zirriborroen karpeta ireki.\n"
-"Zirriborroen karpeta lehenetsia erabili nahi duzu?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Lehenetsia"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Ez gorde"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Ez duzu eman eskatu zaizun informazio guztia."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Bidali gabeko mezuak dituzu. Hala ere irten nahi duzu?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Ezin dituzu izen bereko bi kontu izan."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "`%s' karpeta ez dago."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Ez gorde"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Hustu _zakarrontzia"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Karpeta birtual hauek:\n"
+"%sKendutako karpeta bat erabiltzen zuten:\n"
+"    '%s'\n"
+"Eta eguneratu egin dira."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Borratu betiko"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Bidali"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Karpeta birtual hauek:\n"
+"%sKendutako karpeta bat erabiltzen zuten:\n"
+"    '%s'\n"
+"Eta eguneratu egin dira."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Gainidatzi"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s(e)n ping egiten"
@@ -15601,20 +16217,20 @@ msgstr "%s(e)n ping egiten"
 msgid "Working"
 msgstr "Lanean"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Karpeta iragazten"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Mezuak bilatzen"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Huts egin du irteerako iragazkiak aplikatzean: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15623,115 +16239,115 @@ msgstr ""
 "Huts egin du %s(r)i eranstean: %s\n"
 "Horren ordez, Bidalitakoen karpeta lokalean gehituko da."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Huts egin du `Bidalitakoen' karpeta lokalean eranstean: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d/%d mezua bidaltzen"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Huts egin du mezua deskodetzean."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Osatuta."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Mezua karpetan gordetzen"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mezuak %s(e)ra eramaten"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Mezuak %s(e)n kopiatzen"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\": karpetak eskaneatzen"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Birbidalitako mezuak"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "%s biltegia irekitzen"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s karpeta kentzen"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s karpeta biltegiratzen"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Karpeta freskatzen"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Karpeta betiko borratzen"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' zakarrontzia husten"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Karpeta lokalak"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s mezua eskuratzen"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15740,7 +16356,7 @@ msgstr ""
 "Ezin da sortu irteera-fitxategi hau: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15749,11 +16365,11 @@ msgstr ""
 "Errorea mezuak hemen gordetzean: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Eranskina gordetzen"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15762,17 +16378,17 @@ msgstr ""
 "Ezin da irteera-fitxategia sortu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Ezin izan da daturik idatzi: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s -- deskonektatzen"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s -- berriro konektatzen"
@@ -15837,24 +16453,24 @@ msgstr "Eguneratzen..."
 msgid "Waiting..."
 msgstr "Zain..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Erabiltzaileak bertan behera utzi du eragiketa."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Idatzi %s(r)en pasahitza"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Idatzi pasahitza"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "Gogora_tu pasahitz hau"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Gogoratu pasahitz hau saio hau amaitu arte"
 
@@ -15894,89 +16510,94 @@ msgstr "Birbidalitako mezua"
 msgid "Invalid folder: `%s'"
 msgstr "%s karpeta irekitzen"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Karpeta birtuala konfiguratzen: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "uri-aren karpeta birtualak eguneratzen: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "uri-aren karpeta birtualak eguneratzen: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Karpeta birtualak"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Editatu karpeta birtuala"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Karpeta birtual berria"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Ikusi gabe"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Ikusita"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Erantzunda"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Ikusi gabeko hainbat mezu"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Hainbat mezu"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Txikiena"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Txikia"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Handia"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Handiena"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Gaur %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Atzo %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Mezuen zerrenda sortzen"
 
@@ -16008,43 +16629,43 @@ msgstr "Jasotze-data"
 msgid "Size"
 msgstr "Tamaina"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Deitu"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ez birbidali"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Egin jarraipena"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Informazio gisa"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Birbidali"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Ez da beharrezkoa erantzutea"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Erantzun"
 
-#: mail/message-tag-followup.c:70 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 "Erantzun denei"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Berrikusi"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Markatu jarraipena egiteko"
 
@@ -16089,20 +16710,6 @@ msgstr "_Harpidetu"
 msgid "_Unsubscribe"
 msgstr "Harpidetza _kendu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-en shell-a"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution-en probaren osagaia"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16110,111 +16717,55 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Aldatu izena lasterbide-taldeari"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Erakutsi/ezkutatu karpeta-barra"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Ezkutatu lasterbide-barra"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Lehentasun lehenetsia:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Lehentasun lehenetsia:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolution-en posta konfiguratzeko interfazea"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Markatu eranskina mezuaren barruan erakusteko lehenespenez."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Zereginen karpeta lehenetsia irekitzen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Erakutsi/ezkutatu karpeta-barra"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Erakutsi/ezkutatu lasterbide-barra"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Helb. el."
@@ -16223,6 +16774,32 @@ msgstr "Helb. el."
 msgid "Brought to you by"
 msgstr "Hauei esker daukazu:"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Errore ezezaguna"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Argumentu baliogabeak"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Ezin da OAFen erregistratu"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Ez da aurkitu konfigurazioko datu-basea"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Errore generikoa"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(izengabea)"
@@ -16367,11 +16944,11 @@ msgstr "Huts egin du gpg exekutatzean."
 msgid "_Import"
 msgstr "Inportatu"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Konexioak ixten..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution-en ezarpenak"
 
@@ -16408,11 +16985,35 @@ msgstr "Karpeta-izenak ezin du \"#\" karaktererik eduki."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' eta '..' karpeta-izen erreserbatuak dira."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mezu-hartzailea: %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Errorea %s exekutatzean."
@@ -16426,14 +17027,15 @@ msgid "Bug buddy could not be run."
 msgstr "Ezin izan da Bug Buddy exekutatu."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Ximian Evolution-i buruz"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Lan egin linean"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Lan egin lineaz kanpo"
 
@@ -16441,48 +17043,6 @@ msgstr "_Lan egin lineaz kanpo"
 msgid "Work Offline"
 msgstr "Lan egin lineaz kanpo"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution lineaz kanpo jartzeko prozesuan dago."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Argumentu baliogabeak"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Ezin da OAFen erregistratu"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Ez da aurkitu konfigurazioko datu-basea"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Errore generikoa"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kontrol-laukia"
@@ -16556,6 +17116,43 @@ msgstr "Konexio aktiboak"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik egin 'Ados'en konexio hauek ixteko eta lineaz kanpo geratzeko"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "E_gutegia:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontaktuak: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Posta:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Zereginak:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Karpeta-_mota:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Ireki beste erabiltzaile baten karpeta"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "K_ontua:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Ka_rpeta-izena:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Erabiltzaile-izena:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution konfiguratzeko laguntzailea"
@@ -16598,6 +17195,20 @@ msgstr ""
 "\n"
 "Egin klik \"Aplikatu\" botoian, ezarpenak gordetzeko. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution-en shell-a"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution-en probaren osagaia"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16663,13 +17274,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution-ek datu-iturburu hauek aurkitu ditu:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16699,57 +17310,48 @@ msgstr ""
 "Gogorik lan egin dugu, eta espero dugu emaitza zure gustukoa izango\n"
 "dela eta zure ekarpena egitera animatuko zarela!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Eskerrik asko\n"
 "Ximian Evolution taldea\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ez esan berriro"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Hasi lineaz kanpo"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Hasi linean"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Behartu evolution-en osagai guztiak ixtea"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Bidali osagai guztien arazketa-irteera fitxategi batera."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16758,14 +17360,80 @@ msgstr ""
 "%s: --online eta --offline ezin dira batera erabili.\n"
 "  Erabili %s --help informazio gehiago lortzeko.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ezin da Ximian Evolution-en shell-a atzitu."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution-eko kontuaren morroia"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Ziurtagiri-IDa:"
@@ -17018,12 +17686,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Ziurtagiri-IDa:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Txartelaren ID hori badago lehendik"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17242,6 +17904,12 @@ msgstr "Gaia: %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Txartelaren ID hori badago lehendik"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17283,12 +17951,12 @@ msgstr "Mezuaren gai lehenetsia."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Ezin izan da '%s' exekutatu: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s ixten (%s)\n"
@@ -17352,7 +18020,8 @@ msgid "Select all contacts"
 msgstr "Hautatu kontaktu guztiak"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Bidali mezua hautatutako kontaktuei."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17384,8 +18053,8 @@ msgstr "Ikusi uneko kontaktua"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Ekintzak"
@@ -17403,7 +18072,8 @@ msgid "_Preview Pane"
 msgstr "Au_rrebistako panela"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Gorde VCard gisa"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17534,11 +18204,21 @@ msgstr "Ikusi uneko kontaktua"
 msgid "Week"
 msgstr "Astea"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Lan-astea"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Hitzordua"
 
+#: 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 "_Itxi"
+
 #: 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
@@ -17859,6 +18539,16 @@ msgstr "_Alderantzikatu hautapena"
 msgid "_Threaded Message List"
 msgstr "_Harian sartutako mezu-zerrenda"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "It_xi"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18105,7 +18795,8 @@ msgid "Open the selected message in a new window"
 msgstr "Ireki hautatutako mezua leiho berri batean"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Ireki hautatutako mezua mezu-prestatzailean, berriro bidaltzeko"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18222,58 +18913,46 @@ msgstr "_Gaiaren araberako karpeta birtuala..."
 msgid "_Attached"
 msgstr "_Erantsita"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiatu karpetan"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Sortu iragazkia mezutik"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Joan hona"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Barnean"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Handiagoa"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Mezu-bistaratzea"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Eraman karpetara"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Hurrengo mezua"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Bistaratze normala"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Ireki mezua"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Aurreko mezua"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Aipamen gisa"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Be_rriro bidali..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Tresnak"
@@ -18282,16 +18961,6 @@ msgstr "_Tresnak"
 msgid "_Undelete"
 msgstr "_Desezabatu"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "It_xi"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Erantsi"
@@ -18688,6 +19357,11 @@ msgstr "Posta-hobespenak"
 msgid "_Send / Receive"
 msgstr "_Bidali / Jaso"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Bilatu orain"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "E_npresaren arabera"
@@ -18761,10 +19435,6 @@ msgstr "_Mugaeguna:"
 msgid "With _Status"
 msgstr "Ezarri egoera"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zereginak"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18923,6 +19593,34 @@ msgstr "Besterik..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution errorea"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution-en posta"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Bileraren informazioa"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Bidalitako mezuak eta zirriborroak"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19041,6 +19739,35 @@ msgstr "Testua"
 msgid "Find _Now"
 msgstr "Bilatu orain"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 badago lehendik\n"
+"Gainidatzi nahi duzu?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Ezin da gorde `%s'(e)n\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Ezin da gorde `%s'(e)n\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19051,8 +19778,132 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d osatuta)"
 
-#~ msgid "New Address Book"
-#~ msgstr "Helbide-liburu berria"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution-en helbide-liburuaren karpeten ikustailea"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "_2. helbidea:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bologna"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution-en egutegi-ikustailea"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution-en zeregin-ikustailea"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Ezin izan da gnome-vfs hasieratu"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Ezin izan da '%s'(e)ko karpeta ireki"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "Egutegiak bistaratuko duen URIa"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Bistaratzeko ikuspegi-mota"
+
+#~ msgid "Display a message"
+#~ msgstr "Bistaratu mezua"
+
+#~ msgid "Alerts"
+#~ msgstr "Abisuak"
+
+#~ msgid "Time"
+#~ msgstr "Ordua"
+
+#~ msgid "_General"
+#~ msgstr "_Orokorra"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Hautatu inportatzailea"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Egutegia"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Zereginen zerrenda"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Ezin izan da egutegi-fitxategia eguneratu!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Bistaratu beharreko zeregin-karpetaren URIa"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Ezin izan dira zereginak kargatu`%s'(e)n"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution-en posta-karpeten ikustailea"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "_Bidaltzailearen araberako karpeta birtuala"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Bi_daltzailearen araberako iragazkia"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Huts egin du '%s'(e)rako kanalizazioa sortzean: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Huts egin du `%s' ostalaria ebaztean: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Egutegiak bistaratuko duen URIa"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Aldatu izena lasterbide-taldeari"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Ezkutatu lasterbide-barra"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Zereginen karpeta lehenetsia irekitzen"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Zereginen karpeta lehenetsia irekitzen"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Zereginen karpeta lehenetsia irekitzen"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Zereginen karpeta lehenetsia irekitzen"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Erakutsi/ezkutatu karpeta-barra"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Erakutsi/ezkutatu lasterbide-barra"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ezin da Ximian Evolution-en shell-a abiarazi: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Be_rriro bidali..."
 
 #~ msgid "The URI that the address book will display"
 #~ msgstr "Helbide-liburuak bistaratuko duen URIa"
@@ -19227,9 +20078,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Ezkontidea:"
 
-#~ msgid "_Add"
-#~ msgstr "_Gehitu"
-
 #~ msgid "_Business:"
 #~ msgstr "_Lanekoa:"
 
@@ -19349,18 +20197,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Mugaeguna hasiera-eguna baino lehenagokoa da!"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Ha_siera-data:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Mugaeguna:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Lehentasuna:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19392,13 +20228,6 @@ msgstr "%s (%%%d osatuta)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Fitxategi-deskriptorea ezin da kopiatu: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19537,10 +20366,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgstr "Inprimatuko den egutegiaren aurrebista eskaintzen du"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Idatzi %s(r)en pasahitza"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Zeregin berria"
 
@@ -19599,30 +20424,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Ezin da aurkitu zehaztutako karpeta partekatua."
 
-#~ msgid "C_alendar:"
-#~ msgstr "E_gutegia:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Posta:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Zereginak:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Karpeta-_mota:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Ireki beste erabiltzaile baten karpeta"
-
-#~ msgid "_Account:"
-#~ msgstr "K_ontua:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Ka_rpeta-izena:"
-
-#~ msgid "_User:"
-#~ msgstr "_Erabiltzaile-izena:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Sortu karpeta berria"
@@ -21067,9 +21868,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Asia"
 #~ msgstr "Asia"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22120,9 +22918,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22186,9 +22981,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25174,9 +25966,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -27985,9 +28774,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Shown"
 #~ msgstr "Erakutsiak"
 
-#~ msgid "No tasks"
-#~ msgstr "Zereginik ez"
-
 #~ msgid "blue"
 #~ msgstr "urdina"
 
@@ -29019,9 +29805,6 @@ msgstr "%s (%%%d osatuta)"
 #~ "Ezin izan da karpeta kendu:\n"
 #~ "%s"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution errorea"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -29244,9 +30027,6 @@ msgstr "%s (%%%d osatuta)"
 #~ msgid "Test type"
 #~ msgstr "Proba-mota:"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Konexio hauek aktibo daude:"
-
 #~ msgid "Import File (step 3 of 3)"
 #~ msgstr "Fitxategia inportatu (3 / 3 urratsa)"
 
diff --git a/po/fa.po b/po/fa.po
index e156d10091..42a901821f 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr ""
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -44,14 +52,6 @@ msgstr "کارت‌ها"
 msgid " card"
 msgstr "۱ کارت"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -66,62 +66,19 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
 msgstr ""
 
 #: addressbook/gui/component/addressbook-component.c:93
@@ -161,41 +118,45 @@ msgstr ""
 msgid "Create a new contacts group"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -203,8 +164,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -212,7 +173,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "شخصی"
@@ -259,19 +220,41 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, 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
+#: 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:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+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
+#: 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 ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
@@ -292,6 +275,58 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr ""
@@ -313,6 +348,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -379,7 +415,7 @@ msgstr ""
 msgid "Address Book Properties"
 msgstr "نشانی"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "همیشه"
@@ -394,109 +430,99 @@ msgid "Basic"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "کومورو"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "عمومی"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "هرگز"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "یک"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "تاریخ آغاز:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "تاریخ آغاز:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -507,7 +533,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -516,19 +542,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -536,7 +562,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -546,34 +572,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -581,126 +607,133 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "عنوان"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "ا_ستفاده از SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "استفاده از نشانی پست الکترونیکی"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "نشانی پست الکترونیکی:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "شماره‌ی _درگاه:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "شماره‌ی _درگاه:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "منبع"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "کارت‌ها"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:208
-msgid "Remove All"
-msgstr "حذف همه"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "حذف همه"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr ""
@@ -723,21 +756,14 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "منبع"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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
@@ -801,138 +827,139 @@ msgid "<b>Work</b>"
 msgstr "قبلی"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "نشانی _۲:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_نشانی:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_سالگرد ازدواج:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "دستیار"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "روز _تولد:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "تقویم:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_شهر:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "فرمان:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_کشور:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_بخش:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_نام کامل..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "منزل"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "پیغام _بعدی"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "نشانی پست الکترونیکی"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "مدیر"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr ""
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_صندوق پستی:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr ""
@@ -957,9 +984,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "کاری"
@@ -991,23 +1018,35 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr ""
 
@@ -1979,93 +2018,109 @@ msgstr "زامبیا"
 msgid "Zimbabwe"
 msgstr "زیمبابوه"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-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
-msgid "Location"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "تغییر نام"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "کتاب منبع"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "کتاب مقصد"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "نیجر"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 ""
 
+#: 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
+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:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2083,18 +2138,6 @@ msgstr "نام _کامل:"
 msgid "E-_mail:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "نشانی _۲:"
@@ -2243,8 +2286,8 @@ msgstr ""
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "کتاب"
 
@@ -2301,6 +2344,411 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "اعضای فهرست"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "سازمان"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "کاری"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "شخصی"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "عنوان شغل"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "صفحه‌ی آغازه"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "موفقیت"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "نشانی"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+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
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "لغو شد"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "فهرست"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+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
+#. * 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 ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: 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
+#, 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
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr ""
@@ -2315,8 +2763,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr ""
 
@@ -2371,9 +2819,9 @@ msgstr "نشانی"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+msgid "Save as VCard..."
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2441,7 +2889,7 @@ msgid "Cut"
 msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2452,18 +2900,8 @@ msgstr ""
 msgid "Paste"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr ""
 
@@ -2476,7 +2914,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
@@ -2517,21 +2955,6 @@ msgstr ""
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr ""
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "نام خانوادگی"
@@ -2568,29 +2991,14 @@ msgstr ""
 msgid "Manager"
 msgstr "مدیر"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "دفتر"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "سازمان"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2642,21 +3050,29 @@ msgstr ""
 msgid "Web Site"
 msgstr "وبگاه"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 ""
@@ -2673,10 +3089,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2697,384 +3109,8 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "اعضای فهرست"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "کاری"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "شخصی"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "عنوان شغل"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "صفحه‌ی آغازه"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "موفقیت"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "نشانی"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-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:57
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "لغو شد"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-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:114
-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 ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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:140
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "فهرست"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-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
-#. * 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:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: 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
-#, 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
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3119,11 +3155,6 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 msgid "Print contacts"
 msgstr ""
@@ -3133,6 +3164,11 @@ msgstr ""
 msgid "Print contact"
 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"
 msgstr ""
@@ -3317,16 +3353,6 @@ msgstr ""
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3381,6 +3407,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3393,11 +3429,12 @@ msgstr ""
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3429,117 +3466,53 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "تقویم‌ها"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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"
+msgid "Snooze _time (minutes):"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+msgid "_Edit appointment"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3548,12 +3521,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3561,7 +3534,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3572,19 +3545,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
-msgid "Could not initialize Bonobo"
+#: 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:167
-msgid "Could not initialize gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:139
+msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3693,174 +3666,169 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
+msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr ""
 
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 ""
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 ""
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 ""
 
 #. 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:464
+#: 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 ""
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
 msgstr ""
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "تقویم‌ها"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "تقویم جدید"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_تقویم"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr ""
 
@@ -3890,34 +3858,41 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:419
-msgid "Method not supported when opening the calendar"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
-msgid "Permission denied to open the calendar"
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
+#: calendar/gui/comp-editor-factory.c:409
+msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
+#: calendar/gui/comp-editor-factory.c:420
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:426
+msgid "Permission denied to open the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:474
+#, c-format
+msgid "open_client(): %s"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.c:466
@@ -3985,7 +3960,7 @@ msgstr ""
 msgid "hours"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4004,12 +3979,12 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
+#: 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/e-alarm-list.c:444
-msgid "Play a sound"
+#: 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
@@ -4027,6 +4002,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
 msgid "Summary:"
 msgstr ""
@@ -4065,10 +4041,101 @@ msgstr ""
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+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
+msgid "Calendar Properties"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "تقویم‌ها"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+msgid "_Add Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:14
+msgid "_Refresh Interval:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:15
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "_عنوان:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "_اضافه شود"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 ""
 
@@ -4083,19 +4150,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 ""
 
@@ -4120,165 +4187,176 @@ msgid "60 minutes"
 msgstr ""
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "قبلی"
 
 #: 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 "تاجیکستان"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "قبلی"
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "جزئیات"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+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:563
 msgid "Friday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "تاجیکستان"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Time"
-msgstr "عنوان"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "هفته‌ی کاری"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_اضافه شود"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4288,136 +4366,46 @@ msgstr ""
 msgid "_Edit"
 msgstr "_ویرایش"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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
-msgid "Add Tasks Group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "تقویم‌ها"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-msgid "_Add Group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:14
-msgid "_Refresh Interval:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:15
-msgid "_Refresh:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "_عنوان:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "_اضافه شود"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4492,77 +4480,77 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
+#: calendar/gui/dialogs/comp-editor.c:430
+msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
+msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
+#, c-format
+msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
+#, c-format
+msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
+#, c-format
+msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
+msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:431
-msgid "Could not update object"
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
+msgid "Save as..."
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
-msgid "Edit Appointment"
+#: 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:909
-#: calendar/gui/dialogs/comp-editor.c:946
-#, c-format
-msgid "Appointment - %s"
+#: calendar/gui/dialogs/comp-editor.c:1576
+msgid "Unable to use current version!"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor-page.c:463
 #, c-format
-msgid "Task - %s"
+msgid "Validation error: %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
-#, c-format
-msgid "Journal entry - %s"
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
-msgid "No summary"
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
-msgid "Save as..."
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
-msgid "Changes made to this item may be discarded if an update arrives"
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1577
-msgid "Unable to use current version!"
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
 msgstr ""
 
 #: calendar/gui/dialogs/copy-source-dialog.c:57
@@ -4685,27 +4673,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 ""
 
@@ -4717,7 +4705,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4803,10 +4791,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4825,15 +4813,15 @@ msgstr ""
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5102,26 +5090,18 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
+msgid "Select destination"
 msgstr "انتخاب نام‌ها"
 
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+msgid "_Destination"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "calendar"
-msgstr "تقویم:"
-
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "تاجیکستان"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5150,38 +5130,44 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 ""
 
@@ -5219,11 +5205,11 @@ msgstr "نشانی صفحه‌ی _وب:"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5232,8 +5218,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr ""
@@ -5382,97 +5369,54 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "تاریخ آغاز:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "نشانی صفحه‌ی _وب:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "شماره‌ی _درگاه:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "نشانی صفحه‌ی _وب:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
+#: 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-cal-model.c:872
-msgid "Recurring"
+#: 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-cal-model.c:874
-msgid "Assigned"
+#: 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
@@ -5519,17 +5463,26 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr ""
 
@@ -5538,41 +5491,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr ""
 
@@ -5628,78 +5582,154 @@ msgstr ""
 msgid "Start date"
 msgstr "تاریخ آغاز:"
 
+#: 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:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "انتخاب _همه"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_حذف شود..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_تقویم"
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "تقویم جدید"
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr ""
+
+#: 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: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-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:168 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
+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:629
+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 ""
+
 #. 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
@@ -5720,35 +5750,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. 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 ""
+
+#. 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 ""
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
@@ -5856,10 +5886,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr ""
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5889,7 +5915,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
@@ -6102,59 +6128,55 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6271,28 +6293,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 ""
-
-#. 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 ""
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6353,77 +6353,156 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr ""
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
+#: calendar/gui/gnome-cal.c:2894
+msgid "Purging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2757
-msgid "Purging"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr ""
+
+#: 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
@@ -6563,6 +6642,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr ""
@@ -6782,7 +6878,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr ""
 
@@ -6794,65 +6890,74 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ""
+msgstr[1] ""
+
+#: calendar/gui/tasks-component.c:447
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6860,11 +6965,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr ""
 
@@ -8504,7 +8609,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8597,29 +8702,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8651,7 +8733,46 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8659,42 +8780,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8702,99 +8823,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9029,7 +9150,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9219,7 +9340,7 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr ""
 
 #: camel/camel-smime-context.c:360
@@ -9234,7 +9355,7 @@ msgstr ""
 msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr ""
 
@@ -9294,91 +9415,91 @@ msgstr ""
 msgid "Cannot set message digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr ""
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr ""
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr ""
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9395,16 +9516,26 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr ""
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
@@ -9525,7 +9656,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9534,11 +9665,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9555,7 +9686,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9565,28 +9696,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9598,17 +9729,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9617,11 +9748,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9636,10 +9762,12 @@ 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 ""
@@ -9671,6 +9799,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9690,26 +9819,303 @@ msgstr ""
 msgid "Checklist"
 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:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
 msgstr ""
 
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: 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
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 ""
+
+#: 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:815
+#: 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/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: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/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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 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
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, c-format
+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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "فرمان:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9752,21 +10158,21 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -9780,25 +10186,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9836,23 +10242,6 @@ msgstr ""
 msgid "Command:"
 msgstr "فرمان:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -9873,85 +10262,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9959,25 +10306,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -9985,7 +10325,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10084,58 +10424,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10201,7 +10541,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10522,7 +10862,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10531,8 +10871,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10541,46 +10881,46 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -10691,7 +11031,7 @@ msgid "Could not get group: %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -10744,8 +11084,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11175,7 +11515,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
@@ -11219,6 +11559,88 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr ""
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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.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 ""
@@ -11297,189 +11719,126 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-msgid "Could not open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
 msgstr ""
 
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "ایالات متحده"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
 msgstr ""
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "حذف"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "حذف"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "حذف"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "حذف"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "پیغام _بعدی"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11597,7 +11956,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -11773,71 +12133,87 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr ""
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -11849,65 +12225,11 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr ""
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "_نام پرونده:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr ""
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -11990,6 +12312,73 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "اعضا"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12119,7 +12508,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12157,7 +12546,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr ""
 
@@ -12226,9 +12615,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 ""
@@ -12290,101 +12679,59 @@ msgstr ""
 msgid "Virtual _Folders"
 msgstr "_پوشه"
 
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_اضافه شود"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12419,525 +12766,550 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr ""
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "_پیغام‌ها"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+msgid "Cancel _Drag"
+msgstr ""
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "فرمان:"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr ""
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr ""
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
+#: 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-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: 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-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
+#: 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-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: 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 ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: 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 ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: 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-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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."
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:1002
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1013
-msgid "by %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
+#: 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 ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
+#: 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."
 msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: 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 ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: 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 ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:757
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:772
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:1007
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr ""
+
+#: mail/em-format-html-display.c:1018
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr ""
+
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
 msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12945,24 +13317,50 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1532
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1715
 #, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1919
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
 #, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2480
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:699
@@ -12974,88 +13372,74 @@ msgstr ""
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr ""
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "اضافه کردن نشانی"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "_پیغام‌ها"
@@ -13073,11 +13457,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13176,157 +13560,157 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13374,7 +13758,7 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13511,49 +13895,79 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "مالی"
+
 #: mail/importers/elm-importer.c:88
 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13580,18 +13994,46 @@ msgid "Select folder to import into"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr ""
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -13601,7 +14043,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13616,7 +14058,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13624,7 +14066,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13633,23 +14075,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13678,162 +14120,174 @@ msgid "Pine"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr ""
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr ""
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr ""
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ""
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_پوشه"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "ایجاد پنجره‌ی جدید"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -13842,14 +14296,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14138,7 +14584,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14438,365 +14884,480 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+#. 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-errors.xml.in.h:4
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"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-errors.xml.in.h:5
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr ""
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:6
-msgid "Are you sure you want to send a message in HTML format?"
+#: 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 ""
 
-#: mail/mail-errors.xml.in.h:7
+#. 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 ""
+
+#. 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: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 ""
 
-#: mail/mail-errors.xml.in.h:8
-msgid "Are you sure you want to send a message without a subject?"
+#. 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-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
+#: mail/mail-errors.xml.h:41
+#, fuzzy
+msgid "Use _Default"
+msgstr "جزئیات"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
+#. 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-errors.xml.in.h:16
-msgid "Cannot create the save directory, because \"{1}\""
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:17
-msgid "Cannot delete folder \"{0}\"."
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:18
-msgid "Cannot delete system folder \"{0}\"."
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-msgid "Cannot open source \"{2}\"."
+#. 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-errors.xml.in.h:23
-msgid "Cannot open target \"{2}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
+#. 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-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+msgid "Enter password."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
+#. 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-errors.xml.in.h:33
-msgid "Delete account?"
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
+#. 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/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:37
-msgid "Enter password."
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+msgid "Cannot open source \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+msgid "Cannot open target \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. 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-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "جزئیات"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+msgid "_Append"
+msgstr ""
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14805,170 +15366,170 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15032,24 +15593,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15089,89 +15650,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:235
+#, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr ""
+
+#: mail/mail-vfolder.c:242
 #, c-format
-msgid "Updating vfolders for uri: %s"
+msgid "Updating vFolders for '%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15203,43 +15769,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15281,121 +15847,86 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr ""
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "mail"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, c-format
+msgid "%ld KB"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
+#: shell/e-shell.c:744
+msgid "Uknown system error."
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-msgid "mail"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1107
+msgid "Generic error"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15520,11 +16051,11 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15561,11 +16092,28 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -15579,14 +16127,14 @@ msgid "Bug buddy could not be run."
 msgstr ""
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+msgid "About Evolution"
 msgstr ""
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
@@ -15594,44 +16142,6 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15690,6 +16200,48 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "_تقویم"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr ""
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_میانی:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "تاجیکستان"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "پوشه:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "نام حساب"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "نام پوشه"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr ""
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -15723,6 +16275,18 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr ""
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -15781,13 +16345,13 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -15801,67 +16365,121 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+msgid "Continue"
+msgstr ""
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr ""
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr ""
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr ""
 
@@ -16084,11 +16702,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr ""
@@ -16279,6 +16892,11 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16318,12 +16936,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr ""
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16387,7 +17005,7 @@ msgid "Select all contacts"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16418,8 +17036,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr ""
@@ -16437,7 +17055,7 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+msgid "_Save as VCard..."
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:42
@@ -16564,10 +17182,20 @@ msgstr ""
 msgid "Week"
 msgstr "هفته"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "هفته‌ی کاری"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 ""
+
 #: 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
@@ -16885,6 +17513,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_بستن"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17124,7 +17762,7 @@ msgid "Open the selected message in a new window"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17239,58 +17877,46 @@ msgstr ""
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_درشت‌تر"
 
-#: ui/evolution-mail-message.xml.h:117
-msgid "_Message Display"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "پیغام _بعدی"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_ابزارها"
@@ -17299,16 +17925,6 @@ msgstr "_ابزارها"
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_بستن"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17699,6 +18315,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_پنجره"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17765,10 +18386,6 @@ msgstr ""
 msgid "With _Status"
 msgstr "ایالات متحده"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -17922,6 +18539,31 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr ""
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+msgid "Evolution Warning"
+msgstr ""
+
+#: widgets/misc/e-error.c:118
+msgid "Evolution Information"
+msgstr ""
+
+#: widgets/misc/e-error.c:120
+msgid "Evolution Query"
+msgstr ""
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18034,6 +18676,26 @@ msgstr "متن"
 msgid "Find _Now"
 msgstr ""
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18045,8 +18707,24 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "نشانی"
+#~ msgid "Address 2:"
+#~ msgstr "نشانی _۲:"
+
+#, fuzzy
+#~ msgid "Time"
+#~ msgstr "عنوان"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "انتخاب نام‌ها"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "تقویم:"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "تاجیکستان"
 
 #~ msgid "A_ddress..."
 #~ msgstr "_نشانی..."
@@ -18063,9 +18741,6 @@ msgstr ""
 #~ msgid "S_pouse:"
 #~ msgstr "_همسر:"
 
-#~ msgid "_Add"
-#~ msgstr "_اضافه شود"
-
 #~ msgid "_Manager's name:"
 #~ msgstr "نام _مدیر:"
 
@@ -18084,9 +18759,6 @@ msgstr ""
 #~ msgid "Business"
 #~ msgstr "کاری"
 
-#~ msgid "Start Date:"
-#~ msgstr "تاریخ آغاز:"
-
 #, fuzzy
 #~ msgid "New Addressbook Book"
 #~ msgstr "نشانی"
diff --git a/po/fi.po b/po/fi.po
index c55d00e7f5..a3d65fcc1d 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -23,6 +23,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Osoitekirja"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Yhteystiedot: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution hälytys"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,16 +57,6 @@ msgstr "kortteja"
 msgid " card"
 msgstr "kortteja"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Yhteystiedot: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution hälytys"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Synkronoinnin oletusosoite:"
@@ -71,63 +71,20 @@ msgstr "Osoitekirjaa ei voitu ladata"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilotin osoitekirjan ohjelmalohkoa ei voitu lukea"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Automaattinen täydennys"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Varmenteet"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Määrittele automaatinen täydennys tästä"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Yhteystiedot"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Osoitekirja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution osoitekirjan osoite-ponnahdusikkuna"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution osoitekirjan osoitteiden katselin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution osoitekirjan kortin katselin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolutionin osoitekirjan komponentti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution osoitekirjan kansiokatselin"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime varmenteiden hallinta"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution kansioiden asetusten määrittely"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Kirjautuminen epäonnistui.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Hallitse S/Mime varmenteitasi täältä"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,41 +125,45 @@ msgstr "_Yhteystiedot:"
 msgid "Create a new contacts group"
 msgstr "Luo uusi oikotieryhmä"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Virhe haettaessa skeeman tietoja"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Siirretään..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Siirretään  '%s'"
@@ -210,8 +171,8 @@ msgstr "Siirretään  '%s'"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Tällä tietokoneella"
 
@@ -219,7 +180,7 @@ msgstr "Tällä tietokoneella"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Henkilökohtainen"
@@ -285,20 +246,41 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, kun Evolution siirtää kansioitasi..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Otetaan yhteyttä LDAP-palvelimeen anonyymisti"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Kirjautuminen epäonnistui.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Uusi osoitekirja"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSyötä salasana palvelulle %s (käyttäjä %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -320,6 +302,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Viimeksi nimien valinta-ikkunassa valitun kansion URI"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automaattinen täydennys"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Yhteystiedot"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Varmenteet"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Määrittele automaatinen täydennys tästä"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Osoitekirja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution osoitekirjan osoite-ponnahdusikkuna"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution osoitekirjan osoitteiden katselin"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution osoitekirjan kortin katselin"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolutionin osoitekirjan komponentti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime varmenteiden hallinta"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution kansioiden asetusten määrittely"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -341,6 +378,7 @@ msgstr " Tar_kista tuetut kannat "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -412,7 +450,7 @@ msgstr "_Yhteystiedot:"
 msgid "Address Book Properties"
 msgstr "Osoitekirjan ominaisuudet"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Aina"
@@ -427,109 +465,99 @@ msgid "Basic"
 msgstr "Yleistä"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Värit"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Yksikäsitteinen _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Yksikäsitteinen _nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Yleiset"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Ei koskaan"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Yksi"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Valitse väri"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "_Hakualue:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Hakualue:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Etsitään"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -539,7 +567,7 @@ msgstr ""
 "palvelimeen\n"
 "vain jos se tukee SSL- tai TLS-salausta."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -557,7 +585,7 @@ msgstr ""
 "salausta, koska\n"
 "yhteytesi on jo muutenkin turvallinen."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -571,19 +599,19 @@ msgstr ""
 "turvaan kohdistuville\n"
 "hyökkäyksille."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Ali"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Tuetut hakupohjat"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -594,7 +622,7 @@ msgstr ""
 "jätät tämän\n"
 "tyhjäksi, haut alkavat hakemistopuun juuresta."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -609,13 +637,13 @@ msgstr ""
 "kun taas\n"
 "kattavuus \"Yksi\" kattaa kentät yhden tason hakupohjastasi alaspäin.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -625,7 +653,7 @@ msgstr ""
 "asettaminen \n"
 "liian suureksi hidastaa osoitekirjaasi."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -634,7 +662,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -643,7 +671,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -656,128 +684,135 @@ msgstr ""
 "porttia sinun\n"
 "tulisi käyttää."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Ajan muoto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Käytetään yksilöllistä nimeä (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Käytetään sähköpostiosoitetta"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Milloin mahdollista"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Yhteystiedot:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Haun rajoitus:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Sähköpostiosoite:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Tunnistusmenetelmä:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Portin numero:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioriteetti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Hakupohja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Palvelimen _nimi: "
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Palvelin: "
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Aikakatkaisu (minuuttia):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Käytä salattua yhteyttä (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kortteja"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "yhdistetään-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "yleistä-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minuutti"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "haetaan-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution osoitekirjan nimien valinta"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Poista kaikki"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Poista"
 
+#: 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 "Nimi"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Poista kaikki"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Näytä yhteystietolista"
@@ -800,22 +835,15 @@ msgstr "Lisää yhteystietoihin"
 msgid "Unnamed Contact"
 msgstr "Nimetön yhteystieto"
 
-#: 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
-msgid "Name"
-msgstr "Nimi"
-
 #: 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
 msgid "Source"
 msgstr "Lähde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution osoitekirjan nimien valinta"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -882,142 +910,142 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Osoite _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Osoite:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Vuosipäivä:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Apulainen"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Syntymäpäivä:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalenteri:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Kaupunki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Komento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Yhteystiedonhallinta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "M_aa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Osasto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Vapaa/Varattu URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Koko nimi..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Koti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Sähköpostiosoite"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Johtaja"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Kutsumanimi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Huomioita:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: 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:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Muut"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postilokero:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1045,9 +1073,9 @@ msgstr "WWW-sivu:"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Työ"
@@ -1080,23 +1108,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa nämä yhteystiedot?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Haluatko varmasti\n"
+"poistaa tämän yhteystiedon?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Muokattava"
 
@@ -2068,92 +2112,110 @@ msgstr "Sambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL pikaviestin"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Palvelu"
-
-#: 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
-msgid "Location"
-msgstr "Sijainti"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Käyttäjätunnus"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Lähdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Kohdekirja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Uusi yhteystieto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Muokattavat kentät"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Muutettu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Tämä yhteystieto kuuluu näihin ryhmiin:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Valitse joku seuraavista vaihtoehdoista"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Seuraavat yhteydet ovat tällä hetkellä auki:"
+
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL pikaviestin"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Palvelu"
+
+#: 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
+msgid "Location"
+msgstr "Sijainti"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Käyttäjätunnus"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Yhteystiedon pikalisäys"
@@ -2171,22 +2233,6 @@ msgstr "_Koko nimi:"
 msgid "E-_mail:"
 msgstr "Sähköposti:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa nämä yhteystiedot?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Haluatko varmasti\n"
-"poistaa tämän yhteystiedon?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Osoite _2:"
@@ -2335,8 +2381,8 @@ msgstr "yhteystiedonhallinta"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kirja"
 
@@ -2397,6 +2443,432 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Edistynyt haku"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(kartta)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "kartta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Listan jäsenet"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "Sähköposti"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisaatio"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Asema"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Ryhmä"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Videoneuvottelu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Puhelin"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "työ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Matkapuhelin"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "henkilökohtainen"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Huomio"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Tehtävänimike"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Sähköposti"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Kotisivu"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Onnistui"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Lähde poissa käytöstä"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Lupa evätty"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Yhteystietoa ei löytynyt"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+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
+msgid "Protocol not supported"
+msgstr "Protokolla ei ole tuettu"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Peruutettu"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Lähdettä ei voitu avata"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Todennus epäonnistui"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Todennus vaaditaan"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Ei tällaista viestiä"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Muu virhe"
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Useampi kortti vastasi tätä kyselyä kuin joko palvelin on\n"
+"määritelty palauttamaan tai Evolution näyttämään.\n"
+"Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
+"osoitekirjan hakemistopalvelimen asetuksissa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen\n"
+"aikarajoitus, jonka olet asettanut tällä osoitekirjalle. Tarkenna\n"
+"hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
+"hakemistopalvelimen asetuksissa."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Virhe lisättäessä yhteystietoa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Virhe muokattaessa listaa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Virhe muokattessa yhteystietoa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Virhe poistettaessa listaa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Virhe poistettaessa yhteystietoa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"%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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s on jo olemassa\n"
+"Haluatko ylikirjoittaa?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "kortti.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Siirry yhteystieto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Kopioi yhteystieto"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Siirrä yhteystiedot"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Kopioi yhteystiedot"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Valitse osoitekirja"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Useita VCardeja"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard %s:lle"
+
+#.
+#. * 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 "(ei nimeä)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Ensisijainen sähköposti"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Sähköposti 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Sähköposti 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Valitse toiminto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Luo uusi yhteystieto \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Etsitään osoitekirjasta..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Muokkaa yhteystietoja"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Yhdistä sähköpostiosoite"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "ja yksi muu yhteystieto"
+msgstr[1] "ja yksi muu yhteystieto"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Näytä kaikki yhteystiedot"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Näytä pieni vCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Tallenna osoitekirjaan"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Ei yhteystietoja"
@@ -2411,8 +2883,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Kysely"
 
@@ -2466,9 +2938,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Tallenna VCardina"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2533,7 +3006,7 @@ msgid "Cut"
 msgstr "Leikkaa"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2544,18 +3017,8 @@ msgstr "Kopioi"
 msgid "Paste"
 msgstr "Liitä"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Poista"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Nykyinen näkymä"
 
@@ -2572,7 +3035,7 @@ msgstr ""
 "uudestaan"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Mikä tahansa luokka"
@@ -2613,21 +3076,6 @@ msgstr "Ryhmät"
 msgid "Company Phone"
 msgstr "Yrityksen puhelin"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Sähköposti"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Sähköposti 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Sähköposti 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Sukunimi"
@@ -2664,29 +3112,14 @@ msgstr "Päiväkirja"
 msgid "Manager"
 msgstr "Johtaja"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Matkapuhelin"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Huomio"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Asema"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisaatio"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Muu faksi"
@@ -2738,21 +3171,29 @@ msgstr "Yksikkö"
 msgid "Web Site"
 msgstr "Kotisivu"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Leveys"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Korkeus"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "On kohdistettu"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Valittu"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "On kohdistin"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Kenttä"
@@ -2769,10 +3210,6 @@ msgstr "Tekstimalli"
 msgid "Max field name length"
 msgstr "Kentän maksimipituus"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Sarakkeen leveys"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2801,406 +3238,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Sovitin"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Valittu"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "On kohdistin"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(kartta)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "kartta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Listan jäsenet"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "Sähköposti"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Asema"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Ryhmä"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Videoneuvottelu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Puhelin"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "työ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "henkilökohtainen"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Tehtävänimike"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Kotisivu"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Onnistui"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Lähde poissa käytöstä"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Osoitekirjaa ei ole olemassa"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Lupa evätty"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Yhteystietoa ei löytynyt"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Yhteystiedon tunniste on jo olemassa"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokolla ei ole tuettu"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Peruutettu"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Lähdettä ei voitu avata"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Todennus epäonnistui"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Todennus vaaditaan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Ei tällaista viestiä"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Muu virhe"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Osoitekirjan avaus epäonnistui. Syötit joko virheellisen URIn tai palvelinta "
-"ei voida tavoittaa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Osoitekirjaa ei voitu avata"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Useampi kortti vastasi tätä kyselyä kuin joko palvelin on\n"
-"määritelty palauttamaan tai Evolution näyttämään.\n"
-"Tarkenna hakuasi tai muuta tulosten määrän rajaa tämän\n"
-"osoitekirjan hakemistopalvelimen asetuksissa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Tämän kyselyn suorittaminen kesti pidempään kuin palvelimen\n"
-"aikarajoitus, jonka olet asettanut tällä osoitekirjalle. Tarkenna\n"
-"hakuasi tai pidennä palvelimen aikarajoitusta tämän osoitekirjan\n"
-"hakemistopalvelimen asetuksissa."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Tämä kysely ei valmistunut menestyksellisesti."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Haluatko tallentaa muutokset?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "Hylkää"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Virhe lisättäessä listalle"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Virhe lisättäessä yhteystietoa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Virhe muokattaessa listaa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Virhe muokattessa yhteystietoa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Virhe poistettaessa listaa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Virhe poistettaessa yhteystietoa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"%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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s on jo olemassa\n"
-"Haluatko ylikirjoittaa?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Kirjoita yli"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "kortti.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Siirry yhteystieto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Kopioi yhteystieto"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Siirrä yhteystiedot"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Kopioi yhteystiedot"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Valitse osoitekirja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Useita VCardeja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard %s:lle"
-
-#.
-#. * 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 "(ei nimeä)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Ensisijainen sähköposti"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Valitse toiminto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Luo uusi yhteystieto \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Lisää osoite olemassaolevaan yhteystietoon \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Etsitään osoitekirjasta..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Muokkaa yhteystietoja"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Yhdistä sähköpostiosoite"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "ja yksi muu yhteystieto"
-msgstr[1] "ja yksi muu yhteystieto"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Näytä kaikki yhteystiedot"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Näytä pieni vCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Tallenna osoitekirjaan"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Sarakkeen leveys"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3244,11 +3284,6 @@ msgstr "Evolutionin VCard-tuoja"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Tulosta kirjekuori"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Tulosta yhteystiedot"
@@ -3258,6 +3293,11 @@ msgstr "Tulosta yhteystiedot"
 msgid "Print contact"
 msgstr "Tulosta yhteystieto"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Tulosta kirjekuori"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3442,16 +3482,6 @@ msgstr "Yhteystiedon tulostustesti"
 msgid "This should test the contact print code"
 msgstr "Tämän pitäisi testata yhteystiedon tulostuksen koodia"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Määrittele tulostiedosto oletusulostulon sijaan"
@@ -3509,6 +3539,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Virhe ladattaessa oletusosoitekirjaa."
@@ -3521,11 +3561,12 @@ msgstr "Syötetiedosto"
 msgid "No filename provided."
 msgstr "Tiedostonimeä ei annettu."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Nimeämätön lista"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Syötä salasana"
 
@@ -3557,117 +3598,55 @@ msgstr "Prioriteetin oletusarvo:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilotin tehtävien ohjelmalohkoa ei voitu lukea"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalenterit"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Määrittele aikavyöhykkeesi, kalenteri ja tehtävälistasi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutionin kalenteri ja tehtävät"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenterin määrittely"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalenterin viestin skeduloinnin katselin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalenterin katselin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutionin kalenterin/tehtävien muokkain"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution tehtävien katselin"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolutionin kalenterin komponentti"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolutionin tehtävien komponentti"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tehtävät"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalenterin hälytys ja huomautuspalvelu"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Alkaen:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Päättyen:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution hälytys"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Hälytys %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Sulje"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Torku"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Torkkumisaika (minuutteja)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Muokkaa tapaamista"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Torku"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Avaa"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Hylkää"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Hylkää kaikki"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Ei kuvausta saatavilla"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3680,12 +3659,12 @@ msgstr ""
 "Alkaa %s\n"
 "Päättyy %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Varoitus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3697,7 +3676,7 @@ msgstr ""
 "lähettämään sähköpostia. Evolution näyttää sen sijaan\n"
 "tavallisen huomautusikkunan."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3714,19 +3693,19 @@ msgstr ""
 "\n"
 "Haluatko varmasti suorittaa tämän ohjelman?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Älä kysy tästä ohjelmasta enää uudelleen"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalenterin hälytys ja huomautuspalvelu"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobon alustus ei onnistunut"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs:n alustus ei onnistunut"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Hälytyksien ja huomautusten palvelun tehdasta ei voitu luoda"
 
@@ -3835,57 +3814,42 @@ msgid "Weekday the week starts on"
 msgstr "Viikonpäivä, jona työviikko alkaa"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Kysytäänkö vahvistusta poistettaessa tapaamista"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Kysytäänkö vahvistusta, kun kansiosta poistetaan poistetut"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Piilotetaanko tehdyt tehtävät"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Asetetaanko oletusmuistuttaja tapahtumille"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Näytetäänkö kello 24 tunnin vai am/pm muodossa"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Näytetäänkö viikkonumerot päivämääräselaimessa"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Yhteenveto sisältää"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Kuvaus sisältää"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Kommentti sisältää"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Kuvaus sisältää"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Ei vastaavaa"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalenteri"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3894,119 +3858,129 @@ msgstr ""
 "Tämä toimenpide poistaa kaikki tapahtumat, jotka ovat vanhempia kuin valittu "
 "aika. Jos jatkat, et voi palauttaa näitätapahtumia."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Poista vanhemmat tapahtumat kuin"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "päivää"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalenteri '%s' poistetaan. Haluatko varmasti jatkaa?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Ominaisuudet..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Ladataan kalenteria..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kalenterin '%s' avaus tehtävien ja kokousten luontia varten epäonnistui"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Tehtävien ja kokousten luontia varten ei löydy kalenteria"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalenterit"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Tapaaminen"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Luo uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Uusi tapaaminen"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Kokous"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Luo uusi kokouskutsu"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Koko _päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Luo uusi koko päivän tapaaminen"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Uusi kalenteri"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_Kalenteri"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Luo uusi kalenteri"
 
@@ -4036,15 +4010,36 @@ msgstr "Työviikko"
 msgid "Month View"
 msgstr "Kuukausinäkymä"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Yhteenveto sisältää"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Kuvaus sisältää"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Kommentti sisältää"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Kuvaus sisältää"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Ei vastaavaa"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Virhe avattaessa kalenteria"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Menetelmä ei ollut tuettu avattaessa kalenteria"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 
@@ -4053,19 +4048,6 @@ msgstr "Kalenterin avaamiseen ei ollut tarvittavia oikeuksia"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Kansiota '%s' ei voitu avata"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI jonka kalenteri näyttää"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Näytettävän näkymän tyyppi"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Äänihälytyksen asetukset"
@@ -4131,7 +4113,7 @@ msgstr "ylimääräisiä kertoja joka"
 msgid "hours"
 msgstr "tuntia"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Toimenpide/Liipasin"
 
@@ -4150,14 +4132,14 @@ msgstr "Perusasiat"
 msgid "Date/Time:"
 msgstr "Päiväys ja Aika:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Näytä viesti"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Soita ääni"
 
+#: 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 "Muistutukset"
@@ -4172,6 +4154,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
 msgid "Summary:"
 msgstr "Kuvaus:"
@@ -4210,10 +4193,104 @@ msgstr "minuutti"
 msgid "start of appointment"
 msgstr "tapaamisen alku"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "Ryhmä '%s' on etäryhmä. Määrittele sijainti, josta kalenteri haetaan."
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Lisää uusi kalenteri"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Tehtävälistan ryhmä"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Lisää uusi kalenteri"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tyyppi:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "viikkoa"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Käytä"
 
@@ -4227,19 +4304,19 @@ msgstr "Älä poista"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Älä käytä"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Käytä"
 
@@ -4264,162 +4341,176 @@ msgid "60 minutes"
 msgstr "60 minuuttia"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Hälytykset"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Erääntyy:</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Erääntyy:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Tehtävälistan vaihtoehdot</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Erääntyy:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Erääntyy:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Kalenterin ja tehtävien asetukset"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Eräpäivän ylittäneiden tehtävien väri"
 
-#: 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 "Tänään erääntyvien tehtävien väri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Päivä _päättyy:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Päivää"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Näyttö"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Kä_ytä"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Perjantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuutti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Maanantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Su"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Lauantai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Näytä muistutus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Näytä _viikkonumerot"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Sunnuntai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "_Tänään erääntyvät tehtävät:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_To"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Tehtävät"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Torstai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Aika"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Aikavyöhyke: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Ajan muoto:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Tiistai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Viikko _alkaa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Keskiviikko"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Työviikko"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Työpäivät:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 tuntia (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 tuntia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Lisää URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pyydä _vahvistusta poistettaessa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Tiivistä viikonloput kuukausinäkymässä"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Päivä alkaa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Näyttö"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4429,139 +4520,46 @@ msgstr "_Näyttö"
 msgid "_Edit"
 msgstr "_Muokkaa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "Vapaa/varattu julkaisu"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Pe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Yleistä"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Piilota _poistetut viestit kun on kulunut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Ma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Eräpäivän ylittäneet tehtävät:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_La"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Näytä tapaamisten loppumisajat viikko- ja kuukausinäkymissä"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Aikajaot:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Ti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Ke"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "_Ennen joka tapaamista"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "Määrittele paikka, josta kalenteri haetaan."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "Ryhmä '%s' on etäryhmä. Määrittele sijainti, josta kalenteri haetaan."
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Lisää uusi kalenteri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Tehtävälistan ryhmä"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalenterin ominaisuudet"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Lisää uusi kalenteri"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tyyppi:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "viikkoa"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4640,79 +4638,79 @@ msgstr "%s Olet tehnyt muutoksia. Unohda nämä muutokset ja päivitä muokkain?
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Et tehnyt muutoksia, suljetaanko muokkain?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Tarkistusvirhe: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: 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
-msgid "Completed "
-msgstr "Valmis"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr "(erääntyy "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Erääntyy "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Kohdetta ei voitu päivittää"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Muokkaa tapaamista"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tapaaminen - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tehtävä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Päiväkirjamerkintä - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Ei kuvausta"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Tallenna nimellä..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 "Tähän kohtaan tehdyt muutokset voidaan hylätä, jos päivitys saapuu"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Nykyistä versiota ei voida käyttää!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Tarkistusvirhe: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: 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
+msgid "Completed "
+msgstr "Valmis"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr "(erääntyy "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Erääntyy "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Lähdettä ei voitu avata"
@@ -4835,27 +4833,27 @@ msgstr "Valtuuta:"
 msgid "Enter Delegate"
 msgstr "Syötä valtuutettu"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Muistutus"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Toistuvuus"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Ajoitus"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Kokous"
 
@@ -4868,7 +4866,7 @@ msgstr "Eräpäivä on ennen aloituspäivää!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Aloituspäiväys on virheellinen"
 
@@ -4954,10 +4952,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4976,15 +4974,15 @@ msgstr "Järjestäjä vaaditaan."
 msgid "At least one attendee is required."
 msgstr "Vähintään yksi läsnäolija vaaditaan."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Valtuuta..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5256,25 +5254,19 @@ msgstr "_Hylkää muutokset"
 msgid "Save Event"
 msgstr "Tallenna tapahtuma"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Valitse tuoja"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Valitse kohde %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalenteri"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Kohdekansio:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "tehtävälista"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Tehtävät"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5302,38 +5294,44 @@ msgid "% _Complete"
 msgstr "valmis (%)"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Valmis"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Korkea"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Työn alla"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Matala"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Tavallinen"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Ei aloitettu"
 
@@ -5369,11 +5367,11 @@ msgstr "_Kotisivun osoite:"
 msgid "Assignment"
 msgstr "Tapaaminen"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Eräpäivä on virheellinen"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
@@ -5382,8 +5380,9 @@ msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
 msgid "Con_fidential"
 msgstr "_Luottamuksellinen"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Kuvaus:"
@@ -5529,102 +5528,53 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s tuntemattomalle liipasintyypille"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Julkinen"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Henkilökohtainen"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Luottamuksellinen"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Päiväys"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Aloituspäivä"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Kuvaus"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Vapaa"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Varattu"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "P"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Näpäytä avataksesi %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Nimetön"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "I"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Alkamispäivä:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "L"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Eräpäivä:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Maantieteellinen sijainti tulee syöttää muodossa:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Tila:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioriteetti:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ei"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Kotisivun osoite:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tuntematon"
+#: 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 "Julkinen"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Toistuva"
+#: 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 "Henkilökohtainen"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Annettu tehtäväksi"
+#: 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 "Luottamuksellinen"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5670,17 +5620,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Vapaa"
+
+#: 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 "Varattu"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Poistetaan valitut kohteet"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Avaa"
 
@@ -5689,41 +5648,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "L_iitä"
 
@@ -5781,78 +5741,158 @@ msgstr "Prioriteetti"
 msgid "Start date"
 msgstr "Aloituspäivä"
 
+#: 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 "Kuvaus"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Tehtävän tyyppi"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Uusi t_apaaminen..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Uusi koko pä_ivän tapahtuma"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Uusi kokous"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Valitse _säie"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Valitse..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Julkaise vapaa/varattu-tietoja"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopioi kansioon..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Siirrä kansioon..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Järjestä kokous..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Välitä iCalendar-muodossa..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Poista tämä _tapahtumakerta"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Poista _kaikki tapahtumakerrat"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Siirry _tähän päivään"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Siirry _päivään..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Asetukset..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Päiväys"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Tuntematon"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Toistuva"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Ei"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "P"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "L"
+
+#: 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 ""
+"Maantieteellinen sijainti tulee syöttää muodossa:\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5876,36 +5916,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02.i minuutin välein"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02.i minuutin välein"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6013,10 +6053,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ei mitään</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Tila:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6046,7 +6082,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6259,60 +6295,56 @@ msgstr "Liite ei sisällä kelvollista kalenteriviestiä"
 msgid "The attachment has no viewable calendar items"
 msgstr "Liitteessä ei ole näytettäviä kalenteriviestejä"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenteritiedostoa ei voitu päivittää!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Päivitys valmis\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Virhe CORBA-järjestelmässä\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Kohdetta ei löytynyt\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Läsnäolon tila päivitetty\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Osallistujan tilan päivitys epäonnistui!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Poisto valmis"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Lähetetty\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Kohdetta ei voitu lähettää!\n"
 
@@ -6429,28 +6461,6 @@ msgstr "Valtuutettu"
 msgid "In Process"
 msgstr "Työn alla"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poissa konttorilta"
@@ -6511,7 +6521,34 @@ msgstr "Kokouksen alkamisaika:"
 msgid "Meeting _end time:"
 msgstr "Kokouksen päättymisaika:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Syötä salasana %s:lle"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6520,24 +6557,22 @@ msgstr ""
 "Virhe %s:ssä:\n"
 "%s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Avataan tehtävät %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6546,38 +6581,47 @@ msgstr ""
 "Virhe avattaessa %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Ladataan tehtäviä"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Viimeistellään tehtäviä..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Valtuutetaan seuraavat tehtävät...."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Poistetaan poistettuja"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tehtävät"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Ladataan tapaamisia %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Ladataan tehtäviä %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Avataan %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6585,18 +6629,60 @@ msgstr ""
 "%s\n"
 "on kaatunut."
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Tehtävien taustajärjestelmä\n"
-"%s\n"
-"on kaatunut."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Tyhjennetään"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Määrittele aikavyöhykkeesi, kalenteri ja tehtävälistasi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutionin kalenteri ja tehtävät"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalenterin määrittely"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalenterin viestin skeduloinnin katselin"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutionin kalenterin/tehtävien muokkain"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolutionin kalenterin komponentti"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolutionin tehtävien komponentti"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalenterit"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tehtävät"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Huhtikuu"
@@ -6742,6 +6828,23 @@ msgstr "Syntymä- ja vuosipäivät"
 msgid "On The Web"
 msgstr "Verkossa"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Kalenterin '%s' ei voitu avata"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Tehtäviä kohteessa '%s' ei voitu avata."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6961,7 +7064,7 @@ msgid "Contacts: "
 msgstr "Yhteystiedot: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Tulostuksen esikatselu"
 
@@ -6973,69 +7076,79 @@ msgstr "Tulosta kohta"
 msgid "Print Setup"
 msgstr "Tulostusasetukset"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Uusi tehtävälista"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Poistettu"
+msgstr[1] "Poistettu"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Ladataan tehtäviä"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Tehtävien luomiseen tarvittavaa kalenteria ei ole saatavilla"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tehtävä"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Uusi tehtävä"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Tehtävälistan ryhmä"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Luo uusi tehtävä"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Näytettävän tehtäväkansion URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Tehtäviä '%s' ei voitu ladata"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7047,11 +7160,11 @@ msgstr ""
 "\n"
 "Valmis poistaa nämä tehtävät?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Älä kysy enää uudestaan"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Tulosta tehtävät"
 
@@ -8699,7 +8812,7 @@ msgstr "Kopioi kansion sisältö paikallisesti yhteydettömään käyttöön"
 msgid "Downloading new messages for offline mode"
 msgstr "Haetaan uusia viestejä yhteydettömään käyttöön"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Valmistellaan kansiota '%s' yhteydettömään tilaan"
@@ -8794,33 +8907,6 @@ msgstr "Virheellisiä argumentteja (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Virhe suoritettaessa suodatinhakua: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Hakulauseketta ei voida tulkita: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Virhe suoritettaessa hakulauseketta: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Kysely tuntemattomaan otsakkeeseen: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8852,7 +8938,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Suodatetaan uusia viestejä"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Hakulauseketta ei voida tulkita: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Virhe suoritettaessa hakulauseketta: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) vaatii yhden totuusarvoisen tuloksen"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Kysely tuntemattomaan otsakkeeseen: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8863,15 +8994,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg käyttäjätunnisteen vihjeen tulkitseminen epäonnistui."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg salalausepyynnön tulkinta epäonnistui."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8880,28 +9011,28 @@ msgstr ""
 "Tarvitse salalauseen avataksesi avaimen\n"
 "käyttäjälle: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Peruutettu."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Salaisen avaimen avaus epäonnistui: 3 virheellistä salalausetta syötetty."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Odottamaton vastaus GnuPG:ltä: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Salaus epäonnistui: kelvollisia vastaanottajia ei ole määritelty"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8912,83 +9043,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s salaus GnuPG:llä epäonnistui: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Allekirjoitustietoa ei voitu luoda: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:n suoritus epäonnistui: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:n suoritus epäonnistui."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Digitaalisesti allekirjoitettu viestin osa"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Viestin allekirjoitusta ei voida tarkistaa: virheellinen viestin muoto"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Viestin allekirjoitusta ei voida varmentaa: väliaikaistiedostoa ei voitu "
 "luoda: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Salaustieto ei voitu luoda: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Digitaalisesti salattu viestin osa"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Salattu sisältö"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Viestin sisältöä ei voitu tulkita"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Lukitsevan apulaisen putkea ei voida luoda: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Lukitsevaa apulaista ei voida käynnistää: %s"
-
-#: 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 "'%s' ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Lukitus epäonnistui: %s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9011,6 +9122,26 @@ msgstr "Lukitseminen käyttäen fcntl(2) kutsua epäonnistui: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Lukitseminen käyttäen flock(2) kutsua epäonnistui: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Lukitsevan apulaisen putkea ei voida luoda: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Lukitsevaa apulaista ei voida käynnistää: %s"
+
+#: 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 "'%s' ei voitu lukita: protokollavirhe lukkoapulaisen kanssa"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Lukitus epäonnistui: %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9267,7 +9398,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Virheellinen vastaus varmennukseen palvelimelta."
 
@@ -9471,7 +9602,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Salausvarmenne:"
 
 #: camel/camel-smime-context.c:360
@@ -9488,7 +9619,7 @@ msgstr "Kansion '%s' lukkoa ei voida luoda: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Viestin lisäys paikalliseen 'Lähetetyt'-kansioon epäonnistui: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Kirjautuminen epäonnistui.\n"
@@ -9553,98 +9684,98 @@ msgstr "Kansiota ei voida luoda: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Viestin %s hakeminen ei onnistu: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Virhe varmenteen allekirjoituksessa"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Hyväksytty allekirjoitus"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Allekirjoittaja: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP-komento epäonnistui: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "_Luo viestistä sääntö"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Kansion '%s' lukkoa ei voida luoda: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Käyttäjätunnuksen lähettäminen palvelimelle epäonnistui."
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komentoa ei ole toteutettu"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9662,16 +9793,26 @@ msgstr "Kansiota '%s' ei voida luoda: kansio on jo olemassa"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kansion luominen ei onnistu: virheellinen tapahtuma tallennuspaikassa"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Roskakori"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Roskapostia"
@@ -9792,7 +9933,7 @@ msgstr "Avaimen käyttötarkoitus ei salli varmenteiden allekirjoitusta"
 msgid "Error in application verification"
 msgstr "Virhe käyttötarkoituksen varmentamisessa"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9805,11 +9946,11 @@ msgstr ""
 "Sormenjälki:       %s\n"
 "Allekirjoitus:     %s "
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "HYVÄKSYTTY"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "VIRHEELLINEN"
 
@@ -9833,7 +9974,7 @@ msgstr ""
 "Haluatko hyväksyä kaikesta huolimatta?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9848,7 +9989,7 @@ msgstr ""
 "\n"
 "Haluatko hyväksyä?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9857,7 +9998,7 @@ msgstr ""
 "Ongelma varmenteessa: %s\n"
 "Myöntäjä: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9866,7 +10007,7 @@ msgstr ""
 "Virheellinen varmenteen alue: %s\n"
 "Myöntäjä %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9875,7 +10016,7 @@ msgstr ""
 "Varmenne vanhentunut: %s\n"
 "Myöntäjä: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9889,17 +10030,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL:n `%s' jäsentäminen epäonnistui"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Virhe tallennettaessa '%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Viestiä %s ei voitu löytää %s:stä"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Viestien kopioiminen tai siirtäminen ei onnistu virtuaalisiin kansioihin"
@@ -9909,11 +10050,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9930,10 +10066,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Et voi kopioida viestejä NNTP-kansiosta"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Tarkastetaan onko uutta sähköpostia"
 
 #: 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 "Etsi uusia viestejä kaikista kansioista"
@@ -9966,6 +10104,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise-palvelinten käyttöä varten"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9985,26 +10124,323 @@ msgstr "Ota yhteys IMAP-palvelimeen tekstimuotoista salasanaa käyttäen."
 msgid "Checklist"
 msgstr "lista"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida hakea: %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 "Palvelin katkaisi yhteyden odottamatta: %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 "Kansiota '%s' ei voida hakea: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida luoda: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kansiota '%s' ei voida hakea: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida hakea: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Viestiä ei voida liittää MH-kansioon: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Viestiä ei voida liittää MH-kansioon: %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 ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\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 ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\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 ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\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 ""
+"Viestin %s hakeminen kansiosta %s epäonnistui\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 "Kansiot"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Näytä ainoastaan tilatut kansiot"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Ohita palvelimen tarkoama kansioiden nimiavaruus"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Nimiavaruus"
+
+#: 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 "Sähköpostien luku ja tallennus IMAP-palvelimilta."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-palvelin %s:lle palvelimella %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:140
+#: 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 "Yhteyttä %s:ään (portti %d) ei voitu luoda: %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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Yhteys peruutettu"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Tuntematon virhe"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Yhdistäminen POP-palvelimeen %s  epäonnistui: pyydettyä "
+"tunnistatumismenetelmää ei tueta."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sSyötä SMTP-salasana käyttäjälle %s palvelimella %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Tunnistautuminen POP-palvelimelle %s epäonnistui: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida luoda: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kansion poistaminen ei onnistu: %s: Kansiota ei ole"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Komento:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kansion poistaminen ei onnistu: %s: Virheellinen tapahtuma"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida luoda: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kansion nimeäminen ei onnistu: %s: virheellinen toiminto"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kansiota '%s' ei voida luoda: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Odottamaton vastaus IMAP-palvelimelta: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Tietoa ei annettu"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Toiminto keskeytetty"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Palvelin katkaisi yhteyden odottamatta: %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:1089
-msgid "Unknown error"
-msgstr "Tuntematon virhe"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10049,21 +10485,21 @@ msgstr "Hakemistoa %s ei voitu luoda: %s"
 msgid "Could not load summary for %s"
 msgstr "Yhteenvetoa %s:lle ei voitu ladata"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Kansio oli tuhottu ja uudelleenluotu palvelimella"
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Etsitään muuttuneita viestejä"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Viestin haku epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10079,25 +10515,25 @@ msgstr ""
 "Viestiä ei voida hakea: %s\n"
 " %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Ei tällaista viestiä"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Tätä viestiä ei ole juuri nyt saatavilla"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Haetaan yhteenvedon tietoja uusista viesteistä"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Viestin runkoa ei löytynyt FETCH-vastauksesta"
 
@@ -10136,23 +10572,6 @@ msgstr "Käytä omaa komentoa palvelimeen yhdistämiseen"
 msgid "Command:"
 msgstr "Komento:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Kansiot"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Näytä ainoastaan tilatut kansiot"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Ohita palvelimen tarkoama kansioiden nimiavaruus"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nimiavaruus"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10176,86 +10595,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Imap-palvelin %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-palvelin %s:lle palvelimella %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Yhteyttä %s:ään (portti %d) ei voitu luoda: %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL ei käytettävissä"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Yhteys peruutettu"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"IMAP-palvelimeen %s yhdistäminen turvallisessa muodossa epäonnistui: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Komentoon \"%s\" liittyminen epäonnistui: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Et antanut salasanaa."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10266,25 +10642,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Kansioita %s ei ole olemassa"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Kansion nimi \"%s\" ei ole kelvollinen koska se sisältää merkin \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10292,7 +10661,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ylempi kansio on tuntematon: %s"
@@ -10401,58 +10770,58 @@ msgstr ""
 "sähköpostitiedostoihin.\n"
 "Tällä voidaan myös lukea hakemisto Elm, Pine tai Mutt-tyylisiä kansioita."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Säilön juuri %s ei ole absoluuttinen polku"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Säilön juuri %s ei ole tavallinen hakemisto"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Kansion hakeminen ei onnistu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Paikallisissa säilöissä ei ole saapuvien viestien kansiota"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Paikallinen viestitiedosto %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Hakemistoa %s ei voitu uudelleennimetä seuraavaksi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Uudelleennimeäminen epäonnistui '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kansion yhteenvetotiedostoa %s ei voitu poistaa: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kansion sisällysluetteloa %s ei voitu poistaa: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10518,7 +10887,7 @@ msgstr "Kansion `%s' poistaminen epäonnistui: %s"
 msgid "not a maildir directory"
 msgstr "ei maildir-hakemisto"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10849,7 +11218,7 @@ 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:258
+#: 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
@@ -10858,8 +11227,8 @@ msgid "User cancelled"
 msgstr "Käyttäjä perui"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10868,46 +11237,46 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Sisäinen virhe: UID on virheellisessä muodossa: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Et voi kopioida viestejä NNTP-kansiosta"
 
@@ -11030,7 +11399,8 @@ msgid "Could not get group: %s"
 msgstr "Ryhmää ei voitu hakea: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Viestejä ei voitu hakea: tuntematon virhe"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11083,8 +11453,8 @@ msgstr "Ei viestejä tunnisteella %s"
 msgid "Retrieving POP message %d"
 msgstr "Haetaan POP-viestiä %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Tuntematon syy"
 
@@ -11542,7 +11912,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "liite"
 
@@ -11586,6 +11956,105 @@ msgstr "MIME-tyyppi:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ehdota liitteen automaattista näyttämistä"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
+"asetettu sähköpostitilille"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu "
+"sähköpostitilille"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Tiedostoa ei voida avata"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Viestiä ei voida hakea muokkaimelta"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Useita viestejä"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Avaa tiedosto"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automaattisesti luotu"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Allekirjoitus:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> tiedosto liitetty"
+msgstr[1] "<b>%d</b> tiedostoa liitetty"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Piilota _liitepalkki (tiputa liitteitä tähän)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Näytä _liitepalkki (tiputa liitteitä tähän)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Kirjoita viesti"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Viestin kirjoitusikkunaan ei voitu luoda:\n"
+"Osoitteen valintakontrollia ei voitu aktivoida."
+
+#: 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 ""
+"Viestin lähetysikkunaa ei voitu luoda:\n"
+"HTML-muokkainkomponentin luominen epäonnistui.\n"
+"Varmista, että oikea versio ohjelmista gtkhtml ja libgtkhtml\n"
+"on asennettu.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Viestimuokkain -ikkunan luominen epäonnistui:\n"
+"HTML-muokkainkomponentin käynnistys ei onnistunut."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>Muokkain sisältää viestin rungon, joka ei ole tekstiä ja jota ei voida "
+"muokata)</b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postituksen kohde"
@@ -11666,213 +12135,135 @@ msgstr "Valitse kansiot, joihin postituksia lähetetään, näpäyttämällä t�
 msgid "Attach file(s)"
 msgstr "Liitä tiedosto(t)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Lähtevää viestiä ei voida allekirjoittaa: allekirjoitusvarmennetta ei ole "
-"asetettu sähköpostitilille"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Lähtevää viestiä ei voida salata: Salausvarmennetta ei ole asetettu "
-"sähköpostitilille"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Tiedostoa ei voida avata"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Viestiä ei voida hakea muokkaimelta"
-
-#: composer/e-msg-composer.c:1551
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "Useita viestejä"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Avaa tiedosto"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automaattisesti luotu"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Allekirjoitus:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> tiedosto liitetty"
-msgstr[1] "<b>%d</b> tiedostoa liitetty"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Piilota _liitepalkki (tiputa liitteitä tähän)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Näytä _liitepalkki (tiputa liitteitä tähän)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Kirjoita viesti"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Lisää viestiin liitetiedoston"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Viestin kirjoitusikkunaan ei voitu luoda:\n"
-"Osoitteen valintakontrollia ei voitu aktivoida."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Viestin lähetysikkunaa ei voitu luoda:\n"
-"HTML-muokkainkomponentin luominen epäonnistui.\n"
-"Varmista, että oikea versio ohjelmista gtkhtml ja libgtkhtml\n"
-"on asennettu.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Viestimuokkain -ikkunan luominen epäonnistui:\n"
-"HTML-muokkainkomponentin käynnistys ei onnistunut."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>Muokkain sisältää viestin rungon, joka ei ole tekstiä ja jota ei voida "
-"muokata)</b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Lukemattomia viestejä"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Haluatko tallentaa muutokset?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Putken luonti epäonnistui: %s"
+msgid "Don't Recover"
+msgstr "Älä poista"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Allekirjoitusta ei voitu tallentaa: %s"
+msgid "Recover"
+msgstr "Poista"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Allekirjoitusta ei voitu tallentaa: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Hylkää muutokset"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Haluatko tallentaa muutokset?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Virhe tallennettaessa oikoteitä."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Älä poista"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Varoitus: Muutettu viesti"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Virhe tallennettaessa oikoteitä."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Haluatko todella poistaa tämän nimettömän tapaamisen?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Poista"
+msgid "Discard Changes"
+msgstr "_Hylkää muutokset"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Tallenna viesti..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Putken luonti epäonnistui: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Lukemattomia viestejä"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Allekirjoitusta ei voitu tallentaa: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Varoitus: Muutettu viesti"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Lisää viestiin liitetiedoston"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 "Käyttäjätili täytyy määritellä ennen kuin sähköpostia voidaan lähettää."
@@ -12007,7 +12398,8 @@ msgstr ""
 "Saman niminen tiedosto on jo olemassa.\n"
 "Kirjoitetaanko sen yli?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Kirjoita tiedoston yli?"
 
@@ -12184,81 +12576,97 @@ msgstr "Valitse aika johon verrataan"
 msgid "_Filter Rules"
 msgstr "Suodatinsäännöt"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Virhe säännöllisessä lausekkeessa '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Tiedostoa '%s' ei ole olemassa tai se ei ole tavallinen tiedosto."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Kokouksen päivitys"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Unohdit valita päivän."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Yksikäsitteinen _nimi:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Tiedostonimi täytyy antaa."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Poistetaan kansiota %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Tiedostoa '%s' ei ole olemassa tai se ei ole tavallinen tiedosto."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Tapaaminen"
+msgid "Missing folder."
+msgstr "Poistetaan kansiota %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Kansio täytyy valita."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Ei palvelinta valittuna"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Virhe säännöllisessä lausekkeessa '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Unohdit valita päivän."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Tapaaminen"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Suodattimella täytyy olla nimi."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Muuta tämän vKansion nimeä"
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Tiedostonimi täytyy antaa."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Kansio täytyy valita."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ei palvelinta valittuna"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12271,66 +12679,11 @@ msgstr "Valitse tiedosto"
 msgid "<b>Then</b>"
 msgstr "<b>Erääntyy:</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Valitse kansio"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Tärkeä"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Tehtävää"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Myöhemmin"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Testi"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Säännön nimi: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Nimetön"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Erääntyy:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Suorita toiminnot"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "kaikki ehdot täytetään"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "jos mikään ehdoista täyttyy"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "tulevat"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "lähtevät"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr " "
@@ -12421,6 +12774,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Myöhemmin"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Testi"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Säännön nimi: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Erääntyy:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "kaikki ehdot täytetään"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "jos mikään ehdoista täyttyy"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Suorita toiminnot"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Valtuutettu"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Vastaanottajat"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Vastaukset %s:lle"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Sisäistä:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "tulevat"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "lähtevät"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12550,7 +12974,7 @@ msgstr "ei ole merkitty"
 msgid "Junk Test"
 msgstr "Roskapostitesti"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Otsikko"
@@ -12588,7 +13012,7 @@ msgstr "Poistu ohjelmasta"
 msgid "Play Sound"
 msgstr "Soita ääni"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Lue"
 
@@ -12658,9 +13082,9 @@ msgstr "alkaa merkkijonolla"
 msgid "Stop Processing"
 msgstr "Lopeta käsittely"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12723,105 +13147,60 @@ msgstr "Otsikko ei sisällä"
 msgid "Virtual _Folders"
 msgstr "Virtuaaliset kansiot"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Lisää"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "vKansion lähde"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Muokkaimen asetukset"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Määrittele sähköpostiasetuksia mukaan lukien turva-asetukset ja viestin "
-"näyttö"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tästä"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Määrittele sähköpostitilisi tästä"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution sähköposti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutionin sähköpostitilien asetukset"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutionin sähköpostikomponentti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutionin sähköpostin muokkain"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution sähköpostin muokkaimen asetukset"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution sähköpostikansion katselin"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution sähköpostin asetukset"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Sähköposti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Sähköpostitilit"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Sähköpostin asetukset"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Oletus]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Tilin nimi"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokolla"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Nimeämätön"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Kielet"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Lisää allekirjoitus:"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Allekirjoitukset"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "------- Välitetty viesti ---------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%a, %d-%m-%Y kello %H:%M %%+05d, %%s kirjoitti:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Luo virtuaalikansio alusta alkaen..."
 
@@ -12855,265 +13234,440 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Määrittele mihin kansio luodaan:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Luo uusi kansio"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Kansion _nimi:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "vKansiot"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "EI VASTAAVAA"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Saapuneet"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Ladataan..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Avataan kansiota %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Viestiä ei voida tiputtaa ylätason taltioon"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Siirrä"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Peruuta tehtävä"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Valitse kansio"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopioi"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Luo uusi kansio"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Nimeä '%s' uudelleen: "
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Nimeä kansio uudestaan"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Näytä"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Avaa _uudessa ikkunassa"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Siirrä"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Uusi kansio..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Nimeä uudestaan"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "vKansiot"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "EI VASTAAVAA"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Saapuneet"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Muokkaa uutena viestinä..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Tulosta"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Vastaa _listalle"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Vastaa k_aikille"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Välitä"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "_Vastine...."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "_Merkitse valmiiksi"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Poista merkki"
 
-#: mail/em-folder-view.c:787 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 "Merkitse _luetuksi"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Merkitse luke_mattomaksi"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Merkitse tärkeäks_i"
 
-#: mail/em-folder-view.c:791 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 "Merkitse _roskapostiksi"
 
-#: mail/em-folder-view.c:792 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 "Merkitse _ei-roskapostiksi"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Palauta"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Siirrä kansioon..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopioi kansioon..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Lisää lähettäjä _osoitekirjaan"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Toteuta _suodattimet"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Suodatinsäännöt"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Luo viestistä sääntö"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VKansio _aiheen perusteella"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VKansio _lähettäjän perusteella"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VKansio _vastaanottajien perusteella"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VKansio _listan perusteella"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "vKansio säikeen perusteella"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Suodata a_iheen mukaan"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Suodata _lähettäjän mukaan"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Suodata _vastaanottajien mukaan"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Suodata _postituslistan mukaan"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "_Suodata säikeen perusteella"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Oletukset"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Tulosta viesti"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin sijainti"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Näpäytä lähettääksesi %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Lähettäjä"
+
+#: 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 "Vastausosoite:"
+
+#: 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 "Vastaanottaja"
+
+#: 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 "Kopiot:"
+
+#: 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 "Piilokopiot"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Näpäytä avataksesi %s"
+msgid "%s attachment"
+msgstr "%s liite"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Allekirjoituksen muoto ei ole tuettu"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Haetaan %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Allekirjoittamaton"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Hyväksytty allekirjoitus"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Hylätty allekirjoitus"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Salaamaton"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Heikosti salattu"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Salattu"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Salattu vahvalla algoritmilla"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Osoitin FTP-palvelimelle (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Osoitin paikalliseen tiedostoon (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr ""
+"Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Muotoillaan viestiä"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Postittaja"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13121,11 +13675,7 @@ msgstr "Näpäytä avataksesi %s"
 msgid "Matches: %d"
 msgstr "Osumia: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Allekirjoittamaton"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13133,11 +13683,7 @@ msgstr ""
 "Viesti ei ole allekirjoitettu. Ei ole varmaa, että viestin lähettäjä on "
 "varmasti se, jolta viesti näyttää olevan."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Hyväksytty allekirjoitus"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13145,11 +13691,7 @@ msgstr ""
 "Tämä viesti on allekirjoitettu ja varmennettu. Viesti on "
 "hyvintodennäköisesti aito."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Hylätty allekirjoitus"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13157,11 +13699,11 @@ msgstr ""
 "Tämän viestin allekirjoitusta ei voida tarkistaa, se on ehkä muuttunut "
 "siirron aikana."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Allekirjoitus on kelvollinen, mutta lähettäjää ei voida varmistaa"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13169,11 +13711,7 @@ msgstr ""
 "Tämä viesti on allekirjoitettu kelvollisella allekirjoituksella, mutta "
 "viestin lähettäjää ei voida varmistaa."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Salaamaton"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13182,11 +13720,7 @@ msgstr ""
 "Viesti ei ole salattu. Viestin sisältöä voidaan tutkia sen matkatessa "
 "lähettäjältä Internetin läpi."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Heikosti salattu"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13196,11 +13730,7 @@ msgstr ""
 "mahdotonta, että ulkopuolinen pystyy purkamaan ja katsomaanviestin sisällön "
 "käytännöllisen lyhyessä ajassa."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Salattu"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13208,11 +13738,7 @@ msgstr ""
 "Viesti on salattu. Ulkopuolisen on vaikea avata viestin sisältö "
 "luettavakseen."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Salattu vahvalla algoritmilla"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13222,183 +13748,63 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Näytä varmenne"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Tätä varmennetta ei voida näyttää"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Valmistui %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Eräpäivä ylitetty:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "kirjoittanut %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "Näytä _sisäkkäisesti"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Piilota"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sivu  %d / %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Haetaan %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Väärin muotoilut rungon ulkopuolinen viestin osa."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Osoitin FTP-palvelimelle (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Osoitin paikalliseen tiedostoon (%s) palvelimella \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Osoitin paikalliseen tiedostoon (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Osoitin muulla palvelimella olevaan tietoon (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr ""
-"Osoitin tuntemattomaan muulla palvelimella olevaan tietoon (tyyppiä \"%s\")"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Muotoillaan viestiä"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Lähettäjä"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Vastausosoite:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Vastaanottaja"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Kopiot:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Piilokopiot"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Postittaja"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Päiväys"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s liite"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME viestin tulkitseminen epäonnistui: tuntematon virhe"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Tuntematon salausmuoto muodolle multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME-viestin tulkisteminen epäonnistui, näytetään lähdekoodi"
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Allekirjoituksen muoto ei ole tuettu"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Tuntematon virhe tarkistettaessa allekirjoitusta"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (sisäänrakennettu)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Joka vuosi"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Joka viikko"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Joka kuukausi"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13410,25 +13816,55 @@ msgstr ""
 "\n"
 "Odota kärsivällisesti, että Evolution muuntaa kansioitasi..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "POP3-tunnusten välimuistin siirto epäonnistui: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kansiota '%s' ei voida luoda: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Kansioiden laajennuksen tilan siirto epäonnistui: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Tiedostokuvaajan kopiointi epäonnistui: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, 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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Taltion '%s' avaaminen epäonnistui: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Hakemiston '%s' luonti epäonnistui: %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13439,88 +13875,74 @@ msgstr "Tallenna nimellä..."
 msgid "untitled_image.%s"
 msgstr "nimetön_kuva.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Aseta _taustaksi"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Vastaa lähettäjälle"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Lähetä _viesti..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Lisää osoitekirjaan"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Avaa ohjelmassa %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tämä varasto ei tue tilaamista tai tilaukset eivät ole käytössä."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Tilattu"
 
-#: mail/em-subscribe-editor.c:637 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 "Kansio"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Valitse palvelin."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Ei palvelinta valittuna"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Älä näytä tätä viestiä uudelleen."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Suodattimet"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "------- Välitetty viesti ---------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %d-%m-%Y kello %H:%M %%+05d, %%s kirjoitti:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "viesti"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Tallenna viesti..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Lisää osoite"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Viesti %s:ltä"
@@ -13538,11 +13960,13 @@ msgid "Check incoming mail being junk"
 msgstr "Etsi roskapostia saapuvista sähköposteista"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Lainauksen korostusväri"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Lainauksen korostuksene käytetty väri."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13646,14 +14070,20 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Etiketit ja niihin liittyvät värit"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Lista tileistä"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Lista tileistä"
+
+#: 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."
@@ -13662,28 +14092,33 @@ msgstr ""
 "merkkijonoja, jotka nimeävät alihakemistoja hakemiston/apps/evolution/mail/"
 "accounts alla."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista omista otsakkeista ja tieto siitä ovatko ne käytössä."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Lista Evolutionin sähköpostiosan tuntemista etiketeistä. Lista sisältää nimi:"
 "väri pareja, jossa väri on määäritelty HTML-värien heksadesimaalisessa "
 "muodossa."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Lista MIME-tyypeistä, joille etsitään bonobo komponenttikatselimia"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Hae HTML-viestien kuvat käyttäen HTTP:ta"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13693,91 +14128,91 @@ msgstr ""
 "koskaan hae kuvia verkosta 1 - Hae kuvia, jos lähettäjä on osoitekirjassa 2 "
 "- Hae kuvat aina verkosta"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Kirjaa suodatintoimenpiteet"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Kirjaa suodattimien toimenpiteet määriteltyyn lokitiedostoon."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Lokitiedosto suodattimien toimenpiteille"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Lokitiedosto suodattimien toimenpiteille."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Merkitse nähdyksi määritellyn viiveen jälkeen."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Merkitse lainaukset viestin \"esikatselussa\""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Merkitse lainaukset viestin \"esikatselussa\"."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Viestiikkunan oletuskorkeus"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Viestiikkunan oletusleveys"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Viestin näyttötyyli (normaali, kaikki otsakkeet, lähdekoodi)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Uudesta postista huomauttava äänitiedosto"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Uutta postia-huomuksen tyyppi"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Kysy vahvistus, jos viestin aihe on tyhjä"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Kysy vahvistus, kun kansioista poistetaan pysyvästi poistettuja viestejä."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Kysy vahvistus, kun käyttäjä poistaa poistettuja"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Kysy vahvistus, jos käyttäjä syöttää ainoastaan Bcc-kentän"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13785,36 +14220,28 @@ msgstr ""
 "Kysy vahvistus, kun ollaan lähettämässä HTML-viestiä vastaanottajille, jotka "
 "eivät sellaista halua vastaanottaa."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
 "kenttiä"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Kysy vahvistus, jos yritetään lähteä ei-toivottua HTML-postia"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Tunnista linkit tekstissä ja korvaa ne linkillä"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Tunnista hymiöt tekstissä ja korvaa ne kuvilla."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Suorita roskapostitarkistus saapuvalle postille"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "Salainen optio."
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "Salainen optio."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Lähetä oletuksena HTML-sähköpostia"
@@ -13862,7 +14289,7 @@ msgstr "Oikolue kirjoitettaessa"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Viestiikkunan oletuskorkeus"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -14005,33 +14432,66 @@ msgstr "Portti, jossa käyttäjän spamd-palvelinta ajetaan"
 msgid "spamd port"
 msgstr "Spamd:n portti"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-tuoja"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutionin Netscape sähköpostin tuoja"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Muokkaimen asetukset"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 tuoja"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Määrittele sähköpostiasetuksia mukaan lukien turva-asetukset ja viestin "
+"näyttö"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-tuoja"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Määrittele oikoluvun, allekirjoitusten ja viestin muokkaimen asetukset tästä"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-tuoja"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Määrittele sähköpostitilisi tästä"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution sähköposti"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutionin sähköpostitilien asetukset"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolutionin sähköpostikomponentti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolutionin sähköpostin muokkain"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution sähköpostin muokkaimen asetukset"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution sähköpostin asetukset"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Sähköpostitilit"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Sähköpostin asetukset"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Sähköposti:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14039,15 +14499,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Odota, ole hyvä"
 
@@ -14076,18 +14536,46 @@ msgid "Select folder to import into"
 msgstr "Valitse kansio, johon tuodaan"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Tuodaan '%s'"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Tuodaan kansiota"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-tuoja"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutionin Netscape sähköpostin tuoja"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 tuoja"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-tuoja"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-tuoja"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Tutkitaan %s"
@@ -14097,7 +14585,7 @@ msgstr "Tutkitaan %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteettien suodatin \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14123,7 +14611,7 @@ msgstr ""
 "prioriteettien sijasta. Tarkista tuodut suodattimen ja varmista,\n"
 "että kaikki toimii vielä kuten oli tarkoitus."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14135,7 +14623,7 @@ msgstr ""
 "ominaisuuksia, joita Evolution ei tue.\n"
 "Nämä suodattimet poistetaan."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14149,23 +14637,23 @@ msgstr ""
 "on muutettu tarkistamaan, sisältyykö annettu merkkijono\n"
 "viestin runkoon."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution tuo vanhoja tietojasi Netscapesta"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Tuodaan tietoja Netscapesta"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Asetukset"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Suodattimet"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14198,127 +14686,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutionin tilimuokkain"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Avaimen sopimus"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Isäntäpalvelin:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Käyttäjät_unnus:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Polku:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Viesti %s:lle"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Aihe on %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Viesti %s:ltä"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s postilista"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Vastaukset %s:lle"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Lisää suodatussääntö"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Poistettu"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d päivää"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sekuntia"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d sekuntia"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d yhteystietoa"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Poistettu"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Uusi viesti"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Lähetä viesti"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Kirjoita uusi viesti"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Uusi vKansio"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Suodattimet"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Luo uusi kalenteri"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "URI sähköpostilähteelle,  jonka näkymä näyttää"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Tarkistetaan palvelua"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Yhdistetään palvelimeen..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identiteetti"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14328,12 +14828,12 @@ msgstr ""
 "kentät eivät ole pakollisia, jollet halua sisältää näitä tietoja "
 "lähettämiisi sähköpostiviesteihin."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Saapuva posti"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14342,15 +14842,15 @@ msgstr ""
 "et ole varma asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Valitse joku seuraavista vaihtoehdoista"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Lähtevä posti"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14359,11 +14859,11 @@ msgstr ""
 "asetuksista, kysy järjestelmäsi ylläpitäjältä tai Internet-"
 "palveluntarjoajaltasi."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Tilinhallinta"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14377,14 +14877,6 @@ 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.c:888
-msgid "Checking Service"
-msgstr "Tarkistetaan palvelua"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Yhdistetään palvelimeen..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14700,7 +15192,8 @@ msgid "Execute Command..."
 msgstr "Suorita komento..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Tasalevyinen:"
 
 #: mail/mail-config.glade.h:82
@@ -15030,352 +15523,458 @@ msgstr "väri "
 msgid "description"
 msgstr "kuvaus"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Kansio nimeltään \"%s\" on jo olemassa. Valitse toinen nimi."
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Haluatko varmasti poistaa tämän tilin?"
+msgid "Invalid authentication"
+msgstr "Todennus"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP-palvelin %s ei tue pyydettyä tunnistatumismenetelmää %s."
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
+"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-errors.xml.in.h:6
+#. 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 "Haluatko varmasti poistaa tämän URLin?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
-"kenttiä"
+"Olet lähettämässä HTML-muotoista viestiä. Varmista, että seuraavat\n"
+"viestin vastaanottajat haluavat ja kykenevät lukemaan HTML-viestejä:\n"
+"%sLähetetäänkö joka tapauksessa?"
 
-#: mail/mail-errors.xml.in.h:8
+#: 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 "Lähetä"
+
+#. 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 ""
 "Kysy vahvistus, jos yritetään lähettää viestiä tyhjällä aihe-otsakkeella."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
+"Varmista, kun käyttäjä yrittää lähettää viestiä ilman Vastaanottaja tai Cc-"
+"kenttiä"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kansion kopioiminen ei onnistu: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kansiota ei voida luoda: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Väliaikaishakemistoa ei voitu luoda: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Hakemistoa %s ei voitu luoda: %s."
+msgid "Use default drafts folder?"
+msgstr "Polku yhteystietojen oletuskansioon"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Kansion poistaminen ei onnistu:\n"
-"%s"
+"Tämän sähköpostitilin luonnoskansiota ei voida avata.\n"
+"Haluatko käyttää oletuskansiota luonnoksille?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Paikallisen '%s' kansion poistaminen ei onnistu."
+msgid "Use _Default"
+msgstr "Oletukset"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Kansiota `%s' ei voida hakea: kansiota ei ole olemassa."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Poista pysyvästi kaikki poistetut viestit tästä kansiosta"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kansion siirto ei onnistu: %s"
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Lähdettä ei voitu avata"
+msgid "_Expunge"
+msgstr "_Poista poistetut"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Lähdettä ei voitu avata"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Poista kaikki pyyhityt viesti pysyvästi kaikista kansioista"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Viestiä ei voida avata"
+msgid "_Empty Trash"
+msgstr "_Tyhjennä roskakori"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
+"Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Paikallista %s kansiota ei voida nimetä uudelleen."
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Hakemistoa %s ei voitu luoda: %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Tallentaminen ei onnistu \"%s\"\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Lisää allekirjoitus:"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Allekirjoitusta ei voitu tallentaa: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Poista \"%s\""
+msgid "Error while {0}."
+msgstr ""
+"Virhe '%s':ssä:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Poista valitut yhteystiedot"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "_Hylkää muutokset"
+msgid "Error while performing operation."
+msgstr ""
+"Virhe suoritettessa toimenpidettä:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Haluatko tallentaa muutokset?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Älä poista"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Syötä salasana"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Virhe ladattaessa suodatintietoja:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Virhe suoritettessa toimenpidettä:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Virhe '%s':ssä:\n"
+"Tallentaminen ei onnistu \"%s\"\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Hakemistoa %s ei voitu luoda: %s."
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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
 msgid "File exists but cannot overwrite it."
 msgstr "Tiedosto on jo olemassa, kirjoitetaanko yli?"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Tiedostoa '%s' ei ole olemassa tai se ei ole tavallinen tiedosto."
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"Kansion poistaminen ei onnistu:\n"
+"%s"
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Paikallisen '%s' kansion poistaminen ei onnistu."
+
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Paikallista %s kansiota ei voida nimetä uudelleen."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Poista \"%s\""
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Poistetaanko todella kansio \"%s\" ja kaikki sen alikansiot?"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "Kansio nimeltään \"%s\" on jo olemassa. Valitse toinen nimi."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Todennus"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kansion siirto ei onnistu: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Lähdettä ei voitu avata"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Viestiä ei voida avata"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Kansion kopioiminen ei onnistu: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Olet lähettämässä HTML-muotoista viestiä. Varmista, että seuraavat\n"
-"viestin vastaanottajat haluavat ja kykenevät lukemaan HTML-viestejä:\n"
-"%sLähetetäänkö joka tapauksessa?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kansiota ei voida luoda: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Poistetaanko todella kansio \"%s\" ja kaikki sen alikansiot?"
+msgid "Cannot open source \"{1}\""
+msgstr "Lähdettä ei voitu avata"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Poista valitut yhteystiedot"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Haluatko varmasti poistaa tämän tilin?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Seuraavat vKansiot:\n"
-"%skäyttivät poistettua kansiota:\n"
-"   '%s'\n"
-"ja ne on päivitetty."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Älä poista"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Seuraavat vKansiot:\n"
-"%skäyttivät poistettua kansiota:\n"
-"   '%s'\n"
-"ja ne on päivitetty."
+msgid "Could not save signature file."
+msgstr "Allekirjoitusta ei voitu tallentaa: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Lisää allekirjoitus:"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Hylkää muutokset"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP-palvelin %s ei tue pyydettyä tunnistatumismenetelmää %s."
+msgid "Do you wish to save your changes?"
+msgstr "Haluatko tallentaa muutokset?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15383,86 +15982,97 @@ msgstr ""
 "\n"
 "Haluatko tallentaa muutokset?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Tämän sähköpostitilin luonnoskansiota ei voida avata.\n"
-"Haluatko käyttää oletuskansiota luonnoksille?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Oletukset"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Hylkää muutokset"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Polku yhteystietojen oletuskansioon"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Et ole täyttänyt kaikkia tarvittavia kohtia."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Kansiota `%s' ei voida hakea: kansiota ei ole olemassa."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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."
 msgstr ""
-"Sinulla on lähettämättömiä viestejä, haluatko poistua siitä huolimatta?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Et voi luoda kahta tiliä samalla nimellä."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Hylkää muutokset"
-
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "_Tyhjennä roskakori"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Seuraavat vKansiot:\n"
+"%skäyttivät poistettua kansiota:\n"
+"   '%s'\n"
+"ja ne on päivitetty."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Poista poistetut"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Lähetä"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Seuraavat vKansiot:\n"
+"%skäyttivät poistettua kansiota:\n"
+"   '%s'\n"
+"ja ne on päivitetty."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Kirjoita yli"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Lähetä"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingataan %s"
@@ -15471,20 +16081,20 @@ msgstr "Pingataan %s"
 msgid "Working"
 msgstr "Suoritetaan"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Suodatetaan kansiota"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Haetaan viestejä"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Virhe käytettäessä lähtevän postin suodattimia: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15493,115 +16103,115 @@ msgstr ""
 "Lisäys '%s':ään epäonnnistui: %s\n"
 "Lisätään paikalliseen 'Lähetetyt' kansioon."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Lähetetään viestiä %d / %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Virhe viestin %d/%d kohdalla"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Valmis."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Tallennetaan viestiä kansioon"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Siirretään viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopioidaan viestejä kohteeseen %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Etsitään kansioita kohteessa \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Välitetyt viestit"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Avataan kansiota %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Avataan tallennustilaa %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Poistetaan kansiota %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Tallennetaan kansiota %s"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Siivotaan ja tallennetaan tiliä '%s'"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Tallennetaan tiliä %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Virkistetään kansiota"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Poistetaan poistettuja kansiosta"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tyhjennetään roskakoria '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Paikalliset kansiot"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Haetaan viestiä %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15610,7 +16220,7 @@ msgstr ""
 "Tulostiedoston luonti epäonnistui: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15619,11 +16229,11 @@ msgstr ""
 "Virhe tallennettaessa viestejä: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Tallennetaan liite"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15632,17 +16242,17 @@ msgstr ""
 "Tulostiedostoa ei voida luoda: %s:\n"
 "%s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tietoa ei voitu kirjoittaa: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Yhteyttä %s katkaistaan"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Otetaan uudelleen yhteyttää %s"
@@ -15706,24 +16316,24 @@ msgstr "Päivitetään..."
 msgid "Waiting..."
 msgstr "Odotetaan..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Käyttäjä keskeytti toimenpiteen"
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Anna salasana tunnukselle %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Muista tämä salasana"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "Muista salasana tämän istunnon loppuun asti"
 
@@ -15763,89 +16373,94 @@ msgstr "Välitetty viesti"
 msgid "Invalid folder: `%s'"
 msgstr "Virheellinen kansio: ' %s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Asetetaan vKansiota: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Päivitetään vKansioita URI:lle: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Päivitetään vKansioita URI:lle: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vKansiot"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Muokkaa vKansiota"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Uusi vKansio"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nähty"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Näkemättä"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Vastattu"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Useita lukemattomia viestejä"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Useita viestejä"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Matalin"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Matalampi"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Korkeampi"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Korkein"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Tänään %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Eilen %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Luodaan viestiluetteloa"
 
@@ -15877,43 +16492,43 @@ msgstr "Otettu vastaan"
 msgid "Size"
 msgstr "Koko"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Soita"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Älä välitä"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Lähetä edelleen"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Tiedoksesi"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Välitä"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Vastaus ei välttämätön"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Vastaa"
 
-#: mail/message-tag-followup.c:70 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 "Vastaa kaikille"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Arvio"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Merkitse edelleenlähetettäväksi"
 
@@ -15958,118 +16573,58 @@ msgstr "_Tilaa"
 msgid "_Unsubscribe"
 msgstr "_Peru tilaus"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution-kuori"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution testi"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolutionin testikomponentti"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Oletusoikotieryhmä"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Kansiopalkin paneelin oletusleveys"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Oikotiepalkin paneelin oletusleveys"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Ikkunan oletuskorkeus"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Ikkunan oletusleveys"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Evolutionin asetusten versio"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "ID tai alias käynnistyksessä oletuksena näytettävälle komponentille."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 "Jos tosi, Evolution käynnistyy yhteydettömässä tilassa."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 "Jos tosi, varoitusikkunaa Evolutionin kehitysversioissa ei näytetä."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 poluista kansioihin, jotka synkronisoidaan kovalevylle yhteydettömään "
 "käyttöön"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Polku kalenterien oletuskansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Polku yhteystietojen oletuskansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Polku sähköpostien oletuskansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Polku tehtävien oletuskansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Fyysinen URI oletuskalenterin kansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Fyysinen URI oletusyhteystietojen kansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Fyysinen URI oletussähköpostin kansioon"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Tehtävien oletuskansion fyysinen URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Näytetäänkö kansiopalkki"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Näytetäänkö oikotiepalkki"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Hypätäänkö kehitysversiovaroituksen yli"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "sähköposti"
 
@@ -16077,6 +16632,32 @@ msgstr "sähköposti"
 msgid "Brought to you by"
 msgstr "Sinulle tuonut"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Tuntematon virhe"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Virheelisiä argumentteja"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "OAF:ia ei voidaan rekisteröidä"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Asetustietokantaa ei löytynyt"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Yleinen virhe"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nimetön)"
@@ -16214,11 +16795,11 @@ msgstr "Tuojan suoritus epäonnistui"
 msgid "_Import"
 msgstr "_Tuo"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Suljetaan yhteyksiä...."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "_Evolutionin asetukset"
 
@@ -16260,11 +16841,35 @@ msgstr "Kansion nimi ei voi sisältää merkkiä \"#\""
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ja '..' ovat varattuja kansion nimiä"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution siirtyy yhteydettömään tilaan."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Viesti %s:lle"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Virhe suoritettaessa %s."
@@ -16278,14 +16883,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddya ei voitu ajaa."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Tietoja Ximian Evolutionista"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Työskentele _yhteydellisessä tilassa"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Yhteydetön tila"
 
@@ -16293,52 +16899,6 @@ msgstr "_Yhteydetön tila"
 msgid "Work Offline"
 msgstr "Työskentele poissa linjoilta"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution siirtyy yhteydettömään tilaan."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Varoitus: Evolution ei voinut päivittää kaikki tietojasi versiosta %d.%d.%"
-"d.\n"
-"Tietoja ei ole poistettu, mutta niitä ei voida näyttää tällä Evolutionin "
-"versiolla.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Virheelisiä argumentteja"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "OAF:ia ei voidaan rekisteröidä"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Asetustietokantaa ei löytynyt"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Yleinen virhe"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Checkbox"
@@ -16410,6 +16970,43 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Näpäytä OK sulkeaksesi kaikki yhteydet ja siirtyäksesi yhteydettömään tilaan"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Kalenteri"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Yhteystiedot: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Sähköposti:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tehtävät:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Kansion _tyyppi:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Avaa toisen käyttäjän kansio"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Tili:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Kansion nimi:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "Käyttäjät_unnus:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolutionin asetusten apulainen"
@@ -16452,6 +17049,18 @@ msgstr ""
 "\n"
 "Tallenna asetuksesi näpäyttämällä nappia \"Toteuta\"."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution-kuori"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution testi"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolutionin testikomponentti"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Tuo tiedosto Evolutioniin näpäyttämällä nappia \"Tuo\"."
@@ -16511,13 +17120,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution voi tuoda tietoa seuraavista tiedostoista:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16546,57 +17155,48 @@ msgstr ""
 "Toivomme että nautit suuren työmme tuloksista, ja odotamme innolla\n"
 "osallistumistasi kehitykseen!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Kiitos\n"
 "Evolutionin tiimi\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Älä kerro enää uudelleen"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ximian Evolutionin kuorta ei voida käyttää."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolutionin kuoren alustus epäonnistui: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Käynnistä Evolution aktivoimalla määritelty komponentti"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Aloita yhteydettömässä tilassa"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Aloita yhteydellisessä tilassa"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Sulje kaikki Evolutionin osat väkisin"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Uudelleentuo tiedot väkisin Evolution 1.4:stä"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Lähetä testitulosteet kaikista komponenteista tiedostoon."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16605,13 +17205,79 @@ msgstr ""
 "%s: --online ja --offline eivät voi olla käytössä samaan aikaan.\n"
 " Käytä %s '--help' saadaksesi lisätietoja.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Yhdistetään"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ximian Evolutionin kuorta ei voida käyttää."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolutionin sähköpostitilien apulainen"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Varmenteen nimi"
 
@@ -16844,11 +17510,6 @@ msgstr "Seuraavat henkilöt voidaan tunnistaa tallentamistasi varmenteista:"
 msgid "Your Certificates"
 msgstr "Varmenteesi"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Varmenne on jo olemassa"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17039,6 +17700,11 @@ msgstr "Kohteen yksilöllinen tunniste"
 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
+msgid "Certificate already exists"
+msgstr "Varmenne on jo olemassa"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS 12 tiedoston salasana"
@@ -17078,12 +17744,12 @@ msgstr "Viestin oletusotsikko."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Komentoa %s ei toitu suorittaa: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Sammutetaan %s (%s)\n"
@@ -17147,7 +17813,8 @@ msgid "Select all contacts"
 msgstr "Valitse kaikki yhteystiedot"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Lähetä viesti valituille yhteystiedoille."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17178,8 +17845,8 @@ msgstr "Katsele nykyistä yhteystietoa"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "T_oiminnot"
@@ -17197,7 +17864,8 @@ msgid "_Preview Pane"
 msgstr "_Esikatseluruutu:"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Tallenna vCard-muodossa"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17324,10 +17992,20 @@ msgstr "Näytä valittu tapaaminen"
 msgid "Week"
 msgstr "Viikko"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Työviikko"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Avaa tapaaminen"
 
+#: 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 "_Sulje"
+
 #: 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
@@ -17647,6 +18325,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Sulje"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "_Lisää lähettäjä osoitekirjaan"
@@ -17886,7 +18574,8 @@ msgid "Open the selected message in a new window"
 msgstr "Avaa valittu viesti uudessa ikkunassa"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Avaa valittu viesti muokkaimeen uudelleenlähettämistä varten"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18001,58 +18690,46 @@ msgstr "vKansio _aiheesta..."
 msgid "_Attached"
 msgstr "_Liitetty"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopioi kansioon"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Luo viestistä suodatin"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Siirry"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Sisäkkäisesti"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Suurempi"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Viestin näyttö"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Siirrä kansioon"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Seuraava viesti"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normaali näyttö"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Avaa viesti"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Edellinen viesti"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Lainattu"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Lähetä uudelleen..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "T_yökalut"
@@ -18061,16 +18738,6 @@ msgstr "T_yökalut"
 msgid "_Undelete"
 msgstr "_Palauta"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Sulje"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Liitä"
@@ -18462,6 +19129,11 @@ msgstr "_Pikaopas"
 msgid "_Send / Receive"
 msgstr "_Lähetä / Vastaanota"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Ikkuna"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Yrityksen mukaan"
@@ -18529,10 +19201,6 @@ msgstr "Eräpäivä:"
 msgid "With _Status"
 msgstr "Aseta tila"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tehtävät"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18691,6 +19359,34 @@ msgstr "Muut..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolutionin virhe"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution sähköposti"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Kokouksen tiedot"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution testi"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Lähetetyt viestit ja luonnokset"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Laajennettu"
@@ -18805,6 +19501,35 @@ msgstr "Teksti"
 msgid "Find _Now"
 msgstr "_Etsi nyt"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 on jo olemassa\n"
+"Haluatko ylikirjoittaa?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Tallentaminen ei onnistu \"%s\"\n"
+"%s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Tallentaminen ei onnistu \"%s\"\n"
+"%s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18815,12 +19540,154 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% valmiina)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution osoitekirjan kansiokatselin"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Osoite _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution kalenterin katselin"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution tehtävien katselin"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "gnome-vfs:n alustus ei onnistunut"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Kansiota '%s' ei voitu avata"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI jonka kalenteri näyttää"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Näytettävän näkymän tyyppi"
+
+#~ msgid "Display a message"
+#~ msgstr "Näytä viesti"
+
+#~ msgid "Alerts"
+#~ msgstr "Hälytykset"
+
+#~ msgid "Time"
+#~ msgstr "Aika"
+
+#~ msgid "_General"
+#~ msgstr "_Yleistä"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Valitse tuoja"
+
+#~ msgid "calendar"
+#~ msgstr "kalenteri"
+
+#~ msgid "task list"
+#~ msgstr "tehtävälista"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalenteritiedostoa ei voitu päivittää!\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr "Osoitekirja '%s' poistetaan. Oletko varma että haluat jatkaa?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "Tehtävien taustajärjestelmä\n"
+#~ "%s\n"
+#~ "on kaatunut."
 
-#~ msgid "New Address Book"
-#~ msgstr "Uusi osoitekirja"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Näytettävän tehtäväkansion URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Tehtäviä '%s' ei voitu ladata"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution sähköpostikansion katselin"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "vKansio säikeen perusteella"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "_Suodata säikeen perusteella"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "POP3-tunnusten välimuistin siirto epäonnistui: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Kansioiden laajennuksen tilan siirto epäonnistui: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Taltion '%s' avaaminen epäonnistui: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "Salainen optio."
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "Salainen optio."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI sähköpostilähteelle,  jonka näkymä näyttää"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Oletusoikotieryhmä"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Oikotiepalkin paneelin oletusleveys"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Polku kalenterien oletuskansioon"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Polku yhteystietojen oletuskansioon"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Polku sähköpostien oletuskansioon"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Polku tehtävien oletuskansioon"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Fyysinen URI oletuskalenterin kansioon"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Fyysinen URI oletusyhteystietojen kansioon"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Fyysinen URI oletussähköpostin kansioon"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Tehtävien oletuskansion fyysinen URI"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Näytetäänkö kansiopalkki"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Näytetäänkö oikotiepalkki"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Varoitus: Evolution ei voinut päivittää kaikki tietojasi versiosta %d.%d.%"
+#~ "d.\n"
+#~ "Tietoja ei ole poistettu, mutta niitä ei voida näyttää tällä Evolutionin "
+#~ "versiolla.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ximian Evolutionin kuoren alustus epäonnistui: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Lähetä uudelleen..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "Yhteystietolähteiden UID, joka näytetään näkymässä"
@@ -18992,9 +19859,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "S_pouse:"
 #~ msgstr "Puoli_so:"
 
-#~ msgid "_Add"
-#~ msgstr "_Lisää"
-
 #~ msgid "_Business:"
 #~ msgstr "_Työ:"
 
@@ -19115,15 +19979,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Eräpäivä on ennen aloituspäivää!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Alkamispäivä:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Eräpäivä:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioriteetti:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19155,13 +20010,6 @@ msgstr "%s (%d%% valmiina)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tiedostokuvaajan kopiointi epäonnistui: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19306,9 +20154,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Kalenterin käynnistyksessä näytettävä näkymä"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Syötä salasana %s:lle"
-
 #~ msgid "New task list"
 #~ msgstr "Uusi tehtävälista"
 
@@ -19365,30 +20210,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Määriteltyä jaettua kansiota ei löydy."
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Kalenteri"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Sähköposti:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Tehtävät:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Kansion _tyyppi:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Avaa toisen käyttäjän kansio"
-
-#~ msgid "_Account:"
-#~ msgstr "_Tili:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Kansion nimi:"
-
-#~ msgid "_User:"
-#~ msgstr "Käyttäjät_unnus:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Luo uusi ikkuna"
 
@@ -19691,9 +20512,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Sulje apulainen"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Seuraavat yhteydet ovat tällä hetkellä auki:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Etsi yhteystietoja"
 
@@ -19706,9 +20524,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "With _Category"
 #~ msgstr "_Ryhmän mukaan"
 
-#~ msgid "No data provided"
-#~ msgstr "Tietoa ei annettu"
-
 #~ msgid "Check incoming mail being junk for IMAP accounts"
 #~ msgstr "Etsi roskapostia saapuvista viesteistä IMAP-tunnuksilla"
 
@@ -19910,9 +20725,6 @@ msgstr "%s (%d%% valmiina)"
 #~ msgid "Move to folder..."
 #~ msgstr "_Siirrä kansioon..."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolutionin virhe"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
diff --git a/po/fr.po b/po/fr.po
index 38b1ab410d..d890926f82 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -15,7 +15,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.7\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-04-24 16:34+0200\n"
 "Last-Translator: Christophe Merlet (RedFox) <redfox@redfoxcenter.org>\n"
 "Language-Team: GNOME French Team <gnomefr@traduc.org>\n"
@@ -31,6 +31,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "carnet d'adresses d'Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "en-tête du contact : "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "mini-carte d'Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "dossier actuel du carnet d'adresses "
@@ -52,14 +60,6 @@ msgstr " cartes"
 msgid " card"
 msgstr " carte"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "en-tête du contact : "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "mini-carte d'Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Adresse de synchronisation par défaut :"
@@ -74,63 +74,20 @@ msgstr "Impossible de charger le carnet d'adresses"
 msgid "Could not read pilot's Address application block"
 msgstr "Impossible de lire l'application Adresses du Pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Complétion automatique"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certificats"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Configurez ici la compilation automatique"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacts"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up d'adresse du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Visualiseur d'adresses du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Visualiseur de cartes du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Composant Carnet d'adresses d'Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visualiseur de dossiers du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Composant de gestion des certifications S/Mime d'Evolution"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Accès anonyme au serveur LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Composant de configuration des paramètres dossier d'Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "L'authentification a échoué.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Gérer votre certificats S/Mime ici"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,42 +125,46 @@ msgstr "_Groupe de contacts"
 msgid "Create a new contacts group"
 msgstr "Créer un nouveau groupe de contacts"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
 msgstr "La connexion au serveur LDAP a échoué"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "L'authentification sur le serveur LDAP a échoué"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Impossible d'effectuer la requête sur la racine DES."
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Le serveur a renvoyé des bases de recherche non supportées."
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 "Ce serveur ne supporte pas les informations relatives au schéma LDAPv3."
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Erreur lors de la récupération des informations relatives au schéma"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Le serveur a renvoyé des informations non valides relatives au schéma."
 
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migration..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migration de « %s » :"
@@ -211,8 +172,8 @@ msgstr "Migration de « %s » :"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Sur cet ordinateur"
 
@@ -220,7 +181,7 @@ msgstr "Sur cet ordinateur"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personnel"
@@ -286,20 +247,43 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution fait migrer vos dossiers..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Accès anonyme au serveur LDAP"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+"Le carnet d'adresses « %s » va être supprimé. Êtes-vous sûr de vouloir "
+"continuer ?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "L'authentification a échoué.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Nouveau carnet d'adresses"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSaisissez le mot de passe pour %s (utilisateur %s)."
+#: 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
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Supprimer"
+
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Propriété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
+#: 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 "Contacts"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -322,6 +306,61 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 "L'URI du dossier utilisé en dernier dans le dialogue de sélection de noms"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Complétion automatique"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contacts"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificats"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Configurez ici la compilation automatique"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up d'adresse du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Visualiseur d'adresses du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Visualiseur de cartes du carnet d'adresses d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Composant Carnet d'adresses d'Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Composant de gestion des certifications S/Mime d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Composant de configuration des paramètres dossier d'Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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"
@@ -343,6 +382,7 @@ msgstr "  Affic_her les bases dupportées"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -414,7 +454,7 @@ msgstr "_Groupe de contacts"
 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:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Toujours"
@@ -429,107 +469,98 @@ msgid "Basic"
 msgstr "Basique"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "C_ouleur :"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Nom distinctif :"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nom distinctif :"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Adresse électronique :"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Adresse électronique :"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Bases de recherche supportées"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Jamais"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Un"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Choisissez une couleur"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Domain_e de recherche : "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Domain_e de recherche : "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Recherche"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -539,7 +570,7 @@ msgstr ""
 "LDAP\n"
 "uniquement si votre serveur LDAP supporte SSL et TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -556,7 +587,7 @@ 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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -570,19 +601,19 @@ msgstr ""
 "vulnérable aux\n"
 "problèmes de sécurité."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sous"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Bases de recherche supportées"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -595,7 +626,7 @@ msgstr ""
 "racine de \n"
 "l'arborescence de l'annuaire."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -612,7 +643,7 @@ msgstr ""
 "trouvant un niveau\n"
 "en dessous de la base.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -620,7 +651,7 @@ msgstr ""
 "Ceci représente le nom complet de votre serveur ldap. Par exemple, « ldap."
 "monentreprise.com »."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -629,7 +660,7 @@ 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:63
+#: 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 "
@@ -639,7 +670,7 @@ msgstr ""
 "Notez que spécifier « Adresse électronique » implique l'accès anonyme au "
 "serveur."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -649,7 +680,7 @@ msgstr ""
 "dossiers d'Evolution\n"
 "(dans un but d'affichage uniquement)."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -661,128 +692,135 @@ msgstr ""
 "administrateur\n"
 "système le port à utiliser."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format de date :"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "En utilisant le nom distinctif (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "En utilisant l'adresse électronique"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Lorsque c'est possible"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Groupe de contacts"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Limite de _téléchargement :"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adresse électronique :"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Méthode d'identification :"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nom :"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Numéro de port :"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Priorité :"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Ba_se de la recherche :"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Nom du _serveur :"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erveur"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Temps d'attente maximum (minutes) :"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Utiliser une connexion sécurisée (SSL) :"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "cartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "Connexion"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "Général"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minutes"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "Recherche"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Tout supprimer"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Supprimer"
 
+#: 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 "Nom"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Tout supprimer"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Afficher la liste des contacts"
@@ -805,22 +843,15 @@ msgstr "Ajouter aux contacts"
 msgid "Unnamed Contact"
 msgstr "Contact sans nom"
 
-#: 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
-msgid "Name"
-msgstr "Nom"
-
 #: 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
 msgid "Source"
 msgstr "Source"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de sélection de nom du carnet d'adresses d'Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -879,126 +910,128 @@ msgid "<b>Work</b>"
 msgstr "<b>Travail</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "Adresse 2 :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Adresse :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Anniversaire :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Adjoint :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Date de naissance :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog :"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Calendrier :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "Ville :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Société :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Éditeur de contacts"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Pays :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Service :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Libre/Occupé :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Nom complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Domicile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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
 msgid "Job title:"
 msgstr "Fonction :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Lieu :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Messagerie MSN"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adresse électronique"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Directeur :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "_Surnom :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Notes :"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Autre"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Boîte postale :"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Information personnelle"
@@ -1021,9 +1054,9 @@ msgstr "Webcam :"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Travail"
@@ -1052,23 +1085,39 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Êtes-vous sûr de vouloir \n"
+"supprimer ces contacts ?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Êtes-vous sûr de vouloir \n"
+"supprimer ce contact ?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Modifiable"
 
@@ -2040,91 +2089,109 @@ msgstr "Zambie"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Messagerie instantanée AOL"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Messagerie Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Service"
-
-#: 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
-msgid "Location"
-msgstr "Emplacement"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Nom d'utilisateur"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Livre source"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Livre cible"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Nouveau contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Champs modifiables"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Modifié"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Éditeur de catégorie non disponible."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ce contact appartient à ces catégories :"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Les connexions suivantes sont actives :"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Impossible de trouver un composant graphique pour un champ :  `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Messagerie instantanée AOL"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Messagerie Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Service"
+
+#: 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
+msgid "Location"
+msgstr "Emplacement"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Nom d'utilisateur"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Ajout express de contact"
@@ -2143,22 +2210,6 @@ msgstr "_Nom complet :"
 msgid "E-_mail:"
 msgstr "_Courrier électronique :"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Êtes-vous sûr de vouloir \n"
-"supprimer ces contacts ?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Êtes-vous sûr de vouloir \n"
-"supprimer ce contact ?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2 :"
@@ -2306,8 +2357,8 @@ msgstr "Éditeur de liste de contacts"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Carnet"
 
@@ -2368,6 +2419,437 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Recherche avancée"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(carte)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "carte"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Membres de la liste"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "Courrier électronique"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Position"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Vidéo conférence"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Téléphone"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "travail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "Web"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: 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
+msgid "personal"
+msgstr "personnel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Note"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Fonction"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Courrier électronique"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Site internet"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Succès"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Dépôt Hors ligne"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Le carnet d'adresses n'existe pas"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nouvelle liste de contacts"
+
+#. 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
+msgid "Permission denied"
+msgstr "Permission refusée"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Contact non trouvé"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "L'ID du contact existe déjà."
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protocole non supporté"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Annulée"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Impossible d'ouvrir la source"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Échec de l'authentification"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Authentification requise"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr "TLS non disponible"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Aucun message correspondant"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Autre erreur"
+
+#: 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 ""
+"Impossible d'ouvrir ce carnet d'adresses. Veuillez vérifier que le chemin "
+"existe et que vous avez la permission d'accès."
+
+#: 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 ""
+"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
+"ou le serveur LDAP n'est pas accessible."
+
+#: 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 ""
+"Le support LDAP n'a pas été intégré à cette version d'Evolution. Pour "
+"utiliser LDAP dans Evolution, vous devez compiler le programme à partir des "
+"sources CVS après avoir récupéré OpenLDAP à l'adresse indiquée ci-dessous."
+
+#: 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 ""
+"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
+"ou le serveur LDAP n'est pas accessible."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Impossible d'ouvrir le carnet d'adresses."
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"Le nombre de cartes correspondant à cette requête dépasse la\n"
+"capacité de renvoi configurée pour le serveur ou la capacité\n"
+"d'affichage configurée pour Evolution. Veuillez affiner votre\n"
+"recherche ou augmenter le nombre maximum de résultats dans\n"
+"les préférences du serveur d'annuaires de ce carnet d'adresses."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Le temps nécessaire à l'exécution de la requête à dépassé le temps\n"
+"limite du serveur ou la limite que vous avez configurée pour ce carnet\n"
+"d'adresses. Veuillez affiner votre recherche ou augmenter la limite de\n"
+"temps dans les préférences du serveur d'annuaires de ce carnet \n"
+"d'adresses."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"Le moteur de traitement du carnet d'adresses n'a pas pu analyser cette "
+"requête."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"Le moteur de traitement du carnet d'adresses a refusé d'effectuer cette "
+"requête."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr "Cette requête ne s'est pas terminée correctement."
+
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr "Voulez-vous enregistrer les modifications ?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Abandonner"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Erreur lors de l'ajout de la liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Erreur lors de l'ajout du contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Erreur lors de la modification de la liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Erreur lors de la modification du contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Erreur lors de la suppression de la liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Erreur lors de la suppression du contact"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres. \n"
+"Voulez-vous vraiment afficher tous ces contacts ?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s existe déjà.\n"
+"Voulez vous l'écraser ?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+msgid "Overwrite"
+msgstr "Écraser"
+
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Erreur lors de l'enregistrement du fichier %s : %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Déplacer le contact vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Copier le contact vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Déplacer les contacts vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Copier les contacts vers"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Sélectionnez la cible du carnet d'adresses."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "VCards multiples"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard pour %s"
+
+#.
+#. * 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 "(aucun(e))"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Courrier électronique principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Courrier électronique 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Courrier électronique 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Sélectionner une action"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Créer un nouveau contact « %s »"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Ajouter une adresse au contact existant « %s »"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Interrogation du carnet d'adresses..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Éditer les informations du contact"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Fusionner l'adresse électronique"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "et un autre contact."
+msgstr[1] "et %d autres contacts."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Afficher la VCard completement"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Enregistrer la VCard en compact"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Enregistrer dans le carnet d'adresses"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Aucun contact"
@@ -2383,8 +2865,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Requête"
 
@@ -2438,9 +2920,10 @@ msgstr "Carnet d'adresses"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Enregistrer comme VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2505,7 +2988,7 @@ msgid "Cut"
 msgstr "Couper"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2516,18 +2999,8 @@ msgstr "Copier"
 msgid "Paste"
 msgstr "Coller"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Supprimer"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Vue courante"
 
@@ -2544,7 +3017,7 @@ msgstr ""
 "l'utiliser de nouveau."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Toute catégorie"
@@ -2585,21 +3058,6 @@ msgstr "Catégories"
 msgid "Company Phone"
 msgstr "Téléphone société"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Courrier électronique"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Courrier électronique 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Courrier électronique 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nom de famille"
@@ -2636,29 +3094,14 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Directeur"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Téléphone portable"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Surnom"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Note"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Bureau"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisation"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax Autre"
@@ -2710,21 +3153,29 @@ msgstr "Unité"
 msgid "Web Site"
 msgstr "Site Web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Largeur"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Hauteur"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "A le focus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Sélectionné"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "A le curseur"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Champ"
@@ -2741,10 +3192,6 @@ msgstr "Modèle de texte"
 msgid "Max field name length"
 msgstr "Longueur max. du nom du champ"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Largeur des colonnes"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2773,411 +3220,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptateur"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Sélectionné"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "A le curseur"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(carte)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "carte"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Membres de la liste"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "Courrier électronique"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Position"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Vidéo conférence"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Téléphone"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "travail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "Web"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "personnel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Fonction"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Site internet"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Succès"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Dépôt Hors ligne"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Le carnet d'adresses n'existe pas"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nouvelle liste de contacts"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "Permission refusée"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Contact non trouvé"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "L'ID du contact existe déjà."
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protocole non supporté"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Annulée"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Impossible d'ouvrir la source"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Échec de l'authentification"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Authentification requise"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS non disponible"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Aucun message correspondant"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Autre erreur"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Impossible d'ouvrir ce carnet d'adresses. Veuillez vérifier que le chemin "
-"existe et que vous avez la permission d'accès."
-
-#: 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 LDAP server is unreachable."
-msgstr ""
-"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
-"ou le serveur LDAP n'est pas accessible."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"Le support LDAP n'a pas été intégré à cette version d'Evolution. Pour "
-"utiliser LDAP dans Evolution, vous devez compiler le programme à partir des "
-"sources CVS après avoir récupéré OpenLDAP à l'adresse indiquée ci-dessous."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Impossible d'ouvrir ce carnet d'adresses. Vous avez saisi un URI incorrect "
-"ou le serveur LDAP n'est pas accessible."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Impossible d'ouvrir le carnet d'adresses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Le nombre de cartes correspondant à cette requête dépasse la\n"
-"capacité de renvoi configurée pour le serveur ou la capacité\n"
-"d'affichage configurée pour Evolution. Veuillez affiner votre\n"
-"recherche ou augmenter le nombre maximum de résultats dans\n"
-"les préférences du serveur d'annuaires de ce carnet d'adresses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Le temps nécessaire à l'exécution de la requête à dépassé le temps\n"
-"limite du serveur ou la limite que vous avez configurée pour ce carnet\n"
-"d'adresses. Veuillez affiner votre recherche ou augmenter la limite de\n"
-"temps dans les préférences du serveur d'annuaires de ce carnet \n"
-"d'adresses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"Le moteur de traitement du carnet d'adresses n'a pas pu analyser cette "
-"requête."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"Le moteur de traitement du carnet d'adresses a refusé d'effectuer cette "
-"requête."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Cette requête ne s'est pas terminée correctement."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Voulez-vous enregistrer les modifications ?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Abandonner"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Erreur lors de l'ajout de la liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Erreur lors de l'ajout du contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Erreur lors de la modification de la liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Erreur lors de la modification du contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Erreur lors de la suppression de la liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Erreur lors de la suppression du contact"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"L'affichage de %d contacts implique l'ouverture de %d nouvelles fenêtres. \n"
-"Voulez-vous vraiment afficher tous ces contacts ?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s existe déjà.\n"
-"Voulez vous l'écraser ?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Écraser"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Erreur lors de l'enregistrement du fichier %s : %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Déplacer le contact vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Copier le contact vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Déplacer les contacts vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Copier les contacts vers"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Sélectionnez la cible du carnet d'adresses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "VCards multiples"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard pour %s"
-
-#.
-#. * 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 "(aucun(e))"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Courrier électronique principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Sélectionner une action"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Créer un nouveau contact « %s »"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Ajouter une adresse au contact existant « %s »"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Interrogation du carnet d'adresses..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Éditer les informations du contact"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Fusionner l'adresse électronique"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "et un autre contact."
-msgstr[1] "et %d autres contacts."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Afficher la VCard completement"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Enregistrer la VCard en compact"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Enregistrer dans le carnet d'adresses"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Largeur des colonnes"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3221,11 +3266,6 @@ msgstr "Assistant d'importation VCard d'Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimer l'enveloppe"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Imprimer les contacts"
@@ -3235,6 +3275,11 @@ msgstr "Imprimer les contacts"
 msgid "Print contact"
 msgstr "Imprimer les contacts"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimer l'enveloppe"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3421,16 +3466,6 @@ msgstr "Test d'impression de contact"
 msgid "This should test the contact print code"
 msgstr "Ceci devrait tester le code d'impression des contacts"
 
-#: 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
-msgid "Can not open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Impossible de charger l'URI"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Spécifier un fichier de sortie au lieu de la sortie standard"
@@ -3489,6 +3524,16 @@ msgstr "En mode normal l'option de taille ne devrait pas être nécessaire."
 msgid "Impossible internal error."
 msgstr "Erreur interne impossible."
 
+#: 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
+msgid "Can not open file"
+msgstr "Impossible d'ouvrir le fichier"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Impossible de charger l'URI"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Erreur de chargement du carnet d'adresses par défaut."
@@ -3501,11 +3546,12 @@ msgstr "Fichier d'entrée"
 msgid "No filename provided."
 msgstr "Aucun nom de fichier spécifié"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Liste de contacts sans nom"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Saisissez le mot de passe"
 
@@ -3537,119 +3583,55 @@ msgstr "Priorité par défaut :"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Impossible de lire les données du bloc « À faire » du Pilot."
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Calendrier et tâches"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Calendriers"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Configurez ici votre fuseau horaire, votre calendrier et votre liste de "
-"tâches"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Calendrier et tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Composant de configuration du calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Afficheur de message de planification du calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Afficheur de calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Éditeur de calendrier/tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Afficheur de tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Composant Calendrier d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Composant Tâches d'Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tâches"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Service de notification d'alarme du calendrier d'Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Débute :"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Fini :"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarme Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarme du %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Fermer"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Report"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Durée du report (minutes)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Éditer le rendez-vous"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Report"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Ouvrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Faire disparaître"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Faire tout disparaître"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Aucune description disponible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3662,12 +3644,12 @@ msgstr ""
 "Débute à %s\n"
 "Fini à %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Avertissement"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3680,7 +3662,7 @@ msgstr ""
 "un courrier. Evolution affichera une fenêtre\n"
 "d'avertissement classique à la place."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3697,19 +3679,19 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment lancer ce programme ?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ne plus me demander à propos de ce programme."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Service de notification d'alarme du calendrier d'Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Impossible d'initialiser Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Impossible d'initialiser gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Impossible de créer la fabrique de services de notification d'alarme"
 
@@ -3821,56 +3803,42 @@ msgid "Weekday the week starts on"
 msgstr "La semaine commence le"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Demander une confirmation pour l'effacement des rendez-vous"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Demander une confirmation pour la purge d'un dossier"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Cacher les tâches terminées"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Mettre en place un rappel par défaut pour les événements"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Afficher l'heure en format 24h au lieu d'utiliser am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Afficher les numéros de semaine dans le navigateur de dates"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Le résumé contient"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "La description contient"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Le commentaire contient"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "L'emplacement contient"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Différent"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Calendrier"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3881,123 +3849,133 @@ msgstr ""
 "ces événements."
 
 #
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Purger les événements plus vieux que"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "jours"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Le calendrier « %s » va être supprimé. Êtes-vous sûr de vouloir continuer ?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Propriétés..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Chargement du calendrier"
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Impossible d'ouvrir le calendrier « %s » pour créer des événements et des "
 "réunions"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Il n'y a pas de calendrier disponible pour créer des événements et des "
 "réunions"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Calendriers"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nouveau RDV"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Rendez-vous"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Créer un nouveau rendez-vous"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Réunion"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Créer une nouvelle demande de réunion"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Nouveau rendez-vous sur une journée entière"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Rendez-vous _journée entière"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Créer un nouveau rendez-vous journée entière"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Nouveau calendrier"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "C_alendrier"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Créer un nouveau calendrier"
 
@@ -4027,15 +4005,35 @@ msgstr "Vue hebdomadaire"
 msgid "Month View"
 msgstr "Vue mensuelle"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Le résumé contient"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "La description contient"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Le commentaire contient"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "L'emplacement contient"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Différent"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erreur lors de l'ouverture du calendrier"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Méthode non supportée pour l'ouverture du calendrier"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier."
 
@@ -4044,19 +4042,6 @@ msgstr "Vous n'avez pas les droits suffisants pour ouvrir le calendrier."
 msgid "open_client(): %s"
 msgstr "open_client() : %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Impossible d'ouvrir le dossier dans « %s »"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "L'URI que le calendrier affichera."
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Le type de vue à afficher."
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Options d'alarme sonore"
@@ -4122,7 +4107,7 @@ msgstr "toutes les"
 msgid "hours"
 msgstr "heures"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Action/Activation"
 
@@ -4141,14 +4126,14 @@ msgstr "Basiques"
 msgid "Date/Time:"
 msgstr "Date/Heure :"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Afficher un message"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Jouer un son"
 
+#: 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 "Rappels"
@@ -4163,6 +4148,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:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Résumé :"
@@ -4201,10 +4187,99 @@ msgstr "minute(s)"
 msgid "start of appointment"
 msgstr "Début du rendez-vous"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+"Vous devez indiquer un emplacement auprès duquel récupérer le calendrier."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "L'emplacement source « %s » n'est pas bien formé."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+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:265
+#, 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:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Le groupe « %s » est distant. Vous devez spécifier un emplacement à partir "
+"duquel recevoir le calendrier"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Ajouter un calendrier"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Ajouter un groupe de tâches"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+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:107
+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
+msgid "_Add Calendar"
+msgstr "A_jouter un calendrier"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+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
+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
+msgid "_Type:"
+msgstr "_Type :"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL :"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "semaines"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Activé"
 
@@ -4218,19 +4293,19 @@ msgstr "Ne pas supprimer"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Désactiver"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Activer"
 
@@ -4255,162 +4330,176 @@ msgid "60 minutes"
 msgstr "60 minutes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alertes"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Autre</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Alors</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Options de la liste de tâches</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Maison</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Travail</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Paramétrage du calendrier et des tâches"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Couleur des tâches en retard"
 
-#: 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 "Couleur des tâches d'aujourd'hui"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "La journé_e se termine :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Jours"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Affichage"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ctiver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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:563
 msgid "Friday"
 msgstr "Vendredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minutes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Lundi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Dim"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Samedi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "A_fficher un rappel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Afficher les _numéros de semaine dans le navigateur de dates"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Dimanche"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Tâches d'_aujourd'hui :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Jeu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Liste de tâches"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Jeudi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Heure"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Fuseau _horaire :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format de date :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Mardi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "La s_emaine débute :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Mercredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Sem. travail"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Jours ouvrés :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 heures (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 heures"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "A_jouter une URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Demander une confirmation pour l'effacement des éléments"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Compresser les week-ends dans la vue mensuelle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Le _jour commence :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Affichage"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4420,137 +4509,48 @@ msgstr "_Affichage"
 msgid "_Edit"
 msgstr "_Éditer"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "Publication _libre-occupé"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Général"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Masquer les tâches a_chevées après"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Tâches en _retard :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "_Afficher les heures de fin de rendez-vous dans les vues mensuelles et "
 "hebdomadaires"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Di_visions horaires :"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "M_er"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "avant chaque rendez-vous"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-"Vous devez indiquer un emplacement auprès duquel récupérer le calendrier."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "L'emplacement source « %s » n'est pas bien formé."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Le groupe « %s » est distant. Vous devez spécifier un emplacement à partir "
-"duquel recevoir le calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Ajouter un calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Ajouter un groupe de tâches"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Propriétés du calendrier"
-
-#: 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
-msgid "_Add Calendar"
-msgstr "A_jouter un calendrier"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-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
-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
-msgid "_Type:"
-msgstr "_Type :"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL :"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semaines"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4635,81 +4635,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Vous n'avez fait aucune modification. Mettre à jour l'éditeur ?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Erreur de validation : %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " À "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Terminé "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Terminé "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Date d'échéance "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Date d'échéance "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Impossible de mettre à jour l'objet."
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Éditer le rendez-vous"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Rendez-vous - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tâche - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrée de journal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Aucun résumé"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Enregistrer sous..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Les changements apportés à cet élément peuvent être annulés en cas de "
 "réception d'une mise à jour."
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Impossible d'utiliser la version courante !"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Erreur de validation : %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " À "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Terminé "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Terminé "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Date d'échéance "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Date d'échéance "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Impossible d'ouvrir la source"
@@ -4837,27 +4837,27 @@ msgstr "Déléguer à :"
 msgid "Enter Delegate"
 msgstr "Saisissez un délégué"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Rendez-vous"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Rappel"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Récurrence"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Planification"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Réunion"
 
@@ -4870,7 +4870,7 @@ msgstr "La date d'échéance est avant la date de début !"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "La date de début est erronée."
 
@@ -4956,10 +4956,10 @@ msgstr "Heure de _début :"
 #. 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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,15 +4978,15 @@ msgstr "Un organisateur est nécessaire."
 msgid "At least one attendee is required."
 msgstr "Au moins un participant est nécessaire."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Déléguer à..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5266,24 +5266,19 @@ msgstr "Aban_donner les modifications"
 msgid "Save Event"
 msgstr "Enregistrer l'événement"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Sélectionnez une source"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Sélectionnez la destination %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "calendrier"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Dossier de destination :"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "liste des tâches"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Liste de tâches"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5313,38 +5308,44 @@ msgid "% _Complete"
 msgstr "% _Fait"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Achevée"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Haute"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "En cours"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Basse"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Non démarrée"
 
@@ -5380,11 +5381,11 @@ msgstr "Page _Web :"
 msgid "Assignment"
 msgstr "Tâche"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "La date d'échéance est erronée."
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Impossible d'ouvrir les tâches dans '%s'."
@@ -5393,8 +5394,9 @@ msgstr "Impossible d'ouvrir les tâches dans '%s'."
 msgid "Con_fidential"
 msgstr "Con_fidentiel"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Description :"
@@ -5540,102 +5542,53 @@ msgstr "%s à %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pour un type d'activation inconnu"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Public"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privé"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidentiel"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Heure de _fin :"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Date de début"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Résumé"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Occupé"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Cliquez pour ouvrir %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Sans titre"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Date de début :"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Date d'échéance :"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"La position géographique doit être entrée dans le format :\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "État :"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Priorité :"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Non"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Page _Web :"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Inconnu"
+#: 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 "Public"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Récurrant"
+#: 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 "Privé"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Attribué"
+#: 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 "Confidentiel"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5681,17 +5634,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: 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 "Occupé"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Supprimer les objets sélectionnés"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Ouvrir"
 
@@ -5700,41 +5662,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimer..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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 "_Copier"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "C_oller"
 
@@ -5792,78 +5755,158 @@ msgstr "Priorité"
 msgid "Start date"
 msgstr "Date de début"
 
+#: 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 "Résumé"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Tri par tâche"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nouveau _RDV..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nouvel événement journée _entière"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nouvelle réunion"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Sélectionner par _fil de discussion"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Sélectionner..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publier l'information Libre/Occupé"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copier vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Déplacer _vers le dossier..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Planifier une _réunion..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Faire suivre comme iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Supprimer cette _occurrence"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Supprimer _toutes les occurrences"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Aller à _aujourd'hui"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "A_ller à la date..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Paramétres..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Heure de _fin :"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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: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-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 "Inconnu"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Récurrant"
+
+#: calendar/gui/e-cal-model.c:913
+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:168 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:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Non"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: 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 ""
+"La position géographique doit être entrée dans le format :\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5887,36 +5930,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisions par minute"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisions par minute"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6026,10 +6069,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Aucun</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "État :"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6059,7 +6098,7 @@ msgstr "Mettre à jour"
 #: 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Valider"
 
@@ -6273,65 +6312,61 @@ 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:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Impossible de mettre à jour le fichier de calendrier !\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Mise à jour terminée\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Impossible de trouver l'objet.\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Statut du participant mis à jour\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Impossible de mettre à jour le statut du participant !\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Effacement Terminé"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Élément envoyé !\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Impossible d'envoyer l'élément !\n"
 
@@ -6448,28 +6483,6 @@ msgstr "Délégué"
 msgid "In Process"
 msgstr "En cours"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Absent du bureau"
@@ -6530,7 +6543,34 @@ msgstr "Heure de _début de la réunion :"
 msgid "Meeting _end time:"
 msgstr "Heure de _fin de la réunion :"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 %d %B %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Saisissez le mot de passe pour %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6539,24 +6579,22 @@ msgstr ""
 "Erreur sur %s :\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
+#, fuzzy, c-format
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 "Le moteur des tâches pour\n"
 "%s\n"
 "est tombé en panne."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ouverture des tâches à %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6565,38 +6603,47 @@ msgstr ""
 "Erreur d'ouverture de %s :\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Chargement des tâches"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Achèvement des tâches..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Suppression des objets sélectionnés..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Nettoyage"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tâches"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Chargement des rendez-vous à %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Chargement des tâches à %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Ouverture de %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6604,18 +6651,62 @@ msgstr ""
 "%s\n"
 "est tombé en panne."
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Le moteur des tâches pour\n"
-"%s\n"
-"est tombé en panne."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Purger"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Calendrier et tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Configurez ici votre fuseau horaire, votre calendrier et votre liste de "
+"tâches"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Calendrier et tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Composant de configuration du calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Afficheur de message de planification du calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Éditeur de calendrier/tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Composant Calendrier d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Composant Tâches d'Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendriers"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tâches"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Avril"
@@ -6761,6 +6852,23 @@ msgstr "Anniversaires"
 msgid "On The Web"
 msgstr "Sur internet"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Impossible d'ouvrir le calendrier « %s »."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Impossible d'ouvrir les tâches dans '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -6980,7 +7088,7 @@ msgid "Contacts: "
 msgstr "Contacts : "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Aperçu avant impression"
 
@@ -6992,68 +7100,78 @@ msgstr "Imprimer l'élément"
 msgid "Print Setup"
 msgstr "Configuration de l'impression"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Nouvelle liste de tâches"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d contact"
+msgstr[1] "%d contact"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Supprimé"
+msgstr[1] "Supprimé"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Chargement des tâches"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 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:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tâche"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Créer une nouvelle tâche"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "Nouveau groupe de tâches"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "_Groupe de tâches"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Créer un nouveau groupe de tâches"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "L'URI du dossier de tâches à afficher"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Impossible de charger les tâches dans « %s »."
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7065,11 +7183,11 @@ msgstr ""
 "\n"
 "Voulez-vous vraiment effacer les tâches ?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ne plus me demander."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Imprimer les tâches"
 
@@ -8721,7 +8839,7 @@ msgstr "Copier le contenu du dossier en local pour les opérations hors-ligne"
 msgid "Downloading new messages for offline mode"
 msgstr "Télécharger les nouveaux messages pour le mode hors-ligne"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Préparation du dossier « %s » pour le hors-ligne"
@@ -8814,33 +8932,6 @@ msgstr "Arguments non valides (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erreur lors de la recherche filtrée : %s : %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Impossible d'analyser l'expression de recherche : %s :\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Erreur lors de l'exécution de l'expression de recherche : %s :\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(compare tout) demande un unique résultat booléen."
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Interrogation sur un en-tête inconnu : %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8872,7 +8963,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Filtrage des nouveaux messages"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Impossible d'analyser l'expression de recherche : %s :\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erreur lors de l'exécution de l'expression de recherche : %s :\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(compare tout) demande un unique résultat booléen."
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(compare tout) demande un unique résultat booléen."
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(compare tout) demande un unique résultat booléen."
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Interrogation sur un en-tête inconnu : %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8883,15 +9019,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "L'analyse de l'indication ID d'utilisateur du GPG a échoué."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "L'analyse de la requête de mot de passe du GPG a échoué."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8900,28 +9036,28 @@ msgstr ""
 "Vous avez besoin d'un mot de passe pour\n"
 "débloquer la clé de l'utilisateur : « %s »"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Annulé."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Le déblocage de la clé secrète a échoué : 3 mauvais mots de passe saisis."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Réponse inattendue de GnuPG : %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Le chiffrement a échoué : aucun destinataire valide spécifié."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8932,87 +9068,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s a échoué : %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Impossible de générer les données signées : %s."
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "L'exécution de GPG a échoué : %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "L'exécution de GPG a échoué."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 ""
 "Impossible de vérifier la signature de ce message : format de message "
 "incorrect"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Impossible de vérifier la signature de ce message : impossible de créer le "
 "fichier temporaire : %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossible de générer des données chiffrées : %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Ceci est une partie de message numériquement signée"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contenu chiffré"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Impossible d'analyser le contenu du message"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Impossible de créer le tube de l'aide de verrouillage : %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Impossible de cloner l'aide de verrouillage : %s"
-
-#: 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 ""
-"Impossible de verrouiller « %s » : erreur de protocole avec l'aide de "
-"verrouillage"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Impossble de verrouiller « %s »"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9035,6 +9149,28 @@ msgstr "L'obtention du verrou avec fcntl(2) a échoué : %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "L'obtention du verrou avec flock(2) a échoué : %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Impossible de créer le tube de l'aide de verrouillage : %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Impossible de cloner l'aide de verrouillage : %s"
+
+#: 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 ""
+"Impossible de verrouiller « %s » : erreur de protocole avec l'aide de "
+"verrouillage"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Impossble de verrouiller « %s »"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9298,7 +9434,7 @@ msgstr "Les références ont expiré."
 #: 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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Mauvaise réponse d'authentification en provenance du serveur."
 
@@ -9501,7 +9637,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Certi_ficat de chiffrage :"
 
 #: camel/camel-smime-context.c:360
@@ -9518,7 +9654,7 @@ msgstr "Impossible de créer le verrou sur le dossier %s : %s."
 msgid "Failed to add data to CMS encoder"
 msgstr "L'ajout au dossier local « Envoyés » a échoué : %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "L'authentification a échoué.\n"
@@ -9583,98 +9719,98 @@ msgstr "Impossible de créer le dossier : %s : %s"
 msgid "Cannot set message digests"
 msgstr "Impossible d'obtenir le message : %s : %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Échec de la signature du certificat"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Signature valide"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signataire : %s <%s> : %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Échec de la commande IMAP : %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Impossible de créer le dossier « %s » : %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Créer une _règle à partir du message"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Impossible de créer le verrou sur le dossier %s : %s."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "L'envoi du nom d'utilisateur au serveur a échoué"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Commande non implémentée"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9691,16 +9827,26 @@ msgstr "Impossible de créer le dossier « %s » : le dossier existe"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Impossible de créer le dossier : opération non valide sur ce stockage"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Impossible de créer le dossier « %s » : le dossier existe"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossible de supprimer le dossier : %s : opération non valide"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Corbeille"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Spam"
@@ -9822,7 +9968,7 @@ msgstr "L'utilisation de la clé ne permet pas la signature de certificat."
 msgid "Error in application verification"
 msgstr "Erreur de vérification de l'application"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9835,11 +9981,11 @@ msgstr ""
 "Empreinte :        %s\n"
 "Signature :        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "BON"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "MAUVAIS"
 
@@ -9863,7 +10009,7 @@ msgstr ""
 "Désirez-vous l'accepter quand même ?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9878,7 +10024,7 @@ msgstr ""
 "\n"
 "Désirez-vous accepter ?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9887,7 +10033,7 @@ msgstr ""
 "Problème de certificat : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9896,7 +10042,7 @@ msgstr ""
 "Mauvais domaine de certificat : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9905,7 +10051,7 @@ msgstr ""
 "Certificat expiré : %s\n"
 "Émetteur : %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9919,17 +10065,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Impossible d'analyser l'URL « %s »."
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Erreur lors du stockage de « %s » : %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Aucun message de type %s dans %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Impossible de copier ou déplacer des messages vers des dossiers virtuels."
@@ -9939,11 +10085,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9960,10 +10101,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Vous ne pouvez copier des message à partir d'un dossier NNTP !"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Recherche de nouveau courrier"
 
 #: 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 "Vérifie les nouveaux messages dans tous les dossiers."
@@ -9998,6 +10141,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Pour accéder aux serveurs Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10019,26 +10163,326 @@ msgstr ""
 msgid "Checklist"
 msgstr "liste"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Impossible d'obtenir le dossier « %s » : %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 "Serveur déconnecté de manière inattendue : %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 "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Impossible d'obtenir le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %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 ""
+"Impossible d'obtenir le message : %s du dossier %s\n"
+"  %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Impossible de joindre le message au dossier mh : %s : %s."
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Impossible d'obtenir le message : %s du dossier %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 ""
+"Impossible d'obtenir le message : %s du dossier %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 "Impossible d'obtenir le dossier « %s » : %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 "Impossible d'obtenir le dossier « %s » : %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 "Dossiers"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Afficher uniquement les dossiers abonnés"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Outrepasser l'espace de noms fourni par le serveur"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Espace de noms"
+
+#: 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 "Lecture et stockage du courrier sur des serveurs IMAP"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Cette option utilisera un mot de passe en clair pour se connecter au serveur "
+"IMAP."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr "Serveur IMAP %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Service IMAP pour %s sur %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:140
+#: 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 "Impossible de se connecter à %s (port %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 "SSL non disponible"
+
+#: 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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Connexion annulée"
+
+#: 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"
+msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Erreur inconnue"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Impossible de se connecter au serveur POP %s : aucun support pour le "
+"mécanisme d'authentification demandé."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVeuillez saisir le mot de passe SMTP pour %s sur l'hôte %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+"Impossible de authentifier sur le serveur 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 "Impossible d'obtenir le dossier « %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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"Le nom de dossier « %s » n'est pas valide car il contient le caractère « %c »"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+"Impossible de authentifier sur le serveur IMAP.\n"
+"%s\n"
+"\n"
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Commande :"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Impossible de supprimer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Impossible de renommer le dossier : %s : opération non valide"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Impossible de créer le dossier « %s » : %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Réponse inattendue du serveur IMAP : %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Aucune donnée fournie"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveur déconnecté de manière inattendue : %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:1089
-msgid "Unknown error"
-msgstr "Erreur inconnue"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10083,21 +10527,21 @@ msgstr "Impossible de créer le répertoire %s : %s"
 msgid "Could not load summary for %s"
 msgstr "Impossible de charger le résumé pour %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Le dossier a été détruit et recréé sur le serveur."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Examen des messages modifiés"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Impossible de récupérer le message : %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10113,25 +10557,25 @@ msgstr ""
 "Impossible d'obtenir le message : %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Aucun message correspondant"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ce message n'est pas disponible."
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Recherche des informations de résumé pour des nouveaux messages."
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Impossible de trouver le corps du message dans la réponse FETCH."
 
@@ -10170,23 +10614,6 @@ msgstr "Utiliser une commande personnalisée pour se connecteur au serveur"
 msgid "Command:"
 msgstr "Commande :"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Dossiers"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Afficher uniquement les dossiers abonnés"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Outrepasser l'espace de noms fourni par le serveur"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espace de noms"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10211,86 +10638,44 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Lecture et stockage du courrier sur des serveurs IMAP"
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Serveur IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Service IMAP pour %s sur %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Impossible de se connecter à %s (port %d) : %s."
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL non disponible"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Connexion annulée"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Extension SSL/TSL non supportée."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Les négociations SSL ont échoué"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Impossible de se connecter avec la commande « %s » : %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 "Le serveur IMAP %s ne supporte pas le mécanisme d'authetification de type %s."
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Aucun support pour les authentifications de type %s"
 
-#: camel/providers/imap/camel-imap-store.c:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sVeuillez saisir le mot de passe IMAP pour %s@%s."
 
-#: camel/providers/imap/camel-imap-store.c:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Vous n'avez pas saisi de mot de passe."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10301,26 +10686,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Aucun dossier de type « %s »."
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"Le nom de dossier « %s » n'est pas valide car il contient le caractère « %c »"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers."
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10328,7 +10705,7 @@ msgstr "Le dossier parent n'est pas autorisé à contenir des sous-dossiers."
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Impossible de créer le dossier « %s » : le dossier existe."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Dossier parent inconnu : %s"
@@ -10441,58 +10818,58 @@ msgstr ""
 "Peut également être utilisé pour lire un arbre de dossiers Elm, Pine ou "
 "Mutt. "
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La racine de stockage %s n'est pas un chemin absolu."
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La racine de stockage %s n'est pas un répertoire habituel."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Impossible d'obtenir le répertoire : %s : %s."
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Le stockage local n'a pas de boîte de réception."
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fichier de courrier local %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossible de renommer le dossier %s vers %s : %s."
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossible de renommer « %s » : %s."
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Impossible de supprimer le fichier de résumé de dossier « %s » : %s."
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Impossible de supprimer le fichier d'index de dossier « %s » : %s."
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10559,7 +10936,7 @@ msgstr "Impossible de supprimer le dossier « %s » : %s"
 msgid "not a maildir directory"
 msgstr "n'est pas un répertoire maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10895,7 +11272,7 @@ 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:258
+#: 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
@@ -10904,8 +11281,8 @@ msgid "User cancelled"
 msgstr "Opération annulée"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10914,50 +11291,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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Erreur interne : format d'uid non valide : %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Erreur lors de l'envoie du message : %s : message non posté"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Vous ne pouvez copier des message à partir d'un dossier NNTP !"
 
@@ -11090,7 +11467,8 @@ msgid "Could not get group: %s"
 msgstr "Impossible d'obtenir le groupe : %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Impossible de recevoir les messages : erreur non spécifiée"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11143,8 +11521,8 @@ msgstr "Aucun message avec l'uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Récupération du message POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Raison inconnue"
 
@@ -11602,7 +11980,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "pièce jointe"
 
@@ -11647,6 +12025,104 @@ msgstr "Type MIME :"
 msgid "Suggest automatic display of attachment"
 msgstr "Suggérer l'affichage automatique de la pièce jointe"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Impossible de signer le message sortant : pas de certificat de signature "
+"définit pour ce compte"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Impossible de chiffrer le message sortant : aucune certificat de chiffrement "
+"définit pour ce compte."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Impossible d'ouvrir le fichier"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Impossible de récupérer le message de l'éditeur."
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Message sans titre"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Ouvrir un fichier"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Généré automatiquement"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signature :"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> fichier attaché"
+msgstr[1] "<b>%d</b> fichiers attachés"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Masquer la barre des pièces _jointes (déposer les pièces jointes ici)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Afficher la barre des pièces _jointes (déposer les pièces jointes ici)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Composer un message"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Impossible de créer la fenêtre de composition :\n"
+"activation du composant de sélection d'adresses impossible."
+
+#: 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 ""
+"Impossible de créer la fenêtre de composition :\n"
+"activation du composant « Éditeur HTML » impossible.\n"
+"Veuillez vous assurer que vous avez les bonnes\n"
+"versions de gtkhtml et libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Impossible de créer la fenêtre de composition :\n"
+"activation du composant « Éditeur HTML » impossible."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Le composeur contient un corps de message non textuel qui ne peut être "
+"édité.)<b>"
+
 #
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -11729,211 +12205,134 @@ msgstr "Cliquez ici pour sélectionner les dossiers de destination"
 msgid "Attach file(s)"
 msgstr "Joindre des fichiers"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Impossible de signer le message sortant : pas de certificat de signature "
-"définit pour ce compte"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Impossible de chiffrer le message sortant : aucune certificat de chiffrement "
-"définit pour ce compte."
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Impossible d'ouvrir le fichier"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Impossible de récupérer le message de l'éditeur."
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Message sans titre"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Ouvrir un fichier"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Généré automatiquement"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signature :"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> fichier attaché"
-msgstr[1] "<b>%d</b> fichiers attachés"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Masquer la barre des pièces _jointes (déposer les pièces jointes ici)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Afficher la barre des pièces _jointes (déposer les pièces jointes ici)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Composer un message"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Joindre un fichier au message"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Impossible de créer la fenêtre de composition :\n"
-"activation du composant de sélection d'adresses impossible."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Impossible de créer la fenêtre de composition :\n"
-"activation du composant « Éditeur HTML » impossible.\n"
-"Veuillez vous assurer que vous avez les bonnes\n"
-"versions de gtkhtml et libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Impossible de créer la fenêtre de composition :\n"
-"activation du composant « Éditeur HTML » impossible."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Le composeur contient un corps de message non textuel qui ne peut être "
-"édité.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous sans titre ?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Messages non lus"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Voulez-vous enregistrer les modifications ?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Impossible de créer le tube : %s."
+msgid "Don't Recover"
+msgstr "Ne pas supprimer"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Impossible d'enregistrer le fichier de signature : %s."
+msgid "Recover"
+msgstr "Supprimer"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Impossible d'enregistrer le fichier de signature : %s."
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Aban_donner les modifications"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Voulez-vous enregistrer les modifications ?"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Avertissement : message modifié"
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Don't Recover"
-msgstr "Ne pas supprimer"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce rendez-vous sans titre ?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Supprimer"
+msgid "Discard Changes"
+msgstr "Aban_donner les modifications"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Enregistrer le message..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Impossible de créer le tube : %s."
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Messages non lus"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Impossible d'enregistrer le fichier de signature : %s."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Avertissement : message modifié"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Joindre un fichier au message"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Vous devez configurer un compte avant de pouvoir composer un message."
 
@@ -12067,7 +12466,8 @@ msgstr ""
 "Un fichier du même nom existe.\n"
 "L'écraser ?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Écraser le fichier ?"
 
@@ -12244,81 +12644,97 @@ msgstr "Sélectionnez une heure pour la comparaison."
 msgid "_Filter Rules"
 msgstr "Règles de filtrage"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Erreur dans l'expression régulière « %s » :\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Le fichier « %s » n'existe pas ou n'est pas un fichier normal."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Mise à jour de la réunion"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Vous devez choisir une date."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "_Nom distinctif :"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-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."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Déplacement du dossier %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Le fichier « %s » n'existe pas ou n'est pas un fichier normal."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Tâche"
+msgid "Missing folder."
+msgstr "Déplacement du dossier %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Vous devez indiquer un dossier."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Aucun serveur n'a été sélectionné."
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Erreur dans l'expression régulière « %s » :\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Vous devez choisir une date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Tâche"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Vous devez attribuer un nom au filtre."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Vous devez nommer ce dossier virtuel."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Vous devez indiquer un nom de fichier."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Vous devez indiquer un dossier."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+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. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12330,64 +12746,11 @@ msgstr "Choisissez un fichier"
 msgid "<b>Then</b>"
 msgstr "<b>Alors</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Sélectionnez un dossier"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "À faire"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Plus tard"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Nom de la règle :"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Sans titre"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Si</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Exécuter les actions"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "si tous les critères sont remplis"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "si un des critères est rempli"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "entrant"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "sortant"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12478,6 +12841,75 @@ msgstr "avec tous les dossiers locaux"
 msgid "years"
 msgstr "années"
 
+#: 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
+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
+msgid "To Do"
+msgstr "À faire"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Plus tard"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Nom de la règle :"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Si</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "si tous les critères sont remplis"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "si un des critères est rempli"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Exécuter les actions"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Délégué"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Destinataires"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Réponses à %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Inclure :"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "entrant"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "sortant"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12607,7 +13039,7 @@ msgstr "n'est pas marqué"
 msgid "Junk Test"
 msgstr "Test spam"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Étiquette"
@@ -12645,7 +13077,7 @@ msgstr "Quitte le programme"
 msgid "Play Sound"
 msgstr "Jouer le son"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Lu"
 
@@ -12717,9 +13149,9 @@ msgstr "Débute par"
 msgid "Stop Processing"
 msgstr "Arrêter le traitement"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Objet"
@@ -12782,106 +13214,60 @@ msgstr "L'objet ne contient pas"
 msgid "Virtual _Folders"
 msgstr "Dossiers Virtuels"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "A_jouter"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Source du dossier virtuel"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Préférences du composeur"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Définissez ici les préférences pour le courrier, les paramètres de sécurité "
-"et l'affichage des messages."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Définissez ici la fonction de correction de l'orthographe et les signatures, "
-"et configurez le composeur de messages."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Configurez ici vos comptes de messagerie."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Messagerie d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Composant de configuration des comptes de messagerie d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Composant Messagerie d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Composeur de courrier d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Composant de configuration du composeur de courrier d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Afficheur de dossiers courrier d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Préférences de la messagerie d'Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Courrier"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Comptes de messagerie"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Préférences du courrier"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Défaut]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Nom du compte"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protocole"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Sans nom"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Langues"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "A_jouter une signature"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signatures"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Message transféré --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "Le %a, %d/%m/%Y à %H:%M %%+05d, %%s a écrit :"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Créer un dossier _virtuel à partir d'une recherche..."
 
@@ -12915,266 +13301,440 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 >"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Créer un dossier"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nom du dossier :"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Dossiers virtuels"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "CORRESPONDPAS"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Boîte de réception"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Chargement..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Déplacement du dossier %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Copie du dossier %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 "Impossible de déposer le ou les messages dans le stockage de haut niveau"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Copier vers le dossier"
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Déplacer vers le dossier"
+
+#: 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
+msgid "_Move"
+msgstr "_Déplacer"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Annuler la tâche"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Sélectionnez un dossier"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copier"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Créer un dossier"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renommer le dossier « %s » en :"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Renommer le dossier"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "Afficha_ge"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Ouvrir dans une _nouvelle fenêtre"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Déplacer"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Nouveau dossier..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Renommer"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Propriétés..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr "Dossiers virtuels"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "CORRESPONDPAS"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Boîte de réception"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+msgid "Loading..."
+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:508
+#: mail/mail-component.c:551
+msgid "Mail"
+msgstr "Courrier"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Éditer comme nouveau  message..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Imprimer"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Répondre à la _liste"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Répondre à _tous"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Faire suivre"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "_Donner suite..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Marquer _Achevé"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Effacer les marqueurs"
 
-#: mail/em-folder-view.c:787 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 "Marquer comme _lu"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Marquer comme _non lu"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marquer comme _important"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Marquer comme non im_portant"
 
-#: mail/em-folder-view.c:791 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 "Marquer comme _spam"
 
-#: mail/em-folder-view.c:792 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 "Marquer comme non _spam"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Récupérer"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Déplacer _vers le dossier..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copier vers le dossier..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Ajouter l'expéditeur au _carnet d'adresses"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Appliquer les _filtres"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Règles de filtrage"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Créer une _règle à partir du message"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Dossier virtuel sur l'_objet"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Dossier virtuel sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Dossier virtuel sur les de_stinataires"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Dossier virtuel sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "Dossier virtuel sur le fil"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtre sur l'_objet"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtre sur l'e_xpéditeur"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtre sur les de_stinataires"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtre sur la _liste de diffusion"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtre sur le fil"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Défaut"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Imprimer le message"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copier l'emplacement du lien"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Cliquer sur le message %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "De"
+
+#: 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 "Répondre à"
+
+#: 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: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 "Date"
+
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Cliquez pour ouvrir %s"
+msgid "%s attachment"
+msgstr "pièce jointe %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Type de chiffrement non supporté pour multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Impossible d'analyser le message MIME. Afficher comme source"
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Format de signature non supporté"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Erreur inconnue de la vérification de signature"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Erreur inconnue de la vérification de signature"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Récupération de « %s »"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Non signé"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Signature valide"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Signature non valide"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Signature valide, impossible de vérifier l'expéditeur"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Non chiffré"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Chiffré, faiblement"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Chiffré"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Chiffré, fortement"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Partie corps externe mal formée"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pointeur sur le site FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pointeur sur le fichier local (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pointeur sur des données distantes (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pointeur sur des données externes inconnues (« %s » type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatage des messages"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Logiciel de messagerie"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13182,11 +13742,7 @@ msgstr "Cliquez pour ouvrir %s"
 msgid "Matches: %d"
 msgstr "Correspond : %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Non signé"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13194,11 +13750,7 @@ msgstr ""
 "Ce message n'est pas signé. Il n'y a aucune garantie que ce message soit "
 "authentique."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Signature valide"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13206,11 +13758,7 @@ msgstr ""
 "Ce message est signé et valide, ce qui signifie que ce message est "
 "vraisemblablement authentique."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Signature non valide"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13218,11 +13766,11 @@ msgstr ""
 "La signature de ce message ne peut être vérifiée, il se peut qu'il ait été "
 "altéré durant la transmission."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Signature valide, impossible de vérifier l'expéditeur"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13230,11 +13778,7 @@ msgstr ""
 "Ce message est signé avec une signature valide mais l'expéditeur du message "
 "ne peut être vérifié."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Non chiffré"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13243,11 +13787,7 @@ msgstr ""
 "Ce message n'est pas chiffré. Son contenu peut être vu lors de son passage "
 "sur internet."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Chiffré, faiblement"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13257,11 +13797,7 @@ msgstr ""
 "difficile, mais pas impossible pour un extérieur de voir le contenu de ce "
 "message dans une période de temps raisonnable."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Chiffré"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13269,11 +13805,7 @@ msgstr ""
 "Ce message est chiffré. Il sera difficile pour un extérieur de voir le "
 "contenu de ce message."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Chiffré, fortement"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13283,180 +13815,61 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Voir le certificat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Ce certificat n'est pas affichable"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Complété le %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Retard :"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "par %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Afficher dans le corps"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Masquer"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Page %d sur %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Récupération de « %s »"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Partie corps externe mal formée"
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pointeur sur le site FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pointeur sur le fichier local (%s) valide sur le site « %s »"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pointeur sur le fichier local (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pointeur sur des données distantes (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pointeur sur des données externes inconnues (« %s » type)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formatage des messages"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "De"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Répondre à"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "À"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Logiciel de messagerie"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Date"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "pièce jointe %s"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Impossible d'analyser le message S/MIME : erreur inconnue"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Type de chiffrement non supporté pour multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Impossible d'analyser le message MIME. Afficher comme source"
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Format de signature non supporté"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Erreur inconnue de la vérification de signature"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Erreur inconnue de la vérification de signature"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (intégré)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Toutes les semaines"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Une fois par jour"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Une fois par semaine"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Une fois par mois"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13468,25 +13881,56 @@ msgstr ""
 "\n"
 "Veuillez être patient pendant qu'Evolution déplace vos dossiers..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "La migration des uid de caches pop3 a échoué : %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Impossible de créer le dossier « %s » : %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "La migration des état d'expansion des dossiers a échoué : %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Impossible de copier le descripteur de fichier : %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"Impossible d'enregistrer le fichier de la liste des groupes pour %s : %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "L'authentification sur le serveur POP %s a échoué : %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "La création du répertoire « %s » a échoué : %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "L'ouverture du stockage « %s » a échoué : %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "La création du répertoire « %s » a échoué : %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Impossible de créer le fichier de sortie : %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13497,89 +13941,75 @@ msgstr "Enregistrer sous..."
 msgid "untitled_image.%s"
 msgstr "image_sanstitre.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Définir comme _arrière-plan"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Répondre à l'expéditeur"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Ouvrir un lien dans le navigateur"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Envoyer un _message à..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "A_jouter dans le carnet d'adresses"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Ouvrir dans %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Ce stockage ne supporte pas les abonnements, ou ils ne sont pas activés."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Abonné"
 
-#: mail/em-subscribe-editor.c:637 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 "Dossier"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Veuillez sélectionner un serveur."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Aucun serveur n'a été sélectionné."
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ne plus afficher ce message."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtres"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Message transféré --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Le %a, %d/%m/%Y à %H:%M %%+05d, %%s a écrit :"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "message"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Enregistrer le message..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Ajouter adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Messages de %s"
@@ -13597,11 +14027,13 @@ msgid "Check incoming mail being junk"
 msgstr "Vérifier si les messages entrants sont des spams"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Couleur de surbrillance des citations"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Couler de surbrillance des citations."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13710,14 +14142,20 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Liste des étiquettes et des couleurs qui leur sont associées."
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Liste de comptes"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Liste de comptes"
+
+#: 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."
@@ -13726,29 +14164,34 @@ msgstr ""
 "liste contient des chaînes désignant les noms des sous-répertoires relatifs "
 "à /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Liste des en-têtes personnelles et de leur activation."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Liste des étiquettes connues pour le composant de courrier d'Evolution. "
 "Cette liste contient des chaînes de type nom:couleur où les couleurs "
 "utilisant l'encodage hexadecimal HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Liste des types mime à vérifier pour les composants bonobo de visualisation"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Charger les images pour les messages HTML utilisant http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13759,93 +14202,93 @@ msgstr ""
 "Charger les images si l'expéditeur est dans le carnet d'adresses 2 - "
 "Toujours charger les images à partir du net"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Enregistrer les actions des filtres"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 "Enregistrer les actions des filtres dans le fichier de journal spécifié."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Fichier de journal où enregistrer les actions des filtres"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Fichier de journal où enregistrer les actions des filtres."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Marquer comme lu après le délai spécifié"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Marquer comme lu après le délai spécifié."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Marquer les citations dans le message « Preview »"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Marquer les citations dans le message « Preview »."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Largeur par défaut de la fenêtre des messages"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Style d'affichage des messages (normal, en-têtes complètes, source)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Fichier sonore de notification des nouveaux courriers"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Type de notification des nouveaux courriers"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Demander pour les objets vides"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Demander à l'utilisateur quant qu'il ou elle essaie de purger un dossier."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans object."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Demander si l'utilisateur purge"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Demander si l'utilisateur remplit uniquement Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13853,37 +14296,29 @@ msgstr ""
 "Demander lors de l'envoi de messages HTML à des contacts qui n'en veulent "
 "pas."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Demander lors de l'envoi de messages où seuls des destinataires sans To ou "
 "Cc définis."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Demander si l'utiliseur essaye d'envoyer des message HTML non désirés"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Reconnaître les liens dans le texte et les remplacer."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 "Reconnaître les frimousses dans le texte et les remplacer par des images."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Lancer le test de spam sur les messages entrants"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Envoyer par défaut le courrier au format HTML"
@@ -13934,7 +14369,7 @@ msgstr "Correction orthographique en ligne"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Hauteur par défaut de la fenêtre des messages"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -14079,33 +14514,67 @@ msgstr "Port sur lequel démarrer spamd"
 msgid "spamd port"
 msgstr "Port pour spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Assistant d'importation Elm d'Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Assistant d'importation de courrier Netscape d'Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Préférences du composeur"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Assistant d'importation Outlook Express 4 d'Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Définissez ici les préférences pour le courrier, les paramètres de sécurité "
+"et l'affichage des messages."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Assistant d'importation Pine d'Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Définissez ici la fonction de correction de l'orthographe et les signatures, "
+"et configurez le composeur de messages."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Assistant d'importation mbox d'Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Configurez ici vos comptes de messagerie."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Messagerie d'Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Composant de configuration des comptes de messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Composant Messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Composeur de courrier d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Composant de configuration du composeur de courrier d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Préférences de la messagerie d'Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Comptes de messagerie"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Préférences du courrier"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Courrier :"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14113,15 +14582,15 @@ msgstr "Evolution importe vos anciens courriers Elm"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: mail/importers/netscape-importer.c:1251 mail/importers/pine-importer.c:117
 msgid "Importing..."
 msgstr "Importation..."
 
 #: mail/importers/elm-importer.c:91
 #: mail/importers/evolution-mbox-importer.c:222
-#: mail/importers/evolution-outlook-importer.c:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Veuillez patienter"
 
@@ -14151,18 +14620,46 @@ msgid "Select folder to import into"
 msgstr "Sélectionnez un certificat à importer..."
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importation de « %s »"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importation des boîtes à lettres"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Assistant d'importation Elm d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Assistant d'importation de courrier Netscape d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Assistant d'importation Outlook Express 4 d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Assistant d'importation Pine d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Assistant d'importation mbox d'Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Examen de %s"
@@ -14172,7 +14669,7 @@ msgstr "Examen de %s"
 msgid "Priority Filter \"%s\""
 msgstr "Filtre de priorité : %s"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14197,7 +14694,7 @@ msgstr ""
 "Netscape en scores Evolution pour les filtres concernés.\n"
 "Nous vous conseillons de vérifier les filtres importés."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14210,7 +14707,7 @@ msgstr ""
 "dans Evolution.\n"
 "Ces filtres ne seront pas appliqués."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14224,23 +14721,23 @@ msgstr ""
 "filtres ont été modifiés pour vérifier si la chaîne en question\n"
 "est contenue dans le corps du message."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importe vos anciennes données Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importation des données Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Paramètres"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filtres de courrier"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14273,127 +14770,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Éditeur de compte d'Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Accord de clé"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Hôte :"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Nom d'utilisateur :"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Chemin :"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Courrier à %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "L'objet est %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Courrier de %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "Liste de diffusion %s"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Réponses à %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Ajouter une règle de filtre"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d supprimé"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d jour"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d seconde"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d seconde"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d contact"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Supprimé"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nouveau message"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Message"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Composer un nouveau message"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Filtres de courrier"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Créer un nouveau calendrier"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "L'URI d'émission du message que la vue affichera"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Service de vérification"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Connexion au serveur"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identité"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14405,12 +14914,12 @@ msgstr ""
 "envoyez."
 
 #
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Réception du courrier"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14419,15 +14928,15 @@ msgstr ""
 "cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Veuillez effectuer une sélection parmi les options suivantes."
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Envoi du courrier"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14436,11 +14945,11 @@ msgstr ""
 "cas de doute, adressez-vous à votre administrateur système ou à votre "
 "fournisseur d'accès Internet."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Gestion des comptes"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14454,14 +14963,6 @@ msgstr ""
 "Evolution. Veuillez saisir un nom pour ce compte dans l'espace ci-dessous. "
 "Ce nom sera utilisé uniquement dans un but d'affichage."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Service de vérification"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Connexion au serveur"
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14775,7 +15276,8 @@ msgid "Execute Command..."
 msgstr "Exécuter une commande..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Largeur fi_xe :"
 
 #: mail/mail-config.glade.h:82
@@ -15099,352 +15601,459 @@ msgstr "couleur"
 msgid "description"
 msgstr "description"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
+msgid "Invalid authentication"
+msgstr "Authentification SMTP"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"Le serveur SMTP %s ne supporte pas le type d'authentification demandé %s."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
-
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Supprimer définitivement les messages effacés de ce dossier"
+#. 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-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Supprimer définitivement les messages effacés de tous les dossiers"
+"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-errors.xml.in.h:6
+#. 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 "Êtes-vous sûr de vouloir supprimer cette URL ?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Demander lors de l'envoi de messages où seuls des destinataires sans To ou "
-"Cc définis."
+"Vous êtes sur le point d'envoyer un message au format HTML. Veuillez\n"
+"vous assurer que les destinataires suivants veulent et peuvent recevoir du "
+"courrier HTML :\n"
+"%sEnvoyer quand même ?"
 
-#: mail/mail-errors.xml.in.h:8
+#: 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 "Envoyer"
+
+#. 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 ""
 "Demander confirmation à l'utilisateur quand il ou elle envoie des message "
 "sans object."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
+"Demander lors de l'envoi de messages où seuls des destinataires sans To ou "
+"Cc définis."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Impossible de créer le dossier : %s : %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Impossible de créer de répertoire temporaire : %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Impossible de créer le répertoire « %s » : %s."
+msgid "Use default drafts folder?"
+msgstr "Chemin du dossier par défaut pour les contacts"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Impossible de supprimer le dossier local « %s »."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Impossible d'ouvrir le dossier Brouillons pour ce compte.\n"
+"Voulez-vous utiliser le dossier Brouillons générique ?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Impossible de supprimer le dossier local « %s »."
+msgid "Use _Default"
+msgstr "Défaut"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Impossible d'obtenir le dossier « %s » : le dossier n'existe pas."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Supprimer définitivement les messages effacés de ce dossier"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Impossible d'ouvrir la source"
+msgid "_Expunge"
+msgstr "_Nettoyer"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Impossible d'ouvrir la source"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Supprimer définitivement les messages effacés de tous les dossiers"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Impossible d'ouvrir le message."
+msgid "_Empty Trash"
+msgstr "_Vider la corbeille"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
+"Certains messages n'ont pas été envoyés. Êtes-vous sûr de vouloir quitter le "
+"programme ?"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Impossible de renommer le dossier local « %s »."
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Impossible de créer le répertoire « %s » : %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Impossible d'enregistrer dans « %s »\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "A_jouter une signature"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Impossible d'enregistrer le fichier de signature : %s."
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Supprimer « %s »"
+msgid "Error while {0}."
+msgstr ""
+"Erreur durant « %s » :\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Supprimer les contacts sélectionnés"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "Aban_donner les modifications"
+msgid "Error while performing operation."
+msgstr ""
+"Erreur durant l'exécution de l'opération :\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Voulez-vous enregistrer les modifications ?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ne pas supprimer"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Erreur de chargement des informations du filtre :\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Erreur durant l'exécution de l'opération :\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Erreur durant « %s » :\n"
-"%s"
+"Impossible d'enregistrer dans « %s »\n"
+" %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Impossible de créer le répertoire « %s » : %s."
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Impossible de créer de répertoire temporaire : %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
 msgid "File exists but cannot overwrite it."
 msgstr "Le fichier existe, l'écraser ?"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Le fichier « %s » n'existe pas ou n'est pas un fichier normal."
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Impossible de supprimer le dossier local « %s »."
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Impossible de supprimer le dossier local « %s »."
+
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Impossible de renommer le dossier local « %s »."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Supprimer « %s »"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Réellement supprimer le dossier « %s » et tous ses sous-dossiers ?"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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-errors.xml.in.h:47
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Authentification SMTP"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+msgid "A folder named \"{1}\" already exists. Please use a different name."
 msgstr ""
+"Un dossier nommé « %s » existe déjà. Veuillez utiliser un nom différent."
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Vous êtes sur le point d'envoyer un message au format HTML. Veuillez\n"
-"vous assurer que les destinataires suivants veulent et peuvent recevoir du "
-"courrier HTML :\n"
-"%sEnvoyer quand même ?"
+msgid "Cannot open source \"{2}\"."
+msgstr "Impossible d'ouvrir la source"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Réellement supprimer le dossier « %s » et tous ses sous-dossiers ?"
+msgid "Cannot open target \"{2}\"."
+msgstr "Impossible d'ouvrir le message."
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Impossible de créer le dossier : %s : %s"
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Cannot open source \"{1}\""
+msgstr "Impossible d'ouvrir la source"
+
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
 msgstr ""
-"Les dossiers virtuels suivants :\n"
-"%sutilisaient le dossier supprimé :\n"
-"        « %s »\n"
-"et ont été mis à jour."
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Vous n'avez pas saisi toutes les informations requises."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Vous ne devez pas créer deux comptes avec le même nom."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Les dossiers virtuels suivants :\n"
-"%sutilisaient le dossier supprimé :\n"
-"        « %s »\n"
-"et ont été mis à jour."
+msgid "Delete account?"
+msgstr "Supprimer les contacts sélectionnés"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Êtes-vous sûr de vouloir supprimer ce compte ?"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ne pas supprimer"
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Impossible d'enregistrer le fichier de signature : %s."
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+msgid "Cannot set signature script \"{0}\"."
+msgstr "A_jouter une signature"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
-"Le serveur SMTP %s ne supporte pas le type d'authentification demandé %s."
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "Aban_donner les modifications"
+
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Voulez-vous enregistrer les modifications ?"
+
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15452,87 +16061,97 @@ msgstr ""
 "\n"
 "Voulez-vous enregistrer les modifications ?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Impossible d'ouvrir le dossier Brouillons pour ce compte.\n"
-"Voulez-vous utiliser le dossier Brouillons générique ?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Défaut"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "Aban_donner les modifications"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Chemin du dossier par défaut pour les contacts"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Vous n'avez pas saisi toutes les informations requises."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Impossible d'obtenir le dossier « %s » : le dossier n'existe pas."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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."
 msgstr ""
-"Certains messages n'ont pas été envoyés. Êtes-vous sûr de vouloir quitter le "
-"programme ?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Vous ne devez pas créer deux comptes avec le même nom."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "Aban_donner les modifications"
-
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "_Vider la corbeille"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Les dossiers virtuels suivants :\n"
+"%sutilisaient le dossier supprimé :\n"
+"        « %s »\n"
+"et ont été mis à jour."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Nettoyer"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Envoyer"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Les dossiers virtuels suivants :\n"
+"%sutilisaient le dossier supprimé :\n"
+"        « %s »\n"
+"et ont été mis à jour."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Écraser"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Envoyer"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping sur %s"
@@ -15541,20 +16160,20 @@ msgstr "Ping sur %s"
 msgid "Working"
 msgstr "Travail en cours"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrage du dossier"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Récupération du courrier"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "L'application des filtres de sortie a échoué : %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15563,115 +16182,115 @@ msgstr ""
 "L'ajout à %s a échoué : %s\n"
 "Ajouté au dossier local « Sent » à la place."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "L'ajout au dossier local « Envoyés » a échoué : %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Envoi du message %d sur %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Anomalie au message %d sur %d"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Terminé."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Enregistrement du message dans le dossier"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Déplacement des messages vers %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copie des messages vers %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examen des dossiers dans « %s »"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Messages transférés"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ouverture du dossier %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Ouverture du stockage %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Suppression du dossier %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Stockage du dossier « %s »"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Nettoyage et stockage du compte « %s »"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Stockage du compte « %s »"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Rafraîchissement du dossier"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Nettoyage du dossier"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vidage de la corbeille dans « %s »"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Dossiers locaux"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Récupération du message %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Récupération de %d message"
 msgstr[1] "Récupération de %d messages"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Enregistrement de %d message"
 msgstr[1] "Enregistrement de %d messages"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15680,7 +16299,7 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15689,11 +16308,11 @@ msgstr ""
 "Erreur lors de l'enregistrement des messages vers : %s :\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Enregistrement de la pièce jointe"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15702,17 +16321,17 @@ msgstr ""
 "Impossible de créer le fichier de sortie : %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Impossible d'écrire les données : %s."
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Déconnexion de %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Reconnexion à %s"
@@ -15777,24 +16396,24 @@ msgstr "Mise à jour..."
 msgid "Waiting..."
 msgstr "Attente..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "L'utilisateur a annulé l'opération."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Saisissez le mot de passe pour %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Saisissez le mot de passe"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Mémoriser ce mot de passe"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Mémoriser ce mot de passe jusqu'à la fin de la session"
 
@@ -15834,89 +16453,94 @@ msgstr "Message transféré"
 msgid "Invalid folder: `%s'"
 msgstr "Dossier non valide : « %s »"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Mise en place du dossier virtuel : %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Mise à jour des dossiers virtuels pour l'URI : %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Mise à jour des dossiers virtuels pour l'URI : %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Dossiers virtuels"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Éditer le dossier virtuel"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nouveau dossier virtuel"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Non vu"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Vu"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Répondu"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Multiples messages non vus"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Messages multiples"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Plus bas"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Plus haut"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Le plus haut"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Aujourd'hui %H:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Hier %H:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Génération de la liste des messages"
 
@@ -15949,43 +16573,43 @@ msgstr "Reçu"
 msgid "Size"
 msgstr "Taille"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Appel"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ne pas faire suivre"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Donner suite"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Pour votre information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Faire suivre"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Aucune réponse nécessaire"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Répondre"
 
-#: mail/message-tag-followup.c:70 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 "Répondre à tous"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Revoir"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Marquer à donner suite"
 
@@ -16030,58 +16654,38 @@ msgstr "_S'abonner"
 msgid "_Unsubscribe"
 msgstr "Se _désabonner"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Shell d'Evolution."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Test d'Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Composant de Test d'Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Groupe de raccourcis par défaut"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Largeur par défaut du panneau des dossiers"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Largeur par défaut du panneau des raccourcis"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Hauteur par defaut de la fenêtre"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Largeur par défaut de la fenêtre"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Configuration de version d'Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "ID ou alias du composant à afficher par défaut au démarrage."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 "Si vrai, Evolution démarre en mode hors-ligne plutôt qu'en mode connecté."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -16089,62 +16693,22 @@ msgstr ""
 "Si vrai, les messages d'avertissement, dans les versions de développement "
 "d'Evolution, ne sont pas affichés."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Liste des chemins des dossiers à synchroniser sur le disque pour "
 "l'utilisation hors-ligne"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Chemin vers le dossier de calendrier par défaut"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Chemin du dossier par défaut pour les contacts"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Chemin du dossier par défaut pour les messages"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Chemin du dossier par défaut pour les tâches"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "URI physique du dossier de calendrier par défaut"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "URI physique du dossier des contacts par défaut"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "URI physique du dossier du courrier par défaut"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "URI physique du dossier par défaut des tâches"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Commuter l'affichage de la barre de dossiers"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Commuter l'affichage de la barre de raccourcis"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "courrier électronique"
 
@@ -16152,6 +16716,32 @@ msgstr "courrier électronique"
 msgid "Brought to you by"
 msgstr "Mis à votre disposition par"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Erreur inconnue"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Arguments non valides"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Impossible d'enregistrer dans OAF."
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Base de données de configuration non trouvée"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Erreur générique"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sans titre)"
@@ -16289,11 +16879,11 @@ msgstr "Impossible d'exécuter l'importateur"
 msgid "_Import"
 msgstr "_Importer"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Fermeture des connexions..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Paramètres d'Evolution"
 
@@ -16335,11 +16925,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Courrier à %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Erreur à l'exécution de %s"
@@ -16353,14 +16967,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne peut être exécuté."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "À propos de Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Travail _en ligne"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Travail _hors ligne"
 
@@ -16368,52 +16983,6 @@ msgstr "Travail _hors ligne"
 msgid "Work Offline"
 msgstr "Travail hors ligne"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution est en train de passer hors ligne."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Avertissement : Evolution n'a pu mettre à jour toutes vos données à partir "
-"de la version %d.%d.%d.\n"
-"Les données n'ont pas été effacée, mais elle ne seront pas vue par cette "
-"version d'Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Arguments non valides"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Impossible d'enregistrer dans OAF."
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Base de données de configuration non trouvée"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Erreur générique"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Case à cocher"
@@ -16484,6 +17053,43 @@ msgstr "Connexions actives"
 msgid "Click OK to close these connections and go offline"
 msgstr "Cliquez sur Valider pour fermer ces connexions et passer hors ligne"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "C_alendrier :"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacts : "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Courrier :"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tâches :"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Type de dossier :"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Ouvrir un dossier d'un autre utilisateur"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Compte :"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Nom du _Dossier :"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Utilisateur :"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Assistant de configuration d'Evolution"
@@ -16526,6 +17132,18 @@ msgstr ""
 "\n"
 "Veuillez cliquer le bouton « Appliquer » pour enregistrer vos paramètres."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Shell d'Evolution."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Test d'Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Composant de Test d'Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Cliquez sur « Importer » pour commencer à importer le fichier."
@@ -16585,13 +17203,13 @@ 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:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16622,57 +17240,48 @@ msgstr ""
 "Nous espérons que vous apprécierez le résultat de notre dur labeur,\n"
 "et nous attendons impatiemment vos contributions !\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Merci\n"
 "L'équipe Evolution de Ximian\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ne plus me le dire"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Impossible d'accéder au shell de Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Impossible d'initialiser le shell de Ximian Evolution : %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Démarre Evolution en activant le composant spécifié"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Démarrer en mode déconnecté"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Démarrer en mode connecté"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forcer l'arrêt de tous les composants d'Evolution."
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forcer la remigration depuis Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Envoyer la sortie de déboguage de tous les composants à un fichier."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16681,13 +17290,79 @@ msgstr ""
 "%s : --online et --offline ne peuvent pas être utilisés \n"
 "ensemble. Utilisez %s --help pour plus d'informations.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Connexion en cours"
+
+#. shell:noshell 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/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"
+"\n"
+"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"
+"\n"
+"{0}\n"
+"\n"
+"Click help for details."
+msgstr ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Nom de certificat"
 
@@ -16924,11 +17599,6 @@ msgstr "Vous avez des fichiers de certificats qui identifient ces personnes :"
 msgid "Your Certificates"
 msgstr "Vos certificats"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Certificat déjà existant"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17119,6 +17789,11 @@ msgstr "ID unique de l'objet"
 msgid "Certificate Signature Value"
 msgstr "Valeur de la signature du certificat"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Certificat déjà existant"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Fichier de mots de passe PKCS12"
@@ -17159,12 +17834,12 @@ msgstr "Objet par défaut pour le message."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Impossible d'exécuter « %s » : %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Fermeture de %s (%s)\n"
@@ -17228,7 +17903,8 @@ msgid "Select all contacts"
 msgstr "Sélectionner tous les contacts"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Envoyer un message aux contacts sélectionnés."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17259,8 +17935,8 @@ msgstr "Voir le contact actif"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Actions"
@@ -17278,7 +17954,8 @@ msgid "_Preview Pane"
 msgstr "Panneau d'_aperçu"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Enregistrer comme VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17405,10 +18082,20 @@ msgstr "Voir le rendez-vous actuel"
 msgid "Week"
 msgstr "Semaine"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Sem. travail"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Ouvrir rendez-vous"
 
+#: 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 "_Fermer"
+
 #: 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
@@ -17728,6 +18415,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Fermer"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "A_jouter l'expéditeur dans le carnet d'adresses"
@@ -17968,7 +18665,8 @@ msgid "Open the selected message in a new window"
 msgstr "Ouvrir le message sélectionné dans une nouvelle fenêtre"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Ouvrir le message sélectionné dans le composeur pour le renvoyer"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18084,58 +18782,46 @@ msgstr "Dossier virtuel sur l'_objet..."
 msgid "_Attached"
 msgstr "_Joint"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copier vers le dossier"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Créer un filtre à partir du message"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Aller à"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Dans le corps"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Plus _grand"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Affichage du _message"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Déplacer vers le dossier"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Message _suivant"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Affichage _normal"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Ouvrir le message"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Message _précédent"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Cité"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Renvoyer..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Outils"
@@ -18144,16 +18830,6 @@ msgstr "_Outils"
 msgid "_Undelete"
 msgstr "_Récupérer"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Fermer"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Joindre"
@@ -18544,6 +19220,11 @@ msgstr "_Référence rapide"
 msgid "_Send / Receive"
 msgstr "_Envoyer / recevoir"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Fenêtre"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Par _société"
@@ -18611,10 +19292,6 @@ msgstr "Date d'échéance :"
 msgid "With _Status"
 msgstr "Définir l'état"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tâches"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18773,6 +19450,35 @@ msgstr "Autre..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Messagerie d'Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informations de la réunion"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Test d'Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Messages envoyés et brouillons"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Développé"
@@ -18889,6 +19595,35 @@ msgstr "Texte"
 msgid "Find _Now"
 msgstr "Rechercher _maintenant"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 existe déjà.\n"
+"Voulez vous l'écraser ?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Impossible d'enregistrer dans « %s »\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Impossible d'enregistrer dans « %s »\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18899,6 +19634,152 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminé)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Visualiseur de dossiers du carnet d'adresses d'Evolution"
+
+#~ msgid "Address 2:"
+#~ msgstr "Adresse 2 :"
+
+#~ msgid "Blog:"
+#~ msgstr "Blog :"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Afficheur de calendrier d'Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Afficheur de tâches d'Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Impossible d'initialiser gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Impossible d'ouvrir le dossier dans « %s »"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "L'URI que le calendrier affichera."
+
+#~ msgid "The type of view to show"
+#~ msgstr "Le type de vue à afficher."
+
+#~ msgid "Display a message"
+#~ msgstr "Afficher un message"
+
+#~ msgid "Alerts"
+#~ msgstr "Alertes"
+
+#~ msgid "Time"
+#~ msgstr "Heure"
+
+#~ msgid "_General"
+#~ msgstr "_Général"
+
+#~ msgid "Select source"
+#~ msgstr "Sélectionnez une source"
+
+#~ msgid "calendar"
+#~ msgstr "calendrier"
+
+#~ msgid "task list"
+#~ msgstr "liste des tâches"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Impossible de mettre à jour le fichier de calendrier !\n"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "Le moteur des tâches pour\n"
+#~ "%s\n"
+#~ "est tombé en panne."
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "L'URI du dossier de tâches à afficher"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Impossible de charger les tâches dans « %s »."
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Afficheur de dossiers courrier d'Evolution"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "Dossier virtuel sur le fil"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtre sur le fil"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "La migration des uid de caches pop3 a échoué : %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "La migration des état d'expansion des dossiers a échoué : %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "L'ouverture du stockage « %s » a échoué : %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "L'URI d'émission du message que la vue affichera"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Groupe de raccourcis par défaut"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Largeur par défaut du panneau des raccourcis"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Chemin vers le dossier de calendrier par défaut"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Chemin du dossier par défaut pour les contacts"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Chemin du dossier par défaut pour les messages"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Chemin du dossier par défaut pour les tâches"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "URI physique du dossier de calendrier par défaut"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "URI physique du dossier des contacts par défaut"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "URI physique du dossier du courrier par défaut"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "URI physique du dossier par défaut des tâches"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Commuter l'affichage de la barre de dossiers"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Commuter l'affichage de la barre de raccourcis"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Avertissement : Evolution n'a pu mettre à jour toutes vos données à "
+#~ "partir de la version %d.%d.%d.\n"
+#~ "Les données n'ont pas été effacée, mais elle ne seront pas vue par cette "
+#~ "version d'Evolution.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Impossible d'initialiser le shell de Ximian Evolution : %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Renvoyer..."
+
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "Assistant de création du carnet d'adresses"
 
@@ -18921,9 +19802,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgid "Group:"
 #~ msgstr "Groupe :"
 
-#~ msgid "New Address Book"
-#~ msgstr "Nouveau carnet d'adresses"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -19053,13 +19931,6 @@ msgstr "%s (%d%% terminé)"
 #~ " %s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Impossible de copier le descripteur de fichier : %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19187,12 +20058,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
 #~ msgstr "Tentative d'édition du dossier virtuel « %s » qui n'existe pas."
 
-#~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr ""
-#~ "Le carnet d'adresses « %s » va être supprimé. Êtes-vous sûr de vouloir "
-#~ "continuer ?"
-
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "l'UID de la source des contatcs que la vue affichera"
 
@@ -19255,9 +20120,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Conjoint(e) :"
 
-#~ msgid "_Add"
-#~ msgstr "A_jouter"
-
 #~ msgid "_Business:"
 #~ msgstr "Tra_vail :"
 
@@ -19378,15 +20240,6 @@ msgstr "%s (%d%% terminé)"
 #~ "distant. Ceci nécessite\n"
 #~ "que vous spécifiez des paramètres additionnels."
 
-#~ msgid "Start Date:"
-#~ msgstr "Date de début :"
-
-#~ msgid "Due Date:"
-#~ msgstr "Date d'échéance :"
-
-#~ msgid "Priority:"
-#~ msgstr "Priorité :"
-
 #, fuzzy
 #~ msgid "Internal error: expecting CamelMultipart, got \"%s\""
 #~ msgstr "Erreur interne : format d'uid non valide : %s"
@@ -19410,9 +20263,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "La vue montrant le début du calendrier"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Saisissez le mot de passe pour %s"
-
 #~ msgid "New task list"
 #~ msgstr "Nouvelle liste des tâches"
 
@@ -19469,30 +20319,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Impossible de trouver le dossier partagé spécifié."
 
-#~ msgid "C_alendar:"
-#~ msgstr "C_alendrier :"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Courrier :"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Tâches :"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Type de dossier :"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Ouvrir un dossier d'un autre utilisateur"
-
-#~ msgid "_Account:"
-#~ msgstr "_Compte :"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Nom du _Dossier :"
-
-#~ msgid "_User:"
-#~ msgstr "_Utilisateur :"
-
 #~ msgid "Create a new window"
 #~ msgstr "Créer une nouvelle fenêtre"
 
@@ -19515,91 +20341,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgstr "A_ller à aujourd'hui"
 
 #, fuzzy
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Réponse inattendue du serveur IMAP : %s"
-
-#, fuzzy
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#, fuzzy
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Impossible d'obtenir le dossier « %s » : %s"
-
-#, fuzzy
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Serveur déconnecté de manière inattendue : %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr "La connexion au serveur IMAP %s en mode sécurisé a échoué : %s"
-
-#, fuzzy
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Impossible de se connecter au serveur POP %s : aucun support pour le "
-#~ "mécanisme d'authentification demandé."
-
-#, fuzzy
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sVeuillez saisir le mot de passe SMTP pour %s sur l'hôte %s"
-
-#, fuzzy
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr ""
-#~ "Impossible de authentifier sur le serveur IMAP.\n"
-#~ "%s\n"
-#~ "\n"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
-#, fuzzy
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Impossible de créer le dossier « %s » : %s"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Impossible de supprimer le dossier : %s : dossier inexistant"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr "Impossible de supprimer le dossier : %s : opération non valide"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Impossible de créer le dossier « %s » : %s"
-
-#, fuzzy
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr "Impossible de renommer le dossier : %s : opération non valide"
-
-#, fuzzy
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Impossible de créer le dossier « %s » : %s"
-
-#, fuzzy
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Réponse inattendue du serveur IMAP : %s"
-
-#, fuzzy
-#~ msgid "No data"
-#~ msgstr "Aucune donnée fournie"
-
-#, fuzzy
 #~ msgid "<b>Filter Rules</b>"
 #~ msgstr "Règles de filtrage"
 
@@ -19615,9 +20356,6 @@ msgstr "%s (%d%% terminé)"
 #~ msgid "[script]"
 #~ msgstr " [script]"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Les connexions suivantes sont actives :"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Rechercher des contacts"
 
diff --git a/po/ga.po b/po/ga.po
index 1b8a5b13d3..45263b950c 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -23,6 +23,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Leabhar Sheoladh Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Tadhallaí: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Coimriú Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,16 +57,6 @@ msgstr "cartaí"
 msgid " card"
 msgstr "1 carta"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Tadhallaí: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Coimriú Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Seoladh Shionc. Loicthe:"
@@ -71,63 +71,20 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Teastasaí"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Tadhallaí"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Leabhar Sheoladh Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,41 +125,45 @@ msgstr "_Tadhallaí"
 msgid "Create a new contacts group"
 msgstr "Cruthaigh tadhall nua"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -210,8 +171,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -219,7 +180,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
@@ -266,20 +227,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr ""
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Leabhar Seoladh Nua"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sPasfhocal do %s, le do thoil (úsáideoir %s)"
+#: 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
+#: 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
+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
+#: 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í"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -299,6 +282,59 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Tadhallaí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Teastasaí"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Leabhar Sheoladh Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr ""
@@ -320,6 +356,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -397,7 +434,7 @@ 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:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "i gCónaí"
@@ -412,110 +449,100 @@ msgid "Basic"
 msgstr "Gnáth"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Dathanna"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Gnáth"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Aon"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Roghnaigh dath"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Cuardaigh"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -526,7 +553,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -535,19 +562,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Fó"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -555,7 +582,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -565,34 +592,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -600,127 +627,134 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Ag Úsáid seoladh r-post:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Tadhallaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Seoladh Rphost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ainm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Uimhir _Poirt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Tosaíocht:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Ainm _Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Freastalaí:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "cartaí"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "noimeaíd"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 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-popup.c:208
-msgid "Remove All"
-msgstr "Scríos Gach Rud"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Scríos"
 
+#: 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 "Ainm"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Scríos Gach Rud"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Feach Líosta Tadhall"
@@ -743,12 +777,6 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: 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
-msgid "Name"
-msgstr "Ainm"
-
 # 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
@@ -756,10 +784,9 @@ msgstr "Ainm"
 msgid "Source"
 msgstr "Foinse"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/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 "<b>Contacts</b>"
@@ -826,142 +853,141 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Seoladh _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Seoladh:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Cúntóir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Brei_thlá:"
 
-# PE
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Féilire:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Cathair:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Teoranta"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Tír:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Roinn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "Eolas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Ainm _Fhada..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Baile"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Seoladh R-Post:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Bainisteoir"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Leasainm:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Notaí:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Eile"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "Bosca _Phoist:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -988,9 +1014,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Obair"
@@ -1026,23 +1052,35 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr ""
 
@@ -2227,94 +2265,112 @@ msgstr "An tSaimbia"
 msgid "Zimbabwe"
 msgstr "An tSiombáib"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Seirbhís"
-
-#: 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
-msgid "Location"
-msgstr "Áit"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Ainm Úsaideoir"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
 # Avoid; either use KR or KP
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Leabhar Foinse"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Is Tadhall Nua"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr ""
 
 # FR
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Athraithe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Dealaigh na tadhallaí roghnaithe"
+
+# NE
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "An Nígir"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 ""
 
+#: 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
+msgid "Service"
+msgstr "Seirbhís"
+
+#: 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
+msgid "Location"
+msgstr "Áit"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Ainm Úsaideoir"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2332,18 +2388,6 @@ msgstr "Ainm _Fhada:"
 msgid "E-_mail:"
 msgstr "R-_phost:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Seoladh _2:"
@@ -2492,8 +2536,8 @@ msgstr ""
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Leabhar"
 
@@ -2550,6 +2594,421 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Cuardach Ardmód"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "R-phost"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Eagrú"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "sonraí"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Fón Char"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+#, fuzzy
+msgid "Fax"
+msgstr "Facs Ghnó"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Obair"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+# PE
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: 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
+#, fuzzy
+msgid "personal"
+msgstr "Leagan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Tideal Post"
+
+# ta
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Rpost"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Leathanach Baile"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Ceangailte"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Teip ag oscailt '%s': %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, 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
+msgid "Other error"
+msgstr "Earraidh Eile"
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Earraidh ag suimigh tadhall"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "carta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "líosta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Bog tadhall go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Cóip tadhall go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Bog tadhallaí go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Cóip tadhallaî go"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard do %s"
+
+#.
+#. * 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 "(gan ainm)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "R-phost Tosaíocht"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Rphost 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Rphost 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 "Cruthaigh an tadhall nua \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Leabhar Seoladh..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Eagar na hEolais Thadall"
+
+#: 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] "agus aon carta eile."
+msgstr[1] "agus aon carta eile."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Sábháil san leabhar seoladh"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Gan Tadhallaí"
@@ -2565,8 +3024,8 @@ msgstr[1] "%d Tadhallaí"
 #: 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Ceist"
 
@@ -2621,9 +3080,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Sábháil mar VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2692,7 +3152,7 @@ msgid "Cut"
 msgstr "Gearr"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2703,18 +3163,8 @@ msgstr "Cóip"
 msgid "Paste"
 msgstr "Greamaigh"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Dealaigh"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Amharc Reatha"
 
@@ -2727,7 +3177,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
@@ -2768,22 +3218,6 @@ msgstr ""
 msgid "Company Phone"
 msgstr "Fón Ghnó"
 
-# ta
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Rpost"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Rphost 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Rphost 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Ainm Chlainn"
@@ -2821,29 +3255,14 @@ msgstr ""
 msgid "Manager"
 msgstr "Bainisteoir"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Fón Phóca"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Leasainm"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Nota"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oifig"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Eagrú"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Facs Eile"
@@ -2895,21 +3314,29 @@ msgstr "Aonad"
 msgid "Web Site"
 msgstr "Idirlíon"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Leitheid"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Airde"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 ""
+
 # FI
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -2927,11 +3354,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-# CO
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2952,395 +3374,11 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptar"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr ""
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "R-phost"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "sonraí"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Fón Char"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-#, fuzzy
-msgid "Fax"
-msgstr "Facs Ghnó"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Obair"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-# PE
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Leagan"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Tideal Post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Leathanach Baile"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Ceangailte"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Teip ag oscailt '%s': %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Níl aon fillteán: %s"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Earraidh Eile"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-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:114
-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 ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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:140
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Caith uait"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Earraidh ag suimigh tadhall"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "carta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "líosta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Bog tadhall go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Cóip tadhall go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Bog tadhallaí go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Cóip tadhallaî go"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Roghnaigh Tadhallaí o Leabhar Seoladh"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard do %s"
-
-#.
-#. * 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 "(gan ainm)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "R-phost Tosaíocht"
-
-#: 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 "Cruthaigh an tadhall nua \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Leabhar Seoladh..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Eagar na hEolais Thadall"
-
-#: 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] "agus aon carta eile."
-msgstr[1] "agus aon carta eile."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
+# CO
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Sábháil san leabhar seoladh"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Amharc Carta"
@@ -3386,11 +3424,6 @@ msgstr "Amharcóir Féilire Evolution"
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 msgid "Print contacts"
 msgstr "Priontáil an tadhallaí seo"
@@ -3400,6 +3433,11 @@ msgstr "Priontáil an tadhallaí seo"
 msgid "Print contact"
 msgstr "Priontáil an tadhall seo"
 
+#: 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"
 msgstr "Tahoma 10 pt."
@@ -3584,16 +3622,6 @@ msgstr ""
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3648,6 +3676,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Earraidh ag lódáil leabharsheoladh loicead."
@@ -3660,11 +3698,12 @@ msgstr "Comhad Inchur"
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Líosta gan ainm"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Pasfhocal, le do thoil"
 
@@ -3696,73 +3735,15 @@ msgstr "Tosaíocht Loicthe:"
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Féilirí"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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 "Amharcóir Féilire Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Eagarthóir Féilire/Tasc Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Amharcóir Tascanna Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Comhpháirt Tascanna Evolution"
-
-# tg
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tascanna"
-
-#: 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 "Ag Tosaíocht:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Ag Críochnach:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Aláram Evolution"
 
@@ -3771,48 +3752,41 @@ msgstr "Aláram Evolution"
 # ## 	The 'msgid' names and spellings for languages are those listed
 # ##     in iso-639.def from glibc
 # aa 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alairm on %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Dún"
+msgid "Snooze _time (minutes):"
+msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr ""
+msgid "_Edit appointment"
+msgstr "Eagar coinne"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr "Eagar coinne"
-
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Oscail"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3821,12 +3795,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Rabhadh"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3834,7 +3808,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3845,19 +3819,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
-msgid "Could not initialize Bonobo"
+#: 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:167
-msgid "Could not initialize gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:139
+msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3966,175 +3940,170 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
+msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Áit"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Féilire"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "lae"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %e %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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Féilire Nua"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Álbachtaí..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Ag Lódáil féilire..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Féilirí"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Coinne nua"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Coinne"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Cruthaigh coinne nua"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Cruinniú"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Féilire nua"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "Fé_ilire"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Cruthaigh féilire nua"
 
@@ -4164,15 +4133,36 @@ msgstr "Amharc Seachtain"
 msgid "Month View"
 msgstr "Amharc Mí"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr ""
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Áit"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr ""
 
@@ -4181,19 +4171,6 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr ""
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr ""
@@ -4260,7 +4237,7 @@ msgstr ""
 msgid "hours"
 msgstr "uair"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4280,14 +4257,14 @@ msgstr ""
 msgid "Date/Time:"
 msgstr "Dáta/Am:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Taispeáin scéal"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 ""
 
+#: 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 ""
@@ -4302,6 +4279,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
 msgid "Summary:"
 msgstr "Coimriú:"
@@ -4340,10 +4318,104 @@ msgstr "noimea(i)d"
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Suimigh Féilire Nua"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa na Líosta Tasc"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Suimigh Féilire Nua"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+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
+#, fuzzy
+msgid "_Type:"
+msgstr "Saghas:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+# el 
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "seachtanna"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 ""
 
@@ -4357,19 +4429,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Míchumasach"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Chumasach"
 
@@ -4393,164 +4465,176 @@ msgstr "30 noiméaid"
 msgid "60 minutes"
 msgstr "60 noiméaid"
 
-# DZ
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Am</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Am</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Líosta Tasc</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Am</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Seachtain Oibre</b>"
+
+#: 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 "Lae"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Taispeaín"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Cumasach"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Aoine"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Noimeaíd"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Luain"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sathairn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Domhnaigh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "D_ea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Líosta Tasc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Deardaoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Am"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Am _Críos:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Mairt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Ceádaoin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Seachtain Oibre"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 uair (IN/RN)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 uair"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Suimigh URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Taispeaín"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4560,139 +4644,46 @@ msgstr "_Taispeaín"
 msgid "_Edit"
 msgstr "_Eagar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Aoi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Giniréal"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Lua"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Mai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Cea"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "roimh gach coinne"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Suimigh Féilire Nua"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa na Líosta Tasc"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Roghnachais na Fheilire"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Suimigh Féilire Nua"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-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
-#, fuzzy
-msgid "_Type:"
-msgstr "Saghas:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-# el 
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "seachtanna"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4767,79 +4758,79 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Críochnaithe "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Críochnaithe "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Eagar Coinne"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Coinne - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tasc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Gan coimriú"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Sábháil mar..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Críochnaithe "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Críochnaithe "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4962,27 +4953,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 ""
 
@@ -4994,7 +4985,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr ""
 
@@ -5085,10 +5076,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5107,15 +5098,15 @@ msgstr ""
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5387,27 +5378,19 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Roghnaigh fillteán"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
-msgstr ""
+msgid "Select destination"
+msgstr "Teip ag oscailt fillteán: %s: %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Féilire"
+msgid "_Destination"
+msgstr "Ag socraigh ffilteán: %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Líosta tasc nua"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Líosta Tasc"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5435,38 +5418,44 @@ msgid "% _Complete"
 msgstr "% _Rinneadh"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Críochnaithe"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Ard"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Bun"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Gnáth"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 ""
 
@@ -5503,11 +5492,11 @@ msgstr "Leathanach _Lín:"
 msgid "Assignment"
 msgstr "Coinne"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5516,8 +5505,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Tuarascail:"
@@ -5669,98 +5659,54 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Priobhdach"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Gan Tidéal"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
-msgid "End Date"
-msgstr "Dáta"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Coimriú"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Saor"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
+msgid "Start Date:"
+msgstr "Dáta Breithe"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "T"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Dáta:"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "D"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stádas:"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
+msgstr "Tosaíocht:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "I"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Leathanach _Lín:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#: 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-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Níl"
-
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Gan fhois"
-
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-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 "Priobhdach"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
+#: 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
@@ -5807,17 +5753,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Saor"
+
+#: 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 "Scríos an sceal seo"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Oscail"
 
@@ -5826,31 +5781,32 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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"
@@ -5858,10 +5814,10 @@ msgstr "_Cóip"
 
 # PS
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Greamaigh"
 
@@ -5920,78 +5876,155 @@ msgstr "Tosaíocht"
 msgid "Start date"
 msgstr "Dáta Breithe"
 
+#: 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 "Coimriú"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "_Coinne Nua..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Cruinniú Nua"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Tasc Nua"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Roghnaigh fillteán"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Roghnaigh..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Cóip do Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Bog go Fillteán..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Álbachtaí..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Dáta"
+
+#: 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: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-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 "Gan fhois"
+
+#: 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:168 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
+msgid "No"
+msgstr "Níl"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "T"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr ""
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "I"
+
+#: 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 ""
+
 #. 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
@@ -6012,36 +6045,36 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-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 "rn"
+
+#. 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 "in"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "rn"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "in"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6148,10 +6181,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ar bith</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stádas:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6181,7 +6210,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ceart go Leor"
 
@@ -6395,59 +6424,55 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6568,28 +6593,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "As an Oifig"
@@ -6650,7 +6653,34 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+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
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6659,21 +6689,19 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Ag oscailt tascanna as %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6682,53 +6710,108 @@ msgstr ""
 " Earráid le %s:\n"
 "  %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+# tg
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tascanna"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Gan coinní."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ag Lódáil íomhanna"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Ag Oscailt %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
 # tr
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr ""
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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 "Eagarthóir Féilire/Tasc Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Comhpháirt Tascanna Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Féilirí"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tascanna"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aibreáin"
@@ -6870,6 +6953,25 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+"Téip ag cruthaigh comhad aschur: %s\n"
+"%s"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1ú"
@@ -7091,7 +7193,7 @@ msgid "Contacts: "
 msgstr "Tadhallaí: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Priontáil Reamhtaispeántais"
 
@@ -7103,67 +7205,77 @@ msgstr ""
 msgid "Print Setup"
 msgstr "Socraigh Priontáil "
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Líosta Tasc Nua"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Scrioste"
+msgstr[1] "Scrioste"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Ag Lódáil íomhanna"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tasc"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tasc nua"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa na Líosta Tasc"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Cruthaigh tasc nua"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7171,11 +7283,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Priontáil Tascanna"
 
@@ -8842,7 +8954,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8935,29 +9047,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8989,7 +9078,46 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8997,42 +9125,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Ceangailte."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9043,100 +9171,100 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Teip ar GPG: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
-msgstr "Níorbh fhéidir '%s' a glasáil"
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
+msgid "Could not lock '%s'"
+msgstr "Níorbh fhéidir '%s' a glasáil"
 
 #: camel/camel-movemail.c:107
 #, c-format
@@ -9370,7 +9498,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9563,8 +9691,9 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
-msgstr ""
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9579,7 +9708,7 @@ msgstr "Teip ag cruthaigh fillteán %s: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr ""
 
@@ -9646,96 +9775,96 @@ msgstr "Teip ag cruthaigh fillteán %s: %s"
 msgid "Cannot set message digests"
 msgstr "Níl an scéal %s ar fáil: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Sonraí Theastas"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 # SG
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Siniú Bhailithe."
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Teip oraithe NNTP: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr ""
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Cruthaigh tadhall nua"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9752,17 +9881,27 @@ msgstr "Teip ag cruthaigh fillteán %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Bruscar"
 
 # GN
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Bruscar"
@@ -9883,7 +10022,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9892,11 +10031,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "OLC"
 
@@ -9913,7 +10052,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9923,28 +10062,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9956,17 +10095,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9975,11 +10114,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9994,10 +10128,12 @@ 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 ""
@@ -10029,6 +10165,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10048,26 +10185,305 @@ msgstr ""
 msgid "Checklist"
 msgstr "líosta"
 
-#: 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:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Níl eolaire maildir '%s' ann."
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %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
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: 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 "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Níl an scéal %s ar fáil: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Níl aon Eolaire `%s' ann."
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %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 "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
 msgstr ""
 
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %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 "Fillteáin"
+
+#: 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
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Seirbhís IMAP do %s as %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:140
+#: 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 ""
+
+#: 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:815
+#: 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/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: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/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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 msgid "Unknown error"
 msgstr "Earraidh gan fhois"
 
+#: 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 "%sPasfhocali POP do %s@%s, le do thoil"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Níl eolaire maildir '%s' ann."
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Ordú:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Níl eolaire maildir '%s' ann."
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Gan Tascanna"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10110,21 +10526,21 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10138,25 +10554,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10195,23 +10611,6 @@ msgstr ""
 msgid "Command:"
 msgstr "Ordú:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Fillteáin"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10233,85 +10632,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Freastalaí IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Seirbhís IMAP do %s as %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10319,25 +10676,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10345,7 +10695,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10444,58 +10794,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Comhad phoist áitiúl %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Teip ag athainmigh '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10561,7 +10911,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr "níl eolaire maildir ann"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10886,7 +11236,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10895,8 +11245,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10905,48 +11255,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Earraidh ag sábhháil scéal: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -11060,8 +11410,9 @@ msgid "Could not get group: %s"
 msgstr "Ní raibh an grúpa ar fáil: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
-msgstr ""
+#, 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
 #, c-format
@@ -11114,8 +11465,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11551,7 +11902,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ceangaltáin"
 
@@ -11596,6 +11947,90 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+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 "Níorbh fhéidir an comhad %s a n-oscailt: %s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Scéal gan tideál)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Oscail Comhad"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Uathcruthach"
+
+# SG
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Siniú:"
+
+#: 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.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 ""
@@ -11676,198 +12111,133 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+#, fuzzy
+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}"
 msgstr ""
 
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
+#. 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 ""
 
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Níorbh fhéidir an comhad %s a n-oscailt: %s"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr ""
 
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:1551
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid "Untitled Message"
+msgid "Unfinished messages found"
 msgstr "(Scéal gan tideál)"
 
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Oscail Comhad"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Uathcruthach"
-
-# SG
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Siniú:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
 msgstr ""
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Scríos"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Teip ag sábháil comhad siniú: %s"
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr ""
-"Teip ag cruthaigh comhd '%s':\n"
-"%s"
-
-#: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Teip ag sábháil comhad siniú: %s"
-
-#: composer/mail-composer-errors.xml.in.h:9
-#, fuzzy
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Teip ag sábháil comhad siniú: %s"
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
 msgid "Discard Changes"
 msgstr "_Caith uait"
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "Scríos"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Sábháil Scéal...."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
 msgstr ""
+"Teip ag cruthaigh comhd '%s':\n"
+"%s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "(Scéal gan tideál)"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Teip ag sábháil comhad siniú: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Ceangal comhad ar an scéal"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11985,7 +12355,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -12162,73 +12533,89 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "Sábháil Mar"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Ag dealaigh fillteán %s"
 
-#: filter/filter-errors.xml.in.h:7
-#, fuzzy
-msgid "Missing name."
-msgstr "Coinne"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr ""
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Coinne"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12241,68 +12628,11 @@ msgstr "Roghnaigh comhad"
 msgid "<b>Then</b>"
 msgstr "<b>Am</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Roghnaigh Fillteán"
 
-# IR
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr ""
-
-# vi
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Ainm chomhaid:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Gan Tidéal"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Am</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "      "
@@ -12387,6 +12717,77 @@ msgstr ""
 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
+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
+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
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr ""
+
+# vi
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Ainm chomhaid:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Am</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Freagraí do %s"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Freagraí do %s"
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12520,7 +12921,7 @@ msgid "Junk Test"
 msgstr ""
 
 # PE
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Lipéid"
@@ -12560,7 +12961,7 @@ msgstr "Éirigh as an ríomhchlár"
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr ""
 
@@ -12631,9 +13032,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12697,102 +13098,60 @@ msgstr ""
 msgid "Virtual _Folders"
 msgstr "_Fillteán"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Suimigh"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Foinse FFillteáin"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Post Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Comhphairt Post Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Amharcóir fillteáin phost Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Cuntasaí Phoist"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Roghnachais Phoist"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Gnáth]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Ainm chuntas"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Teang(ach)a"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Suimigh Siniú"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Cruthaigh Fillteán _Fhíorúil ó Cuardach..."
 
@@ -12828,536 +13187,562 @@ msgstr ""
 msgid "Create New Folder"
 msgstr "Cruthaigh Fillteán Nua"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "Cruthaigh fillteán"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Ai_nm Fillteán:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "FFilteáin"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Imbosca"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Ag Lódáil..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, 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:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, 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:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Bog"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cealaigh Tasc"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Roghnaigh fillteán"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Cóip"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Cruthaigh fillteán"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Athainmigh Fillteán"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Feach"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Oscail 'san Fhuinneog _Nua"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Bog"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "Fillteán _Nua..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Athainmigh"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "FFilteáin"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Imbosca"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Eagar mar Scéal Nua..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Priontáil"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Freagrair do Líosta"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Freagrair do _Gach rud"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Seol ar aghaidh"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Bánaigh Brat"
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Bog go Fillteán..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Cóip do Fillteán..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Gnáth"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Priontáil Scéal"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-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-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Gan Siniú"
+#: 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 "Freagrair-Do"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-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 "Do"
 
-# SG
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Siniú Bhailithe."
+#: 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-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
+#: 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"
 
-# SG
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Siniú neambhailí."
+#: 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-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Sábháil siniú"
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Gan Siniú"
 
-#: mail/em-format-html-display.c:658
-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 ""
+# SG
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Siniú Bhailithe."
 
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
-msgstr "_Feach Teastas"
+# SG
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Siniú neambhailí."
 
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1002
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "mar %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1013
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "mar %B %d, %Y, %l:%M %p"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "Leathanach %d as %d"
-
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Ó"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Freagrair-Do"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Do"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: 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:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dáta"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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 ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:653
+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."
+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."
+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 ""
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:757
+msgid "_View Certificate"
+msgstr "_Feach Teastas"
+
+#: mail/em-format-html-display.c:772
+msgid "This certificate is not viewable"
+msgstr ""
+
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Sábháil siniú"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "mar %B %d, %Y, %l:%M %p"
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
 msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-display.c:1018
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "mar %B %d, %Y, %l:%M %p"
+
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr ""
+
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
+msgstr ""
+
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr "Leathanach %d as %d"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Gach bliain"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Aon _seachtain"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Aon _mhí"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13365,24 +13750,58 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#: mail/em-migrate.c:1532
+#, 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:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1715
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1933
+#, 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
 #, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, 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
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:699
@@ -13395,89 +13814,75 @@ msgstr "Sábháil Mar..."
 msgid "untitled_image.%s"
 msgstr "íomhá_gan_tideál.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Suim do Leabhar Seoladh"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Oscail san %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
 # Avoid; either use KR or KP
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 "Fillteán"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "scéal"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Sábháil Scéal...."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Suimigh seoladh"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Scéal ó %s"
@@ -13495,11 +13900,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13598,158 +14003,159 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Líosta do cuntasaí"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Líosta do cuntasaí"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Airde Fuinneog Loicthe"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13797,8 +14203,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Airde Fuinneog Loicthe"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -13934,33 +14341,62 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Post Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Comhphairt Post Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Cuntasaí Phoist"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Roghnachais Phoist"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Post"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13968,15 +14404,15 @@ msgstr ""
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Fán le do thoil"
 
@@ -14005,19 +14441,47 @@ msgid "Select folder to import into"
 msgstr "Roghnaigh fillteán"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Comhad Inchur"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -14027,7 +14491,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14042,7 +14506,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14050,7 +14514,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14059,23 +14523,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Álbachtaí"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14106,164 +14570,176 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Óst:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Ainm _Úsaideoir:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Slí:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Post do %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Tá an t-ábhar %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Scéal ó %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "líosta ríomhphost %s"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Freagraí do %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Scrioste"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d nua"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d la(e)"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d soicínd"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d nua"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d íomlán"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Scrioste"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Scéal Post Nua"
 
 # mt
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Scéal Ríomhphost"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Cruthaigh scéal phost nua"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Fillteán Nua"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Fillteán"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Cruthaigh féilire nua"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Bainisteoireacht Chuntas"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14272,14 +14748,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14571,7 +15039,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14881,400 +15349,516 @@ msgstr "dath"
 msgid "description"
 msgstr "sonraí"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Údarú"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:4
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+#. 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-errors.xml.in.h:5
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"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-errors.xml.in.h:6
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:7
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#. 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"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:8
+#: 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 "Post"
+
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ní féidir cóip a dhéanamh don fillteán: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Teip ag cruthaigh fillteán %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Teip ag cruthaigh eolaire '%s': %s."
-
-#: mail/mail-errors.xml.in.h:16
-#, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+#. 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 ""
-"Teip ag cruthaigh eolaire\n"
-"%s\n"
-"Earraidh: %s"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Teip ag dealaigh fillteán:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
 msgstr ""
-"Teip ag dealaigh fillteán:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:19
-#, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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?"
 msgstr ""
-"Teip ag scŕios fillteán:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Teip ag oscailt '%s': %s"
-
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Teip ag oscailt '%s': %s"
+msgid "Use _Default"
+msgstr "Gnáth"
 
-#: mail/mail-errors.xml.in.h:23
-msgid "Cannot open target \"{2}\"."
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
-"Teip ag athainmigh fillteán:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Teip ag cruthaigh eolaire '%s': %s."
+msgid "_Empty Trash"
+msgstr "Folamh _Buscar"
 
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
-" Ní féidir sábháil go `%s'\n"
-"  %s"
 
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Suimigh Siniú"
-
-#: mail/mail-errors.xml.in.h:30
+#. mail:exit-unsaved secondary
+#: mail/mail-errors.xml.h:55
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"If you quit, these messages will not be sent until Evolution is started "
+"again."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Teip ag sábháil comhad siniú: %s"
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Dealaigh \"%s\""
+#. 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-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Dealaigh Tadhall?"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:37
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr "Earraidh ag lódáil leabharsheoladh loicead."
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr ""
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+#, fuzzy
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
+" Ní féidir sábháil go `%s'\n"
+"  %s"
 
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Teip ag cruthaigh eolaire\n"
+"%s\n"
+"Earraidh: %s"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+msgid "Cannot create temporary save directory."
+msgstr "Teip ag cruthaigh eolaire '%s': %s."
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. 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/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Údarú"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
+"Teip ag dealaigh fillteán:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
+"Teip ag dealaigh fillteán:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:50
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 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."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
+"Teip ag athainmigh fillteán:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Dealaigh \"%s\""
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. 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 ""
+"Teip ag scŕios fillteán:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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 "Teip ag oscailt '%s': %s"
+
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+msgid "Cannot open target \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. 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 "Ní féidir cóip a dhéanamh don fillteán: %s"
+
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Teip ag oscailt '%s': %s"
+
+#. 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-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Dealaigh Tadhall?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#. 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-errors.xml.in.h:64
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr ""
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "Use _Default"
-msgstr "Gnáth"
+msgid "Could not save signature file."
+msgstr "Teip ag sábháil comhad siniú: %s"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Suimigh Siniú"
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Folamh _Buscar"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Teip ag cruthaigh fillteán %s: %s"
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Post"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-folder-cache.c:786
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
+msgstr ""
+
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+msgid "_Overwrite"
+msgstr ""
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Post"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -15283,135 +15867,135 @@ msgstr ""
 msgid "Working"
 msgstr "Ag Obair"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Críochnaithe."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Ag dealaigh fillteán %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Líosta do cuntasaí"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Fillteáin Áitiúl"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15420,7 +16004,7 @@ msgstr ""
 "Téip ag cruthaigh comhad aschur: %s\n"
 "%s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15429,11 +16013,11 @@ msgstr ""
 "Earraidh ag sábhháil scéalaí  do: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15442,17 +16026,17 @@ msgstr ""
 "Teip ag cruthaigh comhad aschur: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Cumraigh do %s"
@@ -15516,24 +16100,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr "Ag Fanacht..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Pasfhocal do %s, le do thoil"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Pasfhocal, le do thoil"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15576,89 +16160,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr "Fillteán neambhailí: '%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ag socraigh ffilteán: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Ag oscailt an t-eolaire %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Ag oscailt an t-eolaire %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "fFillteáin"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Eagar FFilteán"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Fillteán Nua"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Inniú %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Inné %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15690,44 +16279,44 @@ msgstr ""
 msgid "Size"
 msgstr "Méid"
 
-#: 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 ""
 
 # NO
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: 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:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Freagrair"
 
-#: mail/message-tag-followup.c:70 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 "Freagrair do gach rud"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15769,124 +16358,88 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Blaosc Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Comhpháirt Tascanna Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Airde Fuinneog Loicthe"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Leitheid Fuinneog Loicthe"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Leagan cumraíocht Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
+# ta
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "mail"
+msgstr "post"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr ""
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
-msgstr ""
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Earraidh gan fhois"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
-# ta
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-msgid "mail"
-msgstr "post"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1107
+msgid "Generic error"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -16011,11 +16564,11 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Roghnachais Evolution"
 
@@ -16052,11 +16605,28 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Post do %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -16070,14 +16640,15 @@ msgid "Bug buddy could not be run."
 msgstr ""
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Faoi Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
@@ -16085,44 +16656,6 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -16188,6 +16721,45 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "Fé_ilire:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Tadhallaí: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Post:"
+
+# tg
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tascanna:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Saghas fillteán:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Roghnaigh Fillteán Tascanna"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Cuntas:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Ainm _Fillteán:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Úsaideoir:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -16221,6 +16793,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Blaosc Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Comhpháirt Tascanna Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16282,13 +16868,13 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16302,72 +16888,128 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Go raibh maith agat\n"
 "An Fhoireann Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-"Go raibh maith agat\n"
-"An Fhoireann Evolution\n"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+msgid "Continue"
+msgstr ""
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr ""
+"Go raibh maith agat\n"
+"An Fhoireann Evolution\n"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr ""
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Ainm Teastas"
 
@@ -16592,11 +17234,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16788,6 +17425,11 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16827,12 +17469,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Níorbh fhéidir '%s' a chur i gcrích: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16896,8 +17538,9 @@ msgid "Select all contacts"
 msgstr "Roghnaigh gach tadhallaí"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr ""
+#, fuzzy
+msgid "Send a message to the selected contacts."
+msgstr "Post sceál do tadhall"
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
@@ -16928,8 +17571,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Gníomhartha"
@@ -16947,7 +17590,8 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Sábháil Mar VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17074,10 +17718,20 @@ msgstr "Feach an coinne reatha"
 msgid "Week"
 msgstr "Seachtain"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Seachtain Oibre"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Oscail Coinne"
 
+#: 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 "_Dún"
+
 #: 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
@@ -17395,6 +18049,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Dún"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17637,8 +18301,9 @@ msgid "Open the selected message in a new window"
 msgstr "Post an sceál seo"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
-msgstr ""
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
+msgstr "Post an sceál seo"
 
 #: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
@@ -17752,59 +18417,47 @@ msgstr ""
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Cóip go Fillteán"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr ""
 
 # PE
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Bog go Fillteán"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Taispeaín _Gnáth"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Oscail Scéal"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Uir_lisí"
@@ -17813,16 +18466,6 @@ msgstr "Uir_lisí"
 msgid "_Undelete"
 msgstr "_Athdealaigh"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Dún"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ceangal"
@@ -18215,6 +18858,11 @@ msgstr "Roghnachais Phoist"
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Fuinneog"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -18283,10 +18931,6 @@ msgstr "Dáta Breithe"
 msgid "With _Status"
 msgstr "_Stádas:"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tascanna"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18448,6 +19092,34 @@ msgstr "Eile..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Post Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Eolas cruinniú"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18562,6 +19234,32 @@ msgstr "Teacs"
 msgid "Find _Now"
 msgstr ""
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+" Ní féidir sábháil go `%s'\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+" Ní féidir sábháil go `%s'\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18573,8 +19271,43 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% Rinneadh)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Leabhar Seoladh Nua"
+#~ msgid "Address 2:"
+#~ msgstr "Seoladh _2:"
+
+# PE
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Amharcóir Féilire Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Amharcóir Tascanna Evolution"
+
+#~ msgid "Display a message"
+#~ msgstr "Taispeáin scéal"
+
+#~ msgid "Time"
+#~ msgstr "Am"
+
+#~ msgid "_General"
+#~ msgstr "_Giniréal"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Roghnaigh fillteán"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Féilire"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Líosta tasc nua"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Amharcóir fillteáin phost Evolution"
 
 #, fuzzy
 #~ msgid "Address Book Creation Assistant"
@@ -18619,9 +19352,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Céile:"
 
-#~ msgid "_Add"
-#~ msgstr "_Suimigh"
-
 #~ msgid "_Business:"
 #~ msgstr "_Gnó:"
 
@@ -18652,9 +19382,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Business"
 #~ msgstr "Gnó"
 
-#~ msgid "Priority:"
-#~ msgstr "Tosaíocht:"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -18690,10 +19417,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Create a new address book"
 #~ msgstr "Cruthaigh tasc nua"
 
-#, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Pasfhocal do %s, le do thoil"
-
 #~ msgid "New task list"
 #~ msgstr "Líosta tasc nua"
 
@@ -18722,28 +19445,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "in \"%s\" ..."
 #~ msgstr "san \"%s\"..."
 
-#~ msgid "C_alendar:"
-#~ msgstr "Fé_ilire:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Post:"
-
-# tg
-#~ msgid "_Tasks:"
-#~ msgstr "_Tascanna:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Saghas fillteán:"
-
-#~ msgid "_Account:"
-#~ msgstr "_Cuntas:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Ainm _Fillteán:"
-
-#~ msgid "_User:"
-#~ msgstr "_Úsaideoir:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Cruthaigh fhuinneog nua"
 
@@ -18955,9 +19656,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Other Address"
 #~ msgstr "Seoladh Eile"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Earráid Evolution"
-
 #~ msgid "Error starting %s"
 #~ msgstr "Earriadh ag tosnú %s"
 
@@ -18975,9 +19673,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Yugoslavia"
 #~ msgstr "An Iúglaiv"
 
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Líosta Tasc</b>"
-
 #~ msgid "<b>Date &amp; Time</b>"
 #~ msgstr "<b>Data &amp; Am</b>"
 
@@ -19251,9 +19946,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "All"
 #~ msgstr "Gach Uile"
 
-#~ msgid "No tasks"
-#~ msgstr "Gan Tascanna"
-
 #~ msgid "blue"
 #~ msgstr "gorm"
 
@@ -19416,9 +20108,6 @@ msgstr "%s (%d%% Rinneadh)"
 #~ msgid "Delete news feed"
 #~ msgstr "Dealaigh fotha nuachtan"
 
-#~ msgid "_Mail"
-#~ msgstr "_Post"
-
 #~ msgid "_every"
 #~ msgstr "_gach"
 
diff --git a/po/gl.po b/po/gl.po
index 7dd8ee44b8..4fd703ee14 100644
--- a/po/gl.po
+++ b/po/gl.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -28,6 +28,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Editar o Libro de Enderezos"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Co_ntactos:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Fiestra de Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -53,16 +63,6 @@ msgstr "Sen tarxetas"
 msgid " card"
 msgstr "1 tarxeta"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Co_ntactos:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Fiestra de Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 #, fuzzy
 msgid "Default Sync Address:"
@@ -79,74 +79,24 @@ msgstr "Non foi posible cargar %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Non foi posible ler o bloque de aplicación Enderezo do pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Data na que se completa"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "ID do certificado:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contactos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editar o Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+msgid "Failed to authenticate.\n"
 msgstr ""
+"Non foi posible autenticarse co servidor IMAP.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Introduza o seu contrasinal para %s"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -191,7 +141,11 @@ msgstr "Co_ntactos:"
 msgid "Create a new contacts group"
 msgstr "Crear un novo grupo de atallos"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 #, fuzzy
 msgid "Failed to connect to LDAP server"
 msgstr ""
@@ -199,7 +153,7 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -207,39 +161,39 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Agardando..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Examinando %s"
@@ -247,8 +201,8 @@ msgstr "Examinando %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -256,7 +210,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
@@ -306,24 +260,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"Non foi posible autenticarse co servidor IMAP.\n"
-"%s\n"
-"\n"
+msgid "New Address Book"
+msgstr "Libro de Enderezos"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Introduza o seu contrasinal para %s"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -343,6 +315,69 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Data na que se completa"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID do certificado:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editar o Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Fábrica para o menú emerxente de enderezos do Libro de Enderezos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: 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
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -365,6 +400,7 @@ msgstr "Dete_ctar tipos soportados "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 ""
@@ -440,7 +476,7 @@ msgstr "Co_ntactos:"
 msgid "Address Book Properties"
 msgstr "Fontes do Libro de Enderezos"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always"
@@ -457,119 +493,109 @@ msgid "Basic"
 msgstr "Básico"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "P_echar"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Connecting"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nome da lista:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Cargar _Imaxes"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Never"
 msgstr "Cada"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Único"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Escoller unha cor"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Ámbito da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid "Searching"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -580,7 +606,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -589,20 +615,20 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Armacenar busca como CartafolV"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -610,7 +636,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -620,27 +646,27 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -650,7 +676,7 @@ msgstr ""
 "Este nome hase empregar para identifica-la conta. Só se empregará para "
 "amosar."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -658,138 +684,145 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formato da hora:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid "Using email address"
 msgstr "_Este é o enderezo de correo"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Co_ntactos:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nome:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 #, fuzzy
 msgid "_Port number:"
 msgstr "_Porto:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioridade:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 #, fuzzy
 msgid "_Search base:"
 msgstr "_Base da busca:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Nome do _Servidor:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Usar conexión segura (_SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "cards"
 msgstr "Sen tarxetas"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Desconectando de %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "general-tab"
 msgstr "Xeral"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minutos"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "searching-tab"
 msgstr "Buscar M_ensaxe..."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Eliminar Todos"
+msgid "Select Contacts from Address Book"
+msgstr "Seleccionar Contactos do Libro de Enderezos"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eliminar"
 
+#: 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 "Nome:"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Eliminar Todos"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -814,23 +847,16 @@ msgstr "Engadir a Contactos"
 msgid "Unnamed Contact"
 msgstr "Contacto Sen Nome"
 
-#: 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
-msgid "Name"
-msgstr "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
 msgid "Source"
 msgstr "Fonte"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Seleccionar Contactos do Libro de Enderezos"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interface de selección de nome do Libro de Enderezos de Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -903,60 +929,50 @@ msgid "<b>Work</b>"
 msgstr "Semana Laboral"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Enderezo _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Enderezo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ani_versario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistente"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Aniversario:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "para sempre"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Axenda"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Cidade:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Compañía"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -964,43 +980,48 @@ msgstr "Compañía"
 msgid "Contact"
 msgstr "Contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_País:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Departamento:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL libre-ocupado"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "Full _Name..."
 msgstr "Nome _Completo..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Particular"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 #, fuzzy
 msgid "Location:"
@@ -1008,43 +1029,48 @@ msgstr ""
 "\n"
 "Localización Xeográfica: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Enderezo de Correo:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Xestor"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Alcume:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Outro"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Apdo. de Correos:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1072,9 +1098,9 @@ msgstr "Páxina"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
@@ -1110,24 +1136,41 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"¿Está seguro de que quere\n"
+"borrar este contacto?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #, fuzzy
 msgid "Editable"
 msgstr "Activado"
@@ -2114,105 +2157,123 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Cimbabue"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Anterior Mensaxe"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Contacto Sen Nome"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Engadir Servicio"
-
-#: 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 ""
-"\n"
-"Localización Xeográfica: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nome de _Usuario:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "India"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Fonte"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Campo _Desde"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Chad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorías:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Anterior Mensaxe"
+
+#: 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 "Engadir Servicio"
+
+#: 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 ""
+"\n"
+"Localización Xeográfica: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nome de _Usuario:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Engadir Contacto Rapidamente"
@@ -2235,23 +2296,6 @@ msgstr ""
 "\n"
 "Correo Electrónico:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"¿Está seguro de que quere\n"
-"borrar este contacto?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Enderezo _2:"
@@ -2408,8 +2452,8 @@ msgstr "editor-de-contactos"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Corpo"
@@ -2473,6 +2517,456 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Busca Avanzada"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Membros"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organización"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Estonia"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Nada"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Traballando"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "para sempre"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: 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
+#, fuzzy
+msgid "personal"
+msgstr "Xeral"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Posto de traballo:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Correo Electrónico"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax Particular"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Éxito"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repositorio desconectado"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Permiso denegado"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Tarxeta non atopada"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "Protocolo non soportado"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Cancelada"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "A autenticación fallou."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Autenticación requirida"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Non existe a mensaxe"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Outro erro"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Non foi posible abrir este libro de enderezos.  Isto significa\n"
+"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
+"fóra de servicio"
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Non foi posible abrir este libro de enderezos.  Isto significa\n"
+"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
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Erro ao engadi-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Erro ao modifica-la lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Erro ao modifica-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Erro ao elimina-la tarxeta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s xa existe\n"
+"¿Quere sobrescribilo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+#, 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
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+#, fuzzy
+msgid "list"
+msgstr "Brétema"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Sen tarxetas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Seleccionar Contactos do Libro de Enderezos"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Varias VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard de %s"
+
+#.
+#. * 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 "(ningún)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Correo Electrónico Principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Correo Electrónico 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Correo Electrónico 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Escolla unha Acción"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crear un novo contacto \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Engadir un enderezo a un contacto existente \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Buscando no Libro de Enderezos..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Editar Información de Contacto"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Mestura-lo Enderezo de Correo"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "non contén"
+msgstr[1] "non contén"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Amosa-las _Cabeceiras Completas"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Gardar como VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Gardar no libro de enderezos"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2488,8 +2982,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
 msgid "Query"
 msgstr "Alemaña"
@@ -2549,9 +3043,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Gardar como VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2625,7 +3120,7 @@ msgid "Cut"
 msgstr "Cortar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2636,18 +3131,8 @@ msgstr "Copiar"
 msgid "Paste"
 msgstr "Pegar"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Eliminar"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 #, fuzzy
 msgid "Current View"
 msgstr "_Vista Actual"
@@ -2661,7 +3146,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Calquera Categoría"
@@ -2702,21 +3187,6 @@ msgstr "Categorías"
 msgid "Company Phone"
 msgstr "Teléfono da Compañía"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Correo Electrónico"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Correo Electrónico 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Correo Electrónico 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 #, fuzzy
 msgid "Family Name"
@@ -2757,29 +3227,14 @@ msgstr "Xordania"
 msgid "Manager"
 msgstr "Xestor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Teléfono Móbil"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Alcume"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Nota"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Oficina"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organización"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Outro Fax"
@@ -2833,23 +3288,33 @@ msgstr "Non vista"
 msgid "Web Site"
 msgstr "Sitio Web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Largura:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Altura:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Eliminada"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Ordeamento das tarefas"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -2868,11 +3333,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
-msgid "Column Width"
-msgstr "Colombia"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 #, fuzzy
 msgid ""
@@ -2906,432 +3366,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Andorra"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Eliminada"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Ordeamento das tarefas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Membros"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "Correo Electrónico"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Estonia"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Nada"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Traballando"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "para sempre"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Xeral"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Posto de traballo:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax Particular"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Éxito"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repositorio desconectado"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Permiso denegado"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Tarxeta non atopada"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, 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:60
-msgid "Protocol not supported"
-msgstr "Protocolo non soportado"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Cancelada"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "A autenticación fallou."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Autenticación requirida"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Non existe a mensaxe"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Outro erro"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Non foi posible abrir este libro de enderezos.  Isto significa\n"
-"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
-"fóra de servicio"
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Non foi posible abrir este libro de enderezos.  Isto significa\n"
-"que introduciu un URI incorrecto ou que o servidor LDAP está\n"
-"fóra de servicio"
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Non se pode abrir o libro de enderezos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "¿Quere gardar os cambios?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, fuzzy
-msgid "_Discard"
-msgstr "Imprimir tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Erro ao engadi-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Erro ao engadi-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Erro ao modifica-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Erro ao modifica-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Erro ao elimina-la lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Erro ao elimina-la tarxeta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s xa existe\n"
-"¿Quere sobrescribilo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-#, fuzzy
-msgid "Overwrite"
-msgstr "¿Sobrescribir ficheiro?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-#, fuzzy
-msgid "list"
-msgstr "Brétema"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Sen tarxetas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Seleccionar Contactos do Libro de Enderezos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Varias VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard de %s"
-
-#.
-#. * 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 "(ningún)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Correo Electrónico Principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Escolla unha Acción"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crear un novo contacto \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Engadir un enderezo a un contacto existente \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Buscando no Libro de Enderezos..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editar Información de Contacto"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Mestura-lo Enderezo de Correo"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "non contén"
-msgstr[1] "non contén"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Amosa-las _Cabeceiras Completas"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 #, fuzzy
-msgid "Show Compact VCard"
-msgstr "Gardar como VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Gardar no libro de enderezos"
+msgid "Column Width"
+msgstr "Colombia"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3380,11 +3418,6 @@ msgstr "Compositor de correo de Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Imprimir sobre"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3396,6 +3429,11 @@ msgstr "Imprimi-los contactos seleccionados"
 msgid "Print contact"
 msgstr "Imprimi-los contactos seleccionados"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Imprimir sobre"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 ptos. Tahoma"
@@ -3582,18 +3620,6 @@ msgstr "Lista de _Contactos"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Non se pode abrir a mensaxe"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Tarxeta non atopada"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3652,6 +3678,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Non se pode abrir a mensaxe"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Tarxeta non atopada"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -3667,12 +3705,13 @@ msgstr "Inserir Ficheiro"
 msgid "No filename provided."
 msgstr "Non se especificou un nome de cartafol"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contacto Sen Nome"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Contrasinal"
@@ -3706,131 +3745,58 @@ msgstr "_Prioridade:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Non foi posible ler o bloque de aplicación ToDo (PorFacer) do pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Axenda"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Preferencias da Axenda e as Tarefas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Visor da axenda iTip/iMip de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Editor de Novas de Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Compoñente do resumo executivo da axenda de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Compositor de correo de Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tarefas"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Fábica para o servicio de notificación de alarmas"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 #, fuzzy
 msgid "Starting:"
 msgstr "Opcións"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 #, fuzzy
 msgid "Ending:"
 msgstr "Í_ndice"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarmas"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "P_echar"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "A_diar"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Tempo de adiamento (minutos)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Editar cita"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Adiar"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Non hai unha descrición dispoñible."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3839,12 +3805,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Advertencia"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3852,7 +3818,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3863,20 +3829,21 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Fábica para o servicio de notificación de alarmas"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Non foi posible inicializar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Non foi posible inicializar gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Non foi posible crear a fábrica do servicio de notificacións de alarma"
 
@@ -3991,61 +3958,46 @@ 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 "_Pedir confirmación ao eliminar elementos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Pedir confirmación ao eliminar elementos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Borrar a tarefa seleccionada"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Amosa-los _números das semanas no navegador de datas"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "O resumo contén"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "O comentario contén"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "A descrición contén"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Non concorda"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4057,130 +4009,141 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "é menor que"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "días"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 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.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 de %B de %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:464
+#: 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 de %b"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Propiedades..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Cargando axenda..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "New appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 #, fuzzy
 msgid "_Appointment"
 msgstr "Cita"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "New meeting"
 msgstr "Configuración da Fonte de Novas"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nova Cita"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Nova C_ita"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crear unha nova cita"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Caledonia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Axenda"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Crear unha nova axenda"
 
@@ -4210,16 +4173,37 @@ msgstr "Vista Semanal"
 msgid "Month View"
 msgstr "Vista Mensual"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "O resumo contén"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "O comentario contén"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "A descrición contén"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Non concorda"
+
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Erro ao se comunicar co servidor de axenda"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Permiso denegado"
@@ -4229,19 +4213,6 @@ msgstr "Permiso denegado"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Non foi posible abrir o cartafol en `%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "O URI que ha amosar a axenda"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opcións das Alarmas Sonoras"
@@ -4313,7 +4284,7 @@ msgstr "veces cada"
 msgid "hours"
 msgstr "horas"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4332,14 +4303,14 @@ msgstr "Básico"
 msgid "Date/Time:"
 msgstr "Data/Hora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Amosar unha mensaxe"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Tocar un son"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4355,6 +4326,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
 msgid "Summary:"
 msgstr "Resumo:"
@@ -4393,10 +4365,110 @@ msgstr "minutos"
 msgid "start of appointment"
 msgstr "comezo da cita"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Nome do estilo:"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Engadir á Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Lista de _Tarefas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Engadir á Axenda"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipo:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "semanas"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Activado"
 
@@ -4412,19 +4484,19 @@ msgstr "Non eliminar"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Desactivar"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Activado"
 
@@ -4450,167 +4522,179 @@ msgstr "60 minutos"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "Alerts"
-msgstr "Alarmas"
+msgid "<b>Alerts</b>"
+msgstr "<b>Descrición:</b> %s"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Recordatorios"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "información de axenda"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Semana Laboral"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Preferencias da Axenda e as Tarefas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Cor para tarefas retrasadas"
 
-#: 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 "Cor para tarefas para hoxe"
 
-#: 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 "Días"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Amosar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ctivar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Venres"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minutos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Luns"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "S_un"
 msgstr "_Dom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sábado"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Amosa-los _números das semanas no navegador de datas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Domingo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Tarefas para _hoxe:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Xov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Xoves"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Hora"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Fuso _horario:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Formato da hora:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Martes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Mércores"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Semana Laboral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 horas (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 horas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Engadir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pedir confirmación ao eliminar elementos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Comprimi-las fins de semana na vista mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Day begins:"
 msgstr "_Amosar estacións:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Amosar"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4620,151 +4704,51 @@ msgstr "_Amosar"
 msgid "_Edit"
 msgstr "_Editar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Petición de Libre/Ocupado"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Ven"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Xeral"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Agocha-las tarefas completadas despois de"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Tarefas _retrasadas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sáb"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Amosar os prazos _finais das citas nas vistas semanal e mensual"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Di_visións horarias:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #, fuzzy
 msgid "_Tue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Mé_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "before every appointment"
 msgstr "antes da fin da cita"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Nome do estilo:"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Engadir á Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Lista de _Tarefas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Axenda"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Engadir á Axenda"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipo:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "semanas"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4839,81 +4823,81 @@ msgstr "%s  Fixo cambios. ¿Quere esquecer estes cambios e actualizar o editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Non fixo cambios, ¿quere actualizar o editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Erro descoñecido: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " a "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Completada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Completada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Pendente "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Pendente "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 #, fuzzy
 msgid "Could not update object"
 msgstr "Non foi posible actualizar os ficheiros correctamente"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Editar Cita"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cita - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tarefa - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entrada de diario - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Sen resumo"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gardar como..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "¡Non foi posible obter a versión actual!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Erro descoñecido: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " a "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Completada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Completada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Pendente "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Pendente "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -5041,28 +5025,28 @@ msgstr "Delegar En:"
 msgid "Enter Delegate"
 msgstr "Introducir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cita"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Recordatorio"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Recorrencia"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 #, fuzzy
 msgid "Scheduling"
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Xuntanza"
 
@@ -5074,7 +5058,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data de _Inicio:"
@@ -5168,10 +5152,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5191,15 +5175,15 @@ msgstr "Debe estabrecerse un organizador."
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegar En..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5494,26 +5478,19 @@ msgstr ""
 msgid "Save Event"
 msgstr "Mensaxe da Axenda"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Seleccionar Cartafol"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Escolla un cartafol de destino para importar estes datos"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Axenda"
+msgid "_Destination"
+msgstr "Borrar este cartafol"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Lista de _Tarefas"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5545,38 +5522,44 @@ msgid "% _Complete"
 msgstr "% Completo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Completada"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Alta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "En Progreso"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Baixa"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Non Iniciada"
 
@@ -5614,11 +5597,11 @@ msgstr "Enderezo da páxina _Web:"
 msgid "Assignment"
 msgstr "Asignación"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Non se pode abrir o libro de enderezos"
@@ -5627,8 +5610,9 @@ msgstr "Non se pode abrir o libro de enderezos"
 msgid "Con_fidential"
 msgstr "Con_fidencial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Descrición:"
@@ -5783,101 +5767,57 @@ msgstr "Servidor %s %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Público"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privado"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidencial"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Prema para engadir unha tarefa"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data Final"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Sen título"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
 msgstr "Data de _Inicio:"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Resumo"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Libre"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupado"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "O"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Data Límite"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A posición xeográfica ten que se introducir no formato: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+#, fuzzy
+msgid "Status:"
+msgstr "E_stado:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioridade:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Non"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Enderezo da páxina _Web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Descoñecido"
+#: 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 "Público"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Recorrendo"
+#: 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 "Privado"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Asignada"
+#: 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 "Confidencial"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5924,18 +5864,27 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Libre"
+
+#: 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 "Ocupado"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -5945,41 +5894,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Imprimir..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Pegar"
 
@@ -6040,82 +5990,161 @@ msgstr "Prioridade"
 msgid "Start date"
 msgstr "Data de _Inicio:"
 
+#: 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 "Resumo"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Ordeamento das tarefas"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nova _Cita..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Día Completo"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 #, fuzzy
 msgid "New Meeting"
 msgstr "Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Seleccionar _Fío"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Eliminar..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicar Información de Libre/Ocupado"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "_Copiar a un Cartafol..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Mover ó Cartafol.."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Programar Xuntanza"
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Remitir como i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Borrar esta _Ocorrencia"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Borrar _Tódalas Ocorrencias"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Ir a _Hoxe"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Ir á Data..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Preferencias de Correo..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Data Final"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Descoñecido"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Recorrendo"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Non"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "O"
+
+#: 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 ""
+"A posición xeográfica ten que se introducir no formato: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -6139,36 +6168,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i divisións de minuto"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 de %B"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 de %b"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i divisións de minuto"
 
 #: calendar/gui/e-itip-control.c:592
 #, fuzzy
@@ -6285,11 +6314,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ningunha</i>"
 
-#: calendar/gui/e-itip-control.c:950
-#, fuzzy
-msgid "Status:"
-msgstr "E_stado:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6322,7 +6346,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Aceptar"
 
@@ -6542,65 +6566,60 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-#, fuzzy
-msgid "Calendar file could not be updated!\n"
-msgstr "¡Non se puido envia-lo elemento!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Actualización completada\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 #, 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:1858
+#: calendar/gui/e-itip-control.c:1859
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 #, 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:1864
+#: calendar/gui/e-itip-control.c:1865
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Enderezo do asistente"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Eliminación Completa"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "¡Elemento enviado!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "¡Non se puido envia-lo elemento!\n"
 
@@ -6718,28 +6737,6 @@ msgstr "Delegado"
 msgid "In Process"
 msgstr "En Progreso"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Fóra da Oficina"
@@ -6800,84 +6797,171 @@ msgstr "Hora do _inicio da reunión:"
 msgid "Meeting _end time:"
 msgstr "Hora do _final da reunión:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d de %B de %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+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
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Erro ao iniciar %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Abrindo armacenamento %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Erro ao iniciar %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data na que se completa"
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Elimina-los contactos seleccionados"
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 #, fuzzy
 msgid "Expunging"
 msgstr "Limpar"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tarefas"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Non hai citas"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Cargar _Imaxes"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Abrir en %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turco"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: 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
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Preferencias da Axenda e as Tarefas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de Novas de Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Compoñente do resumo executivo da axenda de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Compositor de correo de Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Axenda"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Tarefa"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "abril"
@@ -7023,6 +7107,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Permiso denegado"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Non se pode abrir o libro de enderezos"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -7246,7 +7347,7 @@ msgid "Contacts: "
 msgstr "Co_ntactos:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Previsualización da Impresión"
 
@@ -7258,69 +7359,79 @@ msgstr "Imprimir Elemento"
 msgid "Print Setup"
 msgstr "Configuración da Impresión"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Cargar _Imaxes"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 #, fuzzy
 msgid "New task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tarefa"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista de _Tarefas"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crear unha nova tarefa"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "O URI do cartafol de tarefas a amosar"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Non foi posible cargar as tarefas en `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: calendar/gui/tasks-control.c:367
 #, fuzzy
 msgid ""
 "This operation will permanently erase all tasks marked as completed. If you "
@@ -7333,11 +7444,11 @@ msgstr ""
 "\n"
 "¿Eliminar realmente estas mensaxes?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Non preguntar de novo"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Imprimir tarxetas"
@@ -9105,7 +9216,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Creando o cartafol %s"
@@ -9201,33 +9312,6 @@ msgstr "Argumentos non válidos"
 msgid "Error executing filter search: %s: %s"
 msgstr "Erro ao executar a busca por filtro: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Non se pode analizar a expresión de busca: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Erro ao executar a expresión de busca: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(coinciden-todas) require un único resultado booleano"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9266,7 +9350,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Recibindo %d mensaxe(s)"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Non se pode analizar a expresión de busca: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Erro ao executar a expresión de busca: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(coinciden-todas) require un único resultado booleano"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(coinciden-todas) require un único resultado booleano"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(coinciden-todas) require un único resultado booleano"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Efectuando petición sobre a cabeceira descoñecida: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9274,43 +9403,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do servidor IMAP: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9318,85 +9447,65 @@ msgid ""
 "%s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1246 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 "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Non foi posible crear o ficheiro temporal: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mensaxe cifrada"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Non foi posible recibir a mensaxe do editor"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Non se puido crear unha canalización de axuda ao bloqueo: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Non se pode lanza-lo axudante ao bloqueo: %s"
-
-#: 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 "Non se puido bloquear '%s': erro de protocolo con lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Non se puido bloquear '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9419,6 +9528,26 @@ msgstr "Non se puido obter un bloqueo usando fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Non se puido obter un bloqueo usando flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Non se puido crear unha canalización de axuda ao bloqueo: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Non se pode lanza-lo axudante ao bloqueo: %s"
+
+#: 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 "Non se puido bloquear '%s': erro de protocolo con lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Non se puido bloquear '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9666,7 +9795,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Mala resposta de autenticación do servidor."
 
@@ -9870,7 +9999,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "ID do certificado:"
 
 #: camel/camel-smime-context.c:360
@@ -9887,7 +10016,7 @@ msgstr "Non foi posible crear un contexto de descodificación S/MIME."
 msgid "Failed to add data to CMS encoder"
 msgstr "Non se puido armacenar o correo no ficheiro temporal %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr ""
@@ -9963,99 +10092,99 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Ficheiro de sinatura:"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Engadir criterio"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tipo de Servidor: "
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "O comando IMAP fallou: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Non se puido atopa-lo certificado de \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Non se puido atopar un algoritmo bulk común."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Non foi posible crear un contexto de descodificación S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Non se puido enviar o nome de usuario ao servidor"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Comando non implementado"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -10074,18 +10203,28 @@ msgstr "Non é posible obter o cartafol: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Non se pode crear bloqueo de cartafol en %s: %s"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -10218,7 +10357,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10227,11 +10366,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -10253,7 +10392,7 @@ msgstr ""
 "¿Desexa aceptar de todas maneiras?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10268,28 +10407,28 @@ msgstr ""
 "\n"
 "¿Desexa aceptar de todas maneiras?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "ID do certificado:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10301,17 +10440,17 @@ msgstr "ID do certificado:"
 msgid "Could not parse URL `%s'"
 msgstr "Non foi posible analizar o URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Erro ao iniciar %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non existe a mensaxe %s en %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
@@ -10323,11 +10462,6 @@ msgstr ""
 "Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: camel/camel-vee-store.c:390
-#, fuzzy, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Non foi posible renomear o cartafol: %s"
-
 #: camel/camel-vee-store.c:398
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10344,10 +10478,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Comprobando o novo correo"
 
 #: 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 "Comprobar as novas mensaxes en tódolos cartafoles"
@@ -10381,6 +10517,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10401,26 +10538,336 @@ msgstr ""
 msgid "Checklist"
 msgstr "Brétema espesa"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %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 "O servidor desconectou inesperadamente"
+
+#: 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 "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Non é posible obter a mensaxe: %s do cartafol %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 ""
+"Non é posible obter a mensaxe: %s do cartafol %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Non é posible engadir a mensaxe ó cartafol mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Non é posible engadir a mensaxe ó cartafol 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 ""
+"Non é posible obter a mensaxe: %s do cartafol %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 ""
+"Non é posible obter a mensaxe: %s do cartafol %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 ""
+"Non é posible obter a mensaxe: %s do cartafol %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 ""
+"Non é posible obter a mensaxe: %s do cartafol %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 "Cartafoles"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Amosar só os cartafoles subscritos"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Espacio de nomes"
+
+#: 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 "Para ler e almacenar correo en servidores IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Servicio %s 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: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/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 "Non foi posible conectarse a %s (porto %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:815
+#: 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/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexión cancelada"
+
+#: 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"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"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
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Erro enviando o nome de usuario: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Erro descoñecido"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Non foi posible conectarse ó servidor POP.\n"
+"Non hai soporte para o mecanismo de autenticación solicitado."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduza o contrasinal SMTP para %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Non foi posible autenticarse co servidor KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "O nome do cartafol non pode conter o carácter Return."
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "_Compañía:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Non foi posible renomear o cartafol: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Non é posible obter o cartafol: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Resposta inesperada do servidor IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Non hai tarefas"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "O servidor desconectou inesperadamente"
 
-#: 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:1089
-msgid "Unknown error"
-msgstr "Erro descoñecido"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10463,21 +10910,21 @@ msgstr "Non foi posible crear o directorio %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Non foi posible carga-lo resumo de %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "O cartafol foi destruido e rexenerado no servidor."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Buscando mensaxes cambiadas"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10493,25 +10940,25 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Non existe a mensaxe"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Recollendo información de resumo para as mensaxes novas"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Non foi posible atopar o corpo da mensaxe na resposta FETCH."
 
@@ -10556,23 +11003,6 @@ msgstr ""
 msgid "Command:"
 msgstr "_Compañía:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Cartafoles"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Amosar só os cartafoles subscritos"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Ignora-lo espacio de nomes de cartafoles proporcionado polo servidor"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Espacio de nomes"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplicar filtros ás mensaxes novas de INBOX neste servidor"
@@ -10595,89 +11025,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:424
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Servidor de SMTP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Servicio %s para %s en %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Non foi posible conectarse a %s (porto %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexión cancelada"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Non foi posible conectarse ó servidor POP.\n"
-"Erro enviando o nome de usuario: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Non introduciu un contrasinal."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10688,25 +11074,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Non existe o cartafol %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "O nome do cartafol non pode conter o carácter Return."
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10714,7 +11093,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Erro descoñecido: %s"
@@ -10822,58 +11201,58 @@ msgid ""
 msgstr ""
 "Para ler e armacenar correo local en ficheiros spool estándar de tipo mbox."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "A raíz de almacenamento %s non é unha ruta absoluta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "O raíz de armacenamento %s non é un directorio normal."
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Non é posible obter o cartafol: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Os armacenamentos locais non teñen un inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de correo %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Non foi posible borrar o ficheiro de resumo de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Non foi posible borrar o ficheiro de índice de cartafol `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10940,7 +11319,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11286,7 +11665,7 @@ 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:258
+#: 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
@@ -11296,8 +11675,8 @@ msgid "User cancelled"
 msgstr "Operación cancelada"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11308,49 +11687,49 @@ msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Erro ao autogardar a mensaxe: %s:\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Non pode copiar mensaxes deste cartafol de lixo."
@@ -11469,7 +11848,7 @@ msgstr "Non foi posible crear unha canalización: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Non foi posible recoller a mensaxe: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11523,8 +11902,8 @@ msgstr "Non existe a mensaxe con UID %s"
 msgid "Retrieving POP message %d"
 msgstr "Recibindo a mensaxe POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitación descoñecida"
@@ -11994,7 +12373,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
@@ -12039,6 +12418,98 @@ msgstr "Tipo MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Suxerir que se amose o anexo automaticamente"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Non se pode abrir a mensaxe"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Non foi posible recibir a mensaxe do editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mensaxe Sen Título)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Abrir ficheiro"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Gravar sinatura"
+
+#: 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.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 "Compoñer unha mensaxe"
+
+#: 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
+#, fuzzy
+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 ""
+"Non foi posible crear a fiestra do compositor, porque aínda\n"
+"non configurou ningunha identidade no compoñente de correo."
+
+#: composer/e-msg-composer.c:3279
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Non foi posible crear a fiestra do compositor, porque aínda\n"
+"non configurou ningunha identidade no compoñente de correo."
+
+#: 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
 #, fuzzy
 msgid "Posting destination"
@@ -12124,214 +12595,141 @@ msgstr "<prema aquí para seleccionar un cartafol>"
 msgid "Attach file(s)"
 msgstr "Anexar un ficheiro"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Asinar sempre as mensaxes saíntes cando se use esta conta"
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Non se pode enviar a mensaxe: non se definiron destinatarios."
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Non se pode abrir a mensaxe"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Non foi posible recibir a mensaxe do editor"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mensaxe Sen Título)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Abrir ficheiro"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2087
-#, fuzzy
-msgid "Signature:"
-msgstr "Gravar sinatura"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Compoñer unha mensaxe"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Anexar un ficheiro á mensaxe"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-#, fuzzy
-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: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 ""
-"Non foi posible crear a fiestra do compositor, porque aínda\n"
-"non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:3269
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Non foi posible crear a fiestra do compositor, porque aínda\n"
-"non configurou ningunha identidade no compoñente de correo."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+"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/mail-composer-errors.xml.in.h:2
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid "All accounts have been removed."
-msgstr "Cada conta ten que ter un nome diferente."
+msgid "Unfinished messages found"
+msgstr "Seguinte Mensaxe Sen Ler"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "¿Está seguro de que quere borrar esta cita sen título?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+msgid "Do you want to recover unfinished messages?"
+msgstr "¿Quere gardar os cambios?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Non foi posible crear unha canalización: %s"
+msgid "Don't Recover"
+msgstr "Non eliminar"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
+msgid "Recover"
+msgstr "Eliminar"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 "Non foi posible abrir o ficheiro de sinatura %s:\n"
 "%s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Imprimir tarxeta"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "¿Quere gardar os cambios?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Erro ao gardar os atallos."
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
-msgid "Don't Recover"
-msgstr "Non eliminar"
+msgid "Warning: Modified Message"
+msgstr "Mensaxe Remitida"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Erro ao gardar os atallos."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "¿Está seguro de que quere borrar esta cita sen título?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Eliminar"
+msgid "Discard Changes"
+msgstr "Imprimir tarxeta"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Gardar Mensaxe Como..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Non foi posible crear unha canalización: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Seguinte Mensaxe Sen Ler"
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-#, fuzzy
-msgid "Warning: Modified Message"
-msgstr "Mensaxe Remitida"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Anexar un ficheiro á mensaxe"
+msgid "All accounts have been removed."
+msgstr "Cada conta ten que ter un nome diferente."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12463,7 +12861,8 @@ msgstr ""
 "Xa existe un ficheiro con ese nome.\n"
 "¿Sobrescribilo?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "¿Sobrescribir ficheiro?"
 
@@ -12651,85 +13050,101 @@ msgstr "Seleccionar un Fuso Horario"
 msgid "_Filter Rules"
 msgstr "Regras de Filtrado"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Erro na expresión regular '%s':\n"
-"%s"
+msgid "Missing date."
+msgstr "Actualización da Xuntanza"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Oops. Esqueceu escoller unha data."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+msgid "Missing file name."
+msgstr "_Nome da lista:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Actualización da Xuntanza"
+msgid "You must specify a file name."
+msgstr "Nome do estilo:"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "_Nome da lista:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Resumindo cartafol"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Asignación"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "Nome do estilo:"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Non se seleccionou ningún servidor"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Erro na expresión regular '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Oops. Esqueceu escoller unha data."
+msgid "Missing name."
+msgstr "Asignación"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Cambiar o nome deste cartafol"
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Nome do estilo:"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "Nome do estilo:"
+msgid "No sources selected."
+msgstr "Non se seleccionou ningún servidor"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12743,69 +13158,11 @@ msgstr "Escolla unha Acción"
 msgid "<b>Then</b>"
 msgstr "<b>Descrición:</b> %s"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Seleccionar Cartafol"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Importante"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "To Do"
-msgstr "Togo"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Later"
-msgstr "despois"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Nome da regra: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Sen título"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Descrición:</b> %s"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Executar accións"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "se se cumpren tódolos criterios"
-
-#: filter/filter-rule.c:813
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "se se cumpre algún criterio"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "entrante"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "saínte"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12901,6 +13258,80 @@ 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
+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
+#, 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
+#, fuzzy
+msgid "Later"
+msgstr "despois"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Nome da regra: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Descrición:</b> %s"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "se se cumpren tódolos criterios"
+
+#: filter/filter-rule.c:854
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "se se cumpre algún criterio"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Executar accións"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegado"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Substituír"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Respondido a"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Incluír:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "entrante"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "saínte"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -13038,7 +13469,7 @@ msgstr "Marcada"
 msgid "Junk Test"
 msgstr "xuño"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -13079,7 +13510,7 @@ msgstr "Saír do programa"
 msgid "Play Sound"
 msgstr "Tocar un son:"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Ler"
 
@@ -13152,9 +13583,9 @@ msgstr "comeza por"
 msgid "Stop Processing"
 msgstr "Parar o Procesamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -13219,120 +13650,69 @@ msgstr "O asunto non contén"
 msgid "Virtual _Folders"
 msgstr "Cartafoles Virtuais"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Engadir"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "Fontes de CartafolV"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferencias da Axenda"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crear ou editar contas de correo e outras preferencias"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Compositor de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Fábrica para o compoñente de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Compoñente de resumo executivo do correo de Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Correo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Contas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferencias da Axenda"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 #, fuzzy
 msgid "[Default]"
 msgstr "Por de_fecto"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 #, fuzzy
 msgid "Account name"
 msgstr "Nome da Cont_a:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 #, fuzzy
 msgid "Protocol"
 msgstr "Porto Rico"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contacto Sen Nome"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 #, fuzzy
 msgid "Language(s)"
 msgstr "Idioma"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Borrar todo agás a sinatura"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Sinatura _HTML:"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Mensaxe Remitida"
+
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
+
+#: mail/em-folder-browser.c:129
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crear Cartafol _Virtual Dende Mensaxe"
@@ -13372,499 +13752,459 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especifica ónde crear o cartafol:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Previsualizar"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nome do cartafol:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "CartafolesV"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Entrada"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-#, fuzzy
-msgid "Loading..."
-msgstr "Agardando..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Comprobar as novas mensaxes en tódolos cartafoles"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Mover"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancelar Tarefa"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar cartafol"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copiar"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Crear un novo cartafol"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Renomea-lo cartafol '%s'"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Vista"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Abrir nunha Nova Fiestra"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Mover"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Novo Cartafol"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "CartafolesV"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Entrada"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+#, fuzzy
+msgid "Loading..."
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar coma unha Nova Mensaxe"
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Responder ó Autor"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder á _Lista"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _Todos"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Remitir"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Completada"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Limpar"
 
-#: mail/em-folder-view.c:787 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 "Marcar como _Lida"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marcar coma Non Im_portante"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marcar como _Non Lida"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marcar coma _Importante"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 #, fuzzy
 msgid "U_ndelete"
 msgstr "_Recuperar"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "_Mover ó Cartafol.."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar a un Cartafol..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Engadir o Autor ao Libro de Enderezos"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplicar Filtros"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Regras de Filtrado"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crear Reg_ra Dende Mensaxe"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "CartafolV polo A_sunto"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "CartafolV polo Au_tor"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "CartafolV polos _Destinatarios"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "CartafolV pola _Lista de Correo"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "CartafolV polo Au_tor"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrar polo As_unto"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrar polo Au_tor"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrar polos D_estinatarios"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrar pola Lista de _Correo"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtrar polo Au_tor"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default"
 msgstr "Por de_fecto"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Imprimir Mensaxe"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiar Localización da Ligazón"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Prema para engadir unha tarefa"
 
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Prema para engadir unha tarefa"
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Aparicións:"
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Asignada"
+#: 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 "De"
 
-#: mail/em-format-html-display.c:646
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
-"autenticidade"
+#: 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 "Responder-A"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Engadir criterio"
+#: 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 "Para"
 
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
-"autenticidade"
+#: 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-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Engadir criterio"
+msgid "Bcc"
+msgstr "Bcc:"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-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-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s anexo"
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Indefinida"
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-#, fuzzy
-msgid "Encrypted, weak"
-msgstr "Mensaxe cifrada"
-
-#: mail/em-format-html-display.c:656
-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.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Encrypted"
-msgstr "Cifrar con PGP"
+msgid "Unsupported signature format"
+msgstr "O usuario cancelou a operación."
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Mensaxe cifrada"
+msgid "Unknown error verifying signature"
+msgstr "Non se puido verifica-los certificados."
 
-#: mail/em-format-html-display.c:658
-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.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Recibindo a mensaxe %s"
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
-msgid "_View Certificate"
-msgstr "ID do certificado:"
+msgid "Unsigned"
+msgstr "Asignada"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Esta mensaxe non está dispoñible actualmente."
+msgid "Valid signature"
+msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "O %d de %B ás %k:%M"
+msgid "Invalid signature"
+msgstr "Engadir criterio"
 
-#: mail/em-format-html-display.c:1010
-#, fuzzy
-msgid "Overdue:"
-msgstr "Tarefas _retrasadas:"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "O %d de %B ás %k:%M"
+msgid "Unencrypted"
+msgstr "Indefinida"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 #, fuzzy
-msgid "_View Inline"
-msgstr "Ver Inline"
+msgid "Encrypted, weak"
+msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
-msgid "_Hide"
-msgstr "Agochar"
-
-#: mail/em-format-html-print.c:125
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Recibindo a mensaxe %d de %d"
+msgid "Encrypted"
+msgstr "Cifrar con PGP"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Recibindo a mensaxe %s"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Mensaxe cifrada"
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte external-body mal formada."
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Punteiro a sitio FTP (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Punteiro a ficheiro local (%s) válido no sitio \"%s\""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Punteiro a ficheiro local (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Punteiro a datos remotos (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Punteiro a datos externos descoñecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiando as mensaxes"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "De"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Responder-A"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Para"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-#, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13872,82 +14212,146 @@ msgstr ""
 "Cliente de Correo: "
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Aparicións:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s anexo"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format-html-display.c:645
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
+"autenticidade"
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Non se puido procesar a mensaxe MIME. Mostrando como fonte."
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format.c:1339
+#: 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."
+msgstr ""
+
+#: mail/em-format-html-display.c:653
+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."
+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."
+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 ""
+
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "O usuario cancelou a operación."
+msgid "_View Certificate"
+msgstr "ID do certificado:"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Non se puido verifica-los certificados."
+msgid "This certificate is not viewable"
+msgstr "Esta mensaxe non está dispoñible actualmente."
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Non se puido verifica-los certificados."
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "O %d de %B ás %k:%M"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "Overdue:"
+msgstr "Tarefas _retrasadas:"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "O %d de %B ás %k:%M"
+
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "Ver Inline"
+
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "Agochar"
+
+#: mail/em-format-html-print.c:126
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Recibindo a mensaxe %d de %d"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Cada"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Un día"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Unha sema_na"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Un m_es"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13955,26 +14359,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Non se puido descodifica-la mensaxe."
+msgid "Unable to create new folder `%s': %s"
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Non se puido descodifica-la mensaxe."
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Non é posible desprazarse no ficheiro: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Non se puido descodifica-la mensaxe."
 
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Gardar Como..."
@@ -13984,100 +14418,84 @@ msgstr "Gardar Como..."
 msgid "untitled_image.%s"
 msgstr "Mensaxes Sen Título"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fondo:"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Responder ó autor"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Abrir Ligazón no Navegador"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Enviar unha _mensaxe á lista..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Engadir Libro de Enderezos"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Abrir en %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "A resposta do servidor IMAP non contiña información sobre %s"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Subscribir"
 
-#: mail/em-subscribe-editor.c:637 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 "Cartafol"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Seleccione un servidor."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Non se seleccionou ningún servidor"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Non amosar esta mensaxe outra vez"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Mensaxe Remitida"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "O %a, %Y-%m-%d ás %H:%M, %%s escribiu:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Mensaxe"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Gardar Mensaxe Como..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "_Enderezo:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mensaxe de %s"
@@ -14097,11 +14515,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -14215,167 +14633,168 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Contas"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Contas"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Rexistrar as accións do filtro a:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "_Prioridade:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configuración do Correo"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "Avisar cando se envíen mensaxes cun asunto baleiro"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Avisar cando se envíen mensaxes con só destinatarios _Bcc definidos"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14429,8 +14848,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "_Prioridade:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14573,37 +14993,72 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Compositor de correo de Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Compositor de correo de Evolution."
+msgid "Composer Preferences"
+msgstr "Preferencias da Axenda"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Configure your email accounts here"
+msgstr "Crear ou editar contas de correo e outras preferencias"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Compositor de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Fábrica para o compoñente de correo de Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Compoñente de resumo executivo do correo de Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Contas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferencias da Axenda"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Correo"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14611,15 +15066,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Agarde, por favor"
 
@@ -14651,19 +15106,51 @@ msgid "Select folder to import into"
 msgstr "Seleccionar Cartafol"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importando"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importando"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compositor de correo de Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Examinando %s"
@@ -14673,7 +15160,7 @@ msgstr "Examinando %s"
 msgid "Priority Filter \"%s\""
 msgstr "_Prioridade:"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14688,7 +15175,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14696,7 +15183,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14705,25 +15192,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution está importando os datos antigos de Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Importando Datos"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Opcións"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editar Filtros"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14759,130 +15246,141 @@ msgid "Pine"
 msgstr "Imprimir"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de Contas de Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Servidor:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "Nome de _Usuario:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Ruta:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Mensaxe para %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "O asunto é %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mensaxe de %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "lista de correo %s"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Respondido a"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Engadir Regra de Filtrado"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d seleccionada(s)"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Borrador"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d sen enviar"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d seleccionada(s)"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova Mensaxe de Correo"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Enviar _Mensaxe"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compoñer unha mensaxe"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Novo CartafolV"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editar Filtros"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Crear unha nova mensaxe"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "O URI que ha amosar a axenda"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Comprobando Servicio"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectando ao servidor..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identidade"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14893,13 +15391,13 @@ msgstr ""
 "de embaixo non precisan que se enchan,\n"
 "a menos que queira incluír esta información no correo que envíe."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Recepción de Correo"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14909,16 +15407,16 @@ msgstr ""
 "non está seguro, pregunte\n"
 "ao seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Escolla unha das seguintes opcións"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Enviando Correo"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14928,11 +15426,11 @@ msgstr ""
 "está seguro, pregunte ao\n"
 "seu administrador de sistemas ou fornecedor de acceso a Internet."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Xestión de Contas"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14949,14 +15447,6 @@ msgstr ""
 "embaixo.\n"
 "Este nome só se emprega para amosalo."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Comprobando Servicio"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Conectando ao servidor..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -15282,7 +15772,7 @@ msgstr "Executar accións"
 
 #: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "remata en"
 
 #: mail/mail-config.glade.h:82
@@ -15625,345 +16115,459 @@ msgstr " cor"
 msgid "description"
 msgstr "descrición"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autenticación"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requirida"
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "¿Está seguro de que quere borrar esta conta?"
+#. 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-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "¿Está seguro de que quere re-enviar as %d mensaxes?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
+msgid "_Send"
+msgstr "Enviar"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "¿Está seguro de que quere re-enviar as %d mensaxes?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Non é posible obter o cartafol: %s: %s"
+msgid "Use default drafts folder?"
+msgstr "Abrindo cartafol %s"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Non é posible obter o cartafol: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Incapaz de abrir o cartafol de borradores para esta conta.\n"
+"¿Gostaríalle usar o cartafol de borradores por defecto?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Non foi posible crear o directorio temporal: %s"
+msgid "Use _Default"
+msgstr "Por de_fecto"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Non se pode crear o directorio\n"
-"%s\n"
-"Erro: %s"
+"¿Está seguro de que quere abrir todas as %d mensaxes en fiestras separadas?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
+msgid "_Expunge"
+msgstr "_Limpar"
+
+#. 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 ""
-"Non foi posible borrar o cartafol:\n"
-"%s"
+"Eliminar tódalas mensaxes borradas en tódolos cartafoles de xeito permanente"
 
-#: mail/mail-errors.xml.in.h:19
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "O cartafol `%s' non existe."
+msgid "_Empty Trash"
+msgstr "Baleirar _Lixo"
+
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:20
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgid "Error while {0}."
 msgstr ""
-"Non foi posible borrar o cartafol:\n"
+"Erro durante '%s':\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Non foi posible renomear o cartafol: %s"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Non foi posible renomear o cartafol: %s"
+msgid "Error while performing operation."
+msgstr ""
+"Erro ao efectuar a operación:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Non se pode abrir a mensaxe"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Non foi posible renomear o cartafol %s a %s: %s"
+msgid "Enter password."
+msgstr "Contrasinal"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Erro ao cargar a información do filtro:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Non foi posible crear o directorio %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Non é posible obter a mensaxe: %s\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Borrar todo agás a sinatura"
-
-#: mail/mail-errors.xml.in.h:30
-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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
-"Non foi posible abrir o ficheiro de sinatura %s:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Eliminar"
+"Non se pode crear o directorio\n"
+"%s\n"
+"Erro: %s"
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "¿Borrar esta conta de verdade?"
+msgid "Cannot create temporary save directory."
+msgstr "Non foi posible crear o directorio temporal: %s"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "¿Quere gardar os cambios?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Non borrar"
+msgid "File exists but cannot overwrite it."
+msgstr "O ficheiro existe, ¿sobrescribir?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Contrasinal"
+msgid "File exists but is not a regular file."
+msgstr "O spool `%s' non existe ou non é un ficheiro normal"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Erro ao cargar a información do filtro:\n"
+"Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
-"Erro ao efectuar a operación:\n"
+"Non foi posible borrar o cartafol:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Erro durante '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "O ficheiro existe, ¿sobrescribir?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Non foi posible renomear o cartafol %s a %s: %s"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "O spool `%s' non existe ou non é un ficheiro normal"
+msgid "Delete \"{0}\"?"
+msgstr "Eliminar"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Elimina-lo cartafol '%s'"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autenticación"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr ""
+"Non foi posible borrar o cartafol:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:48
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Actualizar automaticamente"
+msgid "Cannot open source \"{2}\"."
+msgstr "Non foi posible renomear o cartafol: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Non se pode abrir a mensaxe"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Non é posible obter o cartafol: %s: %s"
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Non é posible obter o cartafol: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Elimina-lo cartafol '%s'"
+msgid "Cannot open source \"{1}\""
+msgstr "Non foi posible renomear o cartafol: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Non encheu toda a información requirida."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Non pode crear dúas contas co mesmo nome"
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "¿Borrar esta conta de verdade?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "¿Está seguro de que quere borrar esta conta?"
+
+#. 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-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Non borrar"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
 msgstr ""
+"Non foi posible abrir o ficheiro de sinatura %s:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Borrar todo agás a sinatura"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "O servidor SMTP %s non soporta o tipo de autenticación %s requirida"
+msgid "Do you wish to save your changes?"
+msgstr "¿Quere gardar os cambios?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15971,86 +16575,89 @@ msgstr ""
 "\n"
 "¿Desexa gardar os cambios?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
-"Incapaz de abrir o cartafol de borradores para esta conta.\n"
-"¿Gostaríalle usar o cartafol de borradores por defecto?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Por de_fecto"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Abrindo cartafol %s"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Non encheu toda a información requirida."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Non pode crear dúas contas co mesmo nome"
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "O cartafol `%s' non existe."
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Baleirar _Lixo"
-
-#: mail/mail-errors.xml.in.h:73
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Limpar"
+msgid "vFolders automatically updated."
+msgstr "Actualizar automaticamente"
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Enviar"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
 #, fuzzy
-msgid "vFolders automatically updated."
+msgid "Mail filters automatically updated."
 msgstr "Actualizar automaticamente"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. 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-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "¿Sobrescribir ficheiro?"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Abrir"
+
+#: mail/mail-folder-cache.c:787
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Examinando %s"
@@ -16059,135 +16666,135 @@ msgstr "Examinando %s"
 msgid "Working"
 msgstr "Traballando"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrando o Cartafol"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Recibindo Correo"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Enviando a mensaxe %d de %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Non se puido descodifica-la mensaxe."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Completado."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Gardando a mensaxe no cartafol"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Movendo mensaxes a %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiando as mensaxes a %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Mensaxes remitidas"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Abrindo armacenamento %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Eliminando o cartafol %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Refrescando o cartafol"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Limpando o cartafol"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importando %s coma %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Cartafoles Locais"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Recibindo a mensaxe %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16196,7 +16803,7 @@ msgstr ""
 "Non foi posible crear o ficheiro de saída: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16205,11 +16812,11 @@ msgstr ""
 "Erro ao gardar as mensaxes en: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Gardando anexo"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16218,17 +16825,17 @@ msgstr ""
 "Non é posible crear ficheiro de saída: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Non foi posible escribir os datos: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Desconectando de %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Desconectando de %s"
@@ -16295,25 +16902,25 @@ msgstr "Actualizando..."
 msgid "Waiting..."
 msgstr "Agardando..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "O usuario cancelou a operación."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduza o seu contrasinal para %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "Enter Password"
 msgstr "Contrasinal"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Lembrar este contrasinal"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16357,91 +16964,96 @@ msgstr "Mensaxe remitida"
 msgid "Invalid folder: `%s'"
 msgstr "Abrindo cartafol %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creando o cartafol %s"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:235
 #, fuzzy, c-format
-msgid "Updating vfolders for uri: %s"
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Examinando os cartafoles en \"%s\""
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Examinando os cartafoles en \"%s\""
+
+#: mail/mail-vfolder.c:959
 #, fuzzy
 msgid "vFolders"
 msgstr "Cartafoles"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editar CartafolesV"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Novo CartafolV"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Non vista"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Vista"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Múltiples Mensaxes Non Vistas"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Múltiples Mensaxes"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "A máis baixa"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Máis baixa"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Máis alta"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "A máis alta"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Hoxe ás %k:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Onte ás %k:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "O %A ás %k:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "O %d de %B ás %k:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d de %B de %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Xerando a lista de mensaxes"
 
@@ -16476,47 +17088,47 @@ msgstr "Recibido"
 msgid "Size"
 msgstr "Tamaño"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 #, fuzzy
 msgid "Call"
 msgstr "Resposta"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Adiante"
 
-#: 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
 #, fuzzy
 msgid "For Your Information"
 msgstr "Información da Fonte"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Remitir"
 
-#: 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:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Responder"
 
-#: mail/message-tag-followup.c:70 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 "Responder a Todos"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 #, fuzzy
 msgid "Review"
 msgstr "Previsualizar"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16564,21 +17176,6 @@ msgstr "_Subscribir"
 msgid "_Unsubscribe"
 msgstr "_Desubscribir"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "O shell de Evolution."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Compositor de correo de Evolution."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16586,110 +17183,54 @@ msgstr "389"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Renomear este grupo de atallos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Trocar a mostra da barra de cartafoles"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Agochar a barra de atallos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "_Prioridade:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "_Prioridade:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Interface de configuración do correo"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Abrindo cartafol %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Trocar a mostra da barra de cartafoles"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Trocar a mostra da barra de atallos"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Correo Electrónico"
@@ -16698,6 +17239,32 @@ msgstr "Correo Electrónico"
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d de %b"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Erro descoñecido"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Argumentos non válidos"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Non se pode rexistrar en OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Non se atopou a Base de Datos de configuracións"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Erro xenérico"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Sen_título)"
@@ -16838,11 +17405,11 @@ msgstr "Non se puido descodifica-la mensaxe."
 msgid "_Import"
 msgstr "Importar"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Pechando as conexións..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolution"
@@ -16882,11 +17449,31 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution está desconectándose"
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mensaxe para %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar o filtro: %s: %s"
@@ -16902,7 +17489,7 @@ msgstr "Non foi posible executar o Bug buddy."
 
 #: shell/e-shell-window-commands.c:171
 #, fuzzy
-msgid "About Ximian Evolution"
+msgid "About Evolution"
 msgstr "Acerca de Evolution..."
 
 #: shell/e-shell-window-commands.c:382
@@ -16910,7 +17497,7 @@ msgstr "Acerca de Evolution..."
 msgid "_Work Online"
 msgstr "Traballar Conectado"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Traballar Desconectado"
 
@@ -16918,47 +17505,6 @@ msgstr "_Traballar Desconectado"
 msgid "Work Offline"
 msgstr "Traballar Desconectado"
 
-#: shell/e-shell-window.c:338
-#, fuzzy
-msgid ""
-"Ximian 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:345
-#, fuzzy
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Evolution está desconectándose"
-
-#: shell/e-shell-window.c:351
-#, fuzzy
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution está desconectado. Prema neste botón para conectar."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Argumentos non válidos"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Non se pode rexistrar en OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Non se atopou a Base de Datos de configuracións"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Erro xenérico"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -17023,6 +17569,51 @@ msgstr "Conexións activas"
 msgid "Click OK to close these connections and go offline"
 msgstr "Prema en Aceptar para pechar estas conexións e desconectar"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Axenda"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Co_ntactos:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Correo"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Tarefas"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Tipo do cartafol:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Crear un _Novo Cartafol..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Conta"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nome do cartafol:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "Nome de _Usuario:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -17058,6 +17649,21 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "O shell de Evolution."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Compositor de correo de Evolution."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Prema en \"Importar\" para comezar a importar o ficheiro a Evolution. "
@@ -17124,13 +17730,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar datos dos seguintes ficheiros:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -17156,75 +17762,131 @@ msgstr ""
 "Esperamos que desfrute do resultado do noso duro traballo, e\n"
 "agardamos con impaciencia polas súas colaboracións.\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Graciñas\n"
 "O Equipo de Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Non preguntar de novo"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Non se pode acceder ao shell de Evolution."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Non se pode inicializar o shell de Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "Comezando a importación"
 
-#: shell/main.c:501
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in online mode"
 msgstr "Iniciando os Importadores Intelixentes"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída da depuración de todos os compoñentes a un ficheiro."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "C_ontén:"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Non se pode acceder ao shell de Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Asistente de Contas de Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID do certificado:"
@@ -17477,12 +18139,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID do certificado:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "O ID da Tarxeta xa existe"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17704,6 +18360,12 @@ msgstr "O asunto é %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "O ID da Tarxeta xa existe"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17748,12 +18410,12 @@ msgstr "Borrar esta mensaxe"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Non foi posible renomear o cartafol: %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17821,7 +18483,8 @@ msgid "Select all contacts"
 msgstr "Seleccionar tódolos contactos"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Enviar unha mensaxe aos contactos seleccionados."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17854,8 +18517,8 @@ msgstr "a hora actual"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Accións"
@@ -17873,7 +18536,8 @@ msgid "_Preview Pane"
 msgstr "_Panel de Previsualización"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Gardar coma VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18009,11 +18673,21 @@ msgstr "a hora actual"
 msgid "Week"
 msgstr "Semana"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Semana Laboral"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "Cita"
 
+#: 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 "P_echar"
+
 #: 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
@@ -18349,6 +19023,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Pechar"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18607,7 +19291,8 @@ msgid "Open the selected message in a new window"
 msgstr "Abrir a mensaxe seleccionada nunha nova fiestra"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Abri-la mensaxe seleccionada no compositor para re-enviala"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18731,65 +19416,52 @@ msgstr "CartafolV polo A_sunto"
 msgid "_Attached"
 msgstr "Anexar"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copiar ó Cartafol"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crear Filtro Dende Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Go To"
 msgstr "Ir A"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Inline"
 msgstr "Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Larger"
 msgstr "Buscapersoas"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Visualización das _Mensaxes"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Mover ó Cartafol"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 #, fuzzy
 msgid "_Next Message"
 msgstr "Seguinte Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Visualización _Normal"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Abrir Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Anterior Mensaxe"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 #, fuzzy
 msgid "_Quoted"
 msgstr "Citado"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Resend..."
-msgstr "_Renomear..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Ferramentas"
@@ -18798,16 +19470,6 @@ msgstr "_Ferramentas"
 msgid "_Undelete"
 msgstr "_Recuperar"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Pechar"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Anexar"
@@ -19224,6 +19886,11 @@ msgstr "Preferencias da Axenda"
 msgid "_Send / Receive"
 msgstr "_Enviar / Recibir"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Buscar Agora"
+
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -19303,11 +19970,6 @@ msgstr "_Data Límite"
 msgid "With _Status"
 msgstr "Establecer Estado"
 
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "_Tarefa"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19473,6 +20135,35 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Información da Xuntanza"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Compositor de correo de Evolution."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Mensaxes Enviadas e Borradores"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19598,6 +20289,35 @@ msgstr "Proba"
 msgid "Find _Now"
 msgstr "Buscar Agora"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 xa existe\n"
+"¿Quere sobrescribilo?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Non é posible obter a mensaxe: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19609,8 +20329,140 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completa)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Libro de Enderezos"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Visor de minitarxetas do Libro de Enderezos de Evolution"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Enderezo _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "para sempre"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Visor da axenda iTip/iMip de Evolution"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Editor de Novas de Evolution"
+
+#~ msgid "Snoo_ze"
+#~ msgstr "A_diar"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Non foi posible inicializar gnome-vfs"
+
+#, fuzzy
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Non foi posible abrir o cartafol en `%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "O URI que ha amosar a axenda"
+
+#~ msgid "Display a message"
+#~ msgstr "Amosar unha mensaxe"
+
+#, fuzzy
+#~ msgid "Alerts"
+#~ msgstr "Alarmas"
+
+#~ msgid "Time"
+#~ msgstr "Hora"
+
+#~ msgid "_General"
+#~ msgstr "_Xeral"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Seleccionar Cartafol"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Axenda"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Lista de _Tarefas"
+
+#, fuzzy
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "¡Non se puido envia-lo elemento!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "O URI do cartafol de tarefas a amosar"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Non foi posible cargar as tarefas en `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Compoñente de mostra de cartafoles de correo de Evolution."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "CartafolV polo Au_tor"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrar polo Au_tor"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Non se puido descodifica-la mensaxe."
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Non se puido descodifica-la mensaxe."
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Non se puido descodifica-la mensaxe."
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "O URI que ha amosar a axenda"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Renomear este grupo de atallos"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Agochar a barra de atallos"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Abrindo cartafol %s"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Trocar a mostra da barra de cartafoles"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Trocar a mostra da barra de atallos"
+
+#, fuzzy
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Non se pode inicializar o shell de Evolution: %s"
+
+#, fuzzy
+#~ msgid "_Resend..."
+#~ msgstr "_Renomear..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19690,9 +20542,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Cónxuxe:"
 
-#~ msgid "_Add"
-#~ msgstr "_Engadir"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "_Traballo"
@@ -19745,18 +20594,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Task List Creation Assistant"
 #~ msgstr "Fontes do Libro de Enderezos"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Data de _Inicio:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Data Límite"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioridade:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19787,14 +20624,6 @@ msgstr "%s (%d%% completa)"
 #~ "Non foi posible trunca-lo ficheiro: %s\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Non é posible desprazarse no ficheiro: %s\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19932,10 +20761,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Previsualiza a axenda que se vai imprimir"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Introduza o seu contrasinal para %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Lista de _Tarefas"
 
@@ -20008,38 +20833,6 @@ msgstr "%s (%d%% completa)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "C_alendar:"
-#~ msgstr "Axenda"
-
-#, fuzzy
-#~ msgid "_Mail:"
-#~ msgstr "_Correo"
-
-#, fuzzy
-#~ msgid "_Tasks:"
-#~ msgstr "Tarefas"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Tipo do cartafol:"
-
-#, fuzzy
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Crear un _Novo Cartafol..."
-
-#, fuzzy
-#~ msgid "_Account:"
-#~ msgstr "Conta"
-
-#, fuzzy
-#~ msgid "_Folder Name:"
-#~ msgstr "Nome do cartafol:"
-
-#, fuzzy
-#~ msgid "_User:"
-#~ msgstr "Nome de _Usuario:"
-
-#, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Crear unha nova tarefa"
 
@@ -20393,9 +21186,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Asistente"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "As seguintes conexións están activas nestes intres:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Buscar Contactos"
 
@@ -20647,10 +21437,6 @@ msgstr "%s (%d%% completa)"
 #~ "Esta mensaxe está asinada dixitalmente pero non se puido comprobar a súa "
 #~ "autenticidade"
 
-#, fuzzy
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20761,18 +21547,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "información de axenda"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Recordatorios"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Descrición:</b> %s"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "información de axenda"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Clasificación"
 
@@ -21839,10 +22613,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Cartafol que contén o Resumo de Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Compositor de correo de Evolution."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Compositor de correo de Evolution."
 
@@ -22139,10 +22909,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Austria"
 
 #, fuzzy
-#~ msgid "Aspen"
-#~ msgstr "Abrir"
-
-#, fuzzy
 #~ msgid "Asswan"
 #~ msgstr "Asistente"
 
@@ -22811,10 +23577,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Congo"
 
 #, fuzzy
-#~ msgid "Constantine"
-#~ msgstr "C_ontén:"
-
-#, fuzzy
 #~ msgid "Cordoba"
 #~ msgstr "Colombia"
 
@@ -22867,10 +23629,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Pregunta"
 
 #, fuzzy
-#~ msgid "Crestview"
-#~ msgstr "Previsualizar"
-
-#, fuzzy
 #~ msgid "Crotone"
 #~ msgstr "Camerún"
 
@@ -24474,10 +25232,6 @@ msgstr "%s (%d%% completa)"
 #~ msgstr "Normal"
 
 #, fuzzy
-#~ msgid "Nome"
-#~ msgstr "Nome:"
-
-#, fuzzy
 #~ msgid "Norfolk"
 #~ msgstr "Illa Norfolk"
 
@@ -26118,9 +26872,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Shown"
 #~ msgstr "Chuvieira"
 
-#~ msgid "No tasks"
-#~ msgstr "Non hai tarefas"
-
 #, fuzzy
 #~ msgid "(No Description)"
 #~ msgstr "Descrición:"
@@ -27207,9 +27958,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Delete news feed"
 #~ msgstr "Tódalas _fontes de novas:"
 
-#~ msgid "_Mail"
-#~ msgstr "_Correo"
-
 #~ msgid "_Weather"
 #~ msgstr "_Tempo"
 
@@ -28426,9 +29174,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Non foi posible abrir o directorio para o servidor de novas: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Non foi posible abrir ou crear o ficheiro .newsrc para %s: %s"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Non foi posible comprobar se hai mensaxes novas no servidor POP: %s"
 
@@ -28840,9 +29585,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Recordatorio da cita en "
 
-#~ msgid "Snooze"
-#~ msgstr "Adiar"
-
 #~ msgid ""
 #~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
 #~ "to know."
@@ -29522,9 +30264,6 @@ msgstr "%s (%d%% completa)"
 #~ msgid "Redo the undone action"
 #~ msgstr "Refacer a acción desfeita"
 
-#~ msgid "Replace"
-#~ msgstr "Substituír"
-
 #~ msgid "Replace a string"
 #~ msgstr "Substituír unha cadea"
 
diff --git a/po/hr.po b/po/hr.po
index 714c824183..e7f4320e8b 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-03-29 00:45+CEST\n"
 "Last-Translator: auto\n"
 "Language-Team: Croatian <lokalizacija@linux.hr>\n"
@@ -21,6 +21,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr ""
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -41,14 +49,6 @@ msgstr ""
 msgid " card"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Uobičajena adresa za sinhroniziranje:"
@@ -63,63 +63,20 @@ msgstr "Ne mogu učitati adresar"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao pročitati programski blok adresa pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Automatsko dovršavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Potvrde"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Ovdje podesite automatsko nadopunjavanje"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Iskačući prozor za adrese Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Dio Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Preglednik direktorija Evolution adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime kontrola za upravljanje certifikatima"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola podešavanja postavki Evolucija direktorija"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Neuspjela prijava.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Upravljanje vašim S/Mime certifikatima"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sUnesite zaporku za %s (korisnik %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -160,41 +117,45 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Unesi novi kontakt"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migriranje..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migriram `%s':"
@@ -202,8 +163,8 @@ msgstr "Migriram `%s':"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Na ovom računalu"
 
@@ -211,7 +172,7 @@ msgstr "Na ovom računalu"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Osobni podaci"
@@ -277,20 +238,41 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupam LDAP serveru"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Neuspjela prijava.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sUnesite zaporku za %s (korisnik %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -312,6 +294,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI mape koja je zadnja korištena u dijalogu za izbor imena"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automatsko dovršavanje"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Potvrde"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Ovdje podesite automatsko nadopunjavanje"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adresar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Iskačući prozor za adrese Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Preglednik adresa Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Preglednik Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Dio Evolution adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime kontrola za upravljanje certifikatima"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola podešavanja postavki Evolucija direktorija"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -333,6 +370,7 @@ msgstr " P_rikaži podržane baze "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -404,7 +442,7 @@ msgstr "_Kontakti:"
 msgid "Address Book Properties"
 msgstr "Postavke knjige adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Uvijek"
@@ -419,106 +457,96 @@ msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "boja"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Povezivanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Općenito"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jedan"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Odabir boje"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Ops_eg pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Ops_eg pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Pretraživanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -528,7 +556,7 @@ msgstr ""
 "akoi\n"
 "on podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -544,7 +572,7 @@ msgstr ""
 "onda nema potrebe da Evolution koristi SSL/TLS jer je vaša veza već\n"
 "sigurna."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -556,19 +584,19 @@ msgstr ""
 "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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -579,7 +607,7 @@ msgstr ""
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korijena stabla "
 "direktorija."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -593,13 +621,13 @@ msgstr ""
 "\"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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -608,7 +636,7 @@ msgstr ""
 "Najveći broj unosa za preuzimanje. Ako unesete preveliki \n"
 "broj, vaš će se adresar usporiti."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -617,7 +645,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -626,7 +654,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -637,127 +665,134 @@ msgstr ""
 "Ponuđen je popis standardnih portova. Pitajte svog administratora\n"
 "koji port da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Oblik vremena:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Koristim adresu elektronske pošte"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Poštanska adresa"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Metoda _prijave: "
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Broj _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Ime poslužitelja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Poslužitelj:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Odziv (minute):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "tab za vezu"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "tab za opće podatke"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minute"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "tab za pretragu"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Alat za odabir imena Evolution adresara"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Ukloni sve"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Ukloni"
 
+#: 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 "Ime"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Ukloni sve"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Pogledaj kontakt popis"
@@ -780,22 +815,15 @@ msgstr "Dodaj kontaktima"
 msgid "Unnamed Contact"
 msgstr "&Novi kontakt"
 
-#: 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
-msgid "Name"
-msgstr "Ime"
-
 #: 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
 msgid "Source"
 msgstr "Izvor"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Alat za odabir imena Evolution adresara"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -862,141 +890,141 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "_Adresa 2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "God_išnjica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Pomoćnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Rođendan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Grad:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Naredba:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Sva polja"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Država:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "O_djel:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL za s_lobodan/zauzet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Pu_no ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Polazno"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adresa e-pošte"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravitelj"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Bilješke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Ostalo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Poštanski broj:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1024,9 +1052,9 @@ msgstr "Internet 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Posao"
@@ -1059,23 +1087,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ove kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Sigurni ste da želite\n"
+"obrisati ovaj kontakt?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Može se uređivati"
 
@@ -2047,91 +2091,109 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Servis"
-
-#: 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
-msgid "Location"
-msgstr "Lokacija"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Korisničko ime"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Izvorišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Odredišna knjiga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Upisna polja"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Promijenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada sljedećim kategorijama:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Sljedeće veze su trenutno aktivne:"
+
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Servis"
+
+#: 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
+msgid "Location"
+msgstr "Lokacija"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Korisničko ime"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
@@ -2149,22 +2211,6 @@ msgstr "_Puno ime:"
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ove kontakte?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Sigurni ste da želite\n"
-"obrisati ovaj kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_Adresa 2:"
@@ -2310,8 +2356,8 @@ msgstr "urednik-kontakt-liste"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knjiga"
 
@@ -2372,6 +2418,433 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(map)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "karta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Popis članova"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizacija"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Položaj"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Video savjetovanje"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "posao"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "osobno"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Bilješka"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Poslovna titula"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Početna stranica"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Uspjeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Arhiva nije na mreži"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Adresar ne postoji"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Pristup odbijen"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kontakt nije nađen"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Identifikator kontakta već postoji"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protokol nije podržan"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Otkazano"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ne mogu otvoriti izvor"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Provjera vjerodostojnosti neuspješna"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Zahtijev za autentifikaciju obavezan"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Nema takve poruke"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Druga greška"
+
+#: 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 ""
+"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
+"dozvole pristupiti joj."
+
+#: 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 ""
+"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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Više karti odgovara upitu koji je ili server tako  \n"
+"podešen vratio ili je Evolution tako podešen da pokaže.\n"
+"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
+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 ""
+"Vrijeme za izvršavanje ovog upita prekoračuje ograničenje poslužitelja ili\n"
+"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije "
+"postavite \n"
+"upit ili povećajte vremensko ograničenje u postavkama poslužitelja "
+"direktorija\n"
+"za ovaj adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Greška prilikom dodavanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Greška kod izmjene popisa"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Greška prilikom mijenjanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Greška pri uklanjanju kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s već postoji\n"
+"Želite li  prepisati preko njega?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "popis"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Premjesti kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Kopiraj kontakt u "
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Premjesti kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Kopiraj kontakte u "
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Odaberite odredišni adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Višestruke VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard za %s"
+
+#.
+#. * 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 "(niti jedan) "
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Glavna email adresa\r"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Odaberi akciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Unesi novi kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Pretražujem adresar..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Promjeni podatke o kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Spoji elektronske adrese"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, 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
+msgid "Show Full VCard"
+msgstr "Prikaži potpun VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Prikaži kompaktan VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Spremi u adresaru"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nema kontakata"
@@ -2386,8 +2859,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Upit"
 
@@ -2441,9 +2914,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Spremi kao VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2508,7 +2982,7 @@ msgid "Cut"
 msgstr "Izreži"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2519,18 +2993,8 @@ msgstr "Kopiraj"
 msgid "Paste"
 msgstr "Umetni"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Obriši"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Trenutačni pogled"
 
@@ -2547,7 +3011,7 @@ msgstr ""
 "koristite"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2588,21 +3052,6 @@ msgstr "Kategorije"
 msgid "Company Phone"
 msgstr "Telefon poduzeća"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Obiteljsko ime"
@@ -2639,29 +3088,14 @@ msgstr "Dnevnik"
 msgid "Manager"
 msgstr "Upravitelj"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Bilješka"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ured"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizacija"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -2713,21 +3147,29 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Web-lokacija"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Širina"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Visina"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Sadrži Fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Odabrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Sadrži Pokazivač"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
@@ -2744,10 +3186,6 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Širina stupca"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2776,407 +3214,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Kartica"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Odabrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Sadrži Pokazivač"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(map)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "karta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Popis članova"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Položaj"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Grupa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Video savjetovanje"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "posao"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "osobno"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Poslovna titula"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Početna stranica"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Uspjeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Arhiva nije na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Pristup odbijen"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kontakt nije nađen"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Identifikator kontakta već postoji"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol nije podržan"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Otkazano"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Ne mogu otvoriti izvor"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Provjera vjerodostojnosti neuspješna"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Zahtijev za autentifikaciju obavezan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nema takve poruke"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Druga greška"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Ne mogu otvoriti adresar. Molim provjerite postoji li putanja i imate li "
-"dozvole pristupiti joj."
-
-#: 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 LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Ne mogu otvoriti adresar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Više karti odgovara upitu koji je ili server tako  \n"
-"podešen vratio ili je Evolution tako podešen da pokaže.\n"
-"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:167
-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 ""
-"Vrijeme za izvršavanje ovog upita prekoračuje ograničenje poslužitelja ili\n"
-"ograničenje koje ste postavili za ovaj adresar. Molim, preciznije "
-"postavite \n"
-"upit ili povećajte vremensko ograničenje u postavkama poslužitelja "
-"direktorija\n"
-"za ovaj adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspješno završen."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Želite li spremiti promjene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Greška kod dodavanja popisa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Greška prilikom dodavanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Greška kod izmjene popisa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Greška prilikom mijenjanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Greška kod uklanjanja popisa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Greška pri uklanjanju kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Otvaranje %d kontakata će otvoriti %d novih prozora.\n"
-"Da li doista želite prikazati sve ove kontakte?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s već postoji\n"
-"Želite li  prepisati preko njega?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Prebriši"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "popis"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Premjesti kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Kopiraj kontakt u "
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Premjesti kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Kopiraj kontakte u "
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Odaberite odredišni adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
-
-#.
-#. * 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 "(niti jedan) "
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Glavna email adresa\r"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Odaberi akciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pretražujem adresar..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Promjeni podatke o kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, 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
-msgid "Show Full VCard"
-msgstr "Prikaži potpun VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži kompaktan VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Spremi u adresaru"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Širina stupca"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3220,11 +3260,6 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Ispis koverte "
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Ispiši kontakte"
@@ -3234,6 +3269,11 @@ msgstr "Ispiši kontakte"
 msgid "Print contact"
 msgstr "Ispiši kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Ispis koverte "
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3418,16 +3458,6 @@ msgstr "Testiranje ispisa kontakata"
 msgid "This should test the contact print code"
 msgstr "To bi trebalo iskušati kontaktni kod za ispis"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Odredi izlaznu datoteku umjesto standardnog izlaza"
@@ -3486,6 +3516,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja inicijalnog adresara."
@@ -3498,11 +3538,12 @@ msgstr "Ulazna datoteka"
 msgid "No filename provided."
 msgstr "Ime datoteke nije dano"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Upišite lozinku"
 
@@ -3534,117 +3575,55 @@ msgstr "Predefinirani prioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao pročitati pilotov ToDo programski blok"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Podesite vašu vremensku zonu, kalendar i popis zadataka ovdje "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolution kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolution kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Preglednik Evolution kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolution kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Preglednik Evolucija zadataka"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Kalendar komponenta Evolutiona"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponenta zadataka Evolutiona"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zadaci"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servis za alarm obavijesti Evolution kalendara"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pokrećem:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Završavam:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Zatvori"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Drijemaj"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Vrijeme drijemanja (u minutama)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Promijeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Drijemaj"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvori"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Odbaci"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Otpusti _sve"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Opis ne postoji."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3657,12 +3636,12 @@ msgstr ""
 "Počinje u %s\n"
 "Završava u %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3674,7 +3653,7 @@ msgstr ""
 "podsjetnik podešen za slanje poruke. Evolucija će\n"
 "umjesto toga pokazati normalan prozor za dijalog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3691,19 +3670,19 @@ msgstr ""
 "\n"
 "Sigurno želite pokrenite ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovno za ovu aplikaciju."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servis za alarm obavijesti Evolution kalendara"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Ne mogu inicijalizirati Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Ne mogu pokrenuti gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao pokrenuti stvaranje servisa za alarm obavijesti"
 
@@ -3812,56 +3791,42 @@ msgid "Weekday the week starts on"
 msgstr "Radni dan na koji tjedan počinje "
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Treba li tražiti potvrdu prilikom brisanja sastanka"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Treba li tražiti potvrdu prilikom brisanja mape"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Treba li sakriti završene zadatke"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Treba li postaviti uobičajeni podsjetnik za sve događaje"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Treba li prikazivati vrijeme u 24 satnom obliku umjesto am/pm formata"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Treba li prikazivati brojeve tjedana u navigatoru datumima"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Sažetak sadrži"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Opis sadrži"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentar sadrži"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Mjesto sadrži"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Neupariv"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3870,118 +3835,128 @@ msgstr ""
 "Ova operacija će trajno obrisati sve događaje starije od odabranog "
 "vremenskog trajanja. Ako nastavite, navedene događaje nećete moći vratiti."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Izbriši događaje starije od"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dana"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Postavke..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Učitavam kalendar..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "NIje moguće otvoriti kalendar %s' za kreiranje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za stvaranje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Obveza"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Napravi novi sastanak"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Sastanak"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Unesite novi zahtjev za sastankom"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Novi cijelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Cijelo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Unesite novi cjelodnevni sastanak"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_Kalendar"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Kreiraj novi kalendar"
 
@@ -4011,15 +3986,35 @@ msgstr "Tjedni pregled"
 msgid "Month View"
 msgstr "Mjesečni pregled"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Sažetak sadrži"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentar sadrži"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Mjesto sadrži"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Neupariv"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metoda nije podržana kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
@@ -4028,19 +4023,6 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nisam mogao otvoriti direktorij u '%s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI koju će kalendar pokazati"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Tip pogleda za prikaz"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opcije za zvučni alarm"
@@ -4106,7 +4088,7 @@ msgstr "pokaži još na svakih"
 msgid "hours"
 msgstr "sati"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Akcija/okidač"
 
@@ -4125,14 +4107,14 @@ msgstr "Osnove"
 msgid "Date/Time:"
 msgstr "Datum/Vrijeme:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Pokaži poruku"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Odsviraj zvuk"
 
+#: 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 "Podsjetnici"
@@ -4147,6 +4129,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
 msgid "Summary:"
 msgstr "Sažetak:"
@@ -4185,10 +4168,106 @@ msgstr "minuta(e)"
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"'%s' je udaljena grupa. morate navesti lokaciju sa koej želite dohvatiti "
+"kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa popisa zadataka"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "tjedni"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Omogućeno"
 
@@ -4202,19 +4281,19 @@ msgstr "Nemoj ukloniti"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Onemogući"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Omogući"
 
@@ -4239,162 +4318,176 @@ msgid "60 minutes"
 msgstr "60 minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Uzbune"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Tada</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Tada</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Postavke popisa zadataka</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Tada</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Ako</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Postave kalendara i zadataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Boja zakašnjelih zadataka"
 
-#: 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 "Boja zadataka kojima danas ističe rok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Dan _konačni:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "dani"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Zaslon"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Omogući"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Petak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Sati"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Ponedjeljak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Subota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsjetnik"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve tjedana u navigatoru datuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Nedjelja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Čet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Lista zadataka"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Vrijeme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Vremenska _zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Oblik vremena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Početak t_jedna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Srijeda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Radni tjedan"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 satni (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-satno"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Dodaj adresu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Tr_aži potvrdu za brisanje podataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Skupi tjedne u mjesečni prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Zaslon"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4404,141 +4497,46 @@ msgstr "_Zaslon"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "Slobodan/zauzet zahtjev"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Općenito"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij ispunjene zadatke nakon "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Neispunjena zaduženja:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sub"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Pokaži završetke zakazanih sastanaka u tjednim i mjesečnim prikazima"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Podjela _vremena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Uto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Sri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "prije svakog zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Lokacija izvora '%s' nije dobro formirana."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"'%s' je udaljena grupa. morate navesti lokaciju sa koej želite dohvatiti "
-"kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa popisa zadataka"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Svojstva kalendara"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tjedni"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4618,80 +4616,80 @@ msgstr "%s  Napravili ste izmjene. Odbaciti te izmjene i ažurirati uređivač?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Niste napravili nikakve izmjene. Ažurirati uređivač?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Greška pri provjeri: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "do"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Due "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nisam mogao ažurirati objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Promijeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Zadatak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Stavka dnevnika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Spremi kao..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Izmjene učinjene na ovoj stavki mogu biti zanemarene kod sljedećeg ažuriranja"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Ne mogu koristiti trenutnu inačicu!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Greška pri provjeri: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "do"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Due "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Ne mogu otvoriti izvor"
@@ -4812,27 +4810,27 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Obveza"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Podsjetnik"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Ponavljanje"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Raspored"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Sastanak"
 
@@ -4844,7 +4842,7 @@ msgstr "Događaj bez datuma početka"
 msgid "Event with no end date"
 msgstr "Događaj bez datuma završetka"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
@@ -4930,10 +4928,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4952,15 +4950,15 @@ msgstr "Potreban je organizator."
 msgid "At least one attendee is required."
 msgstr "Nužna je najmanje jedna prisutna osoba."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5232,24 +5230,19 @@ msgstr "_Zanemari promjene"
 msgid "Save Event"
 msgstr "Spremi događaj"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr ""
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Odaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalendar"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Odredišni direktorij:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "popis zadataka"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Lista zadataka"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5278,38 +5271,44 @@ msgid "% _Complete"
 msgstr "% _ dovršeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Završeno"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Visok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Izvodi se"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Nisko"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Obično"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nije započelo"
 
@@ -5344,11 +5343,11 @@ msgstr "_Web stranica:"
 msgid "Assignment"
 msgstr "Dodjela"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nije moguće otvaranje zadataka u '%s'."
@@ -5357,8 +5356,9 @@ msgstr "Nije moguće otvaranje zadataka u '%s'."
 msgid "Con_fidential"
 msgstr "_Povjerljivo"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Opis:"
@@ -5502,101 +5502,53 @@ msgstr "%s kod %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Javno"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privatno"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Povjerljivo"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Završni datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Datum početka"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Sažetak"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Slobodno"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zauzeto"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Kliknite za otvaranje %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Bez naslova"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Početni datum"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Datum krajnjeg roka:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografsko mjesto mora biti uneto u obliku: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stanje:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioritet:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Web stranica:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nepoznato"
+#: 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 "Javno"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Ponavljajući"
+#: 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 "Privatno"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Dodijeljeno"
+#: 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 "Povjerljivo"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5642,17 +5594,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Slobodno"
+
+#: 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 "Zauzeto"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Brišem odabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Otvori"
 
@@ -5661,41 +5622,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Ispis..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Zaljepi"
 
@@ -5750,78 +5712,157 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Datum početka"
 
+#: 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 "Sažetak"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Razvrstani zadaci"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Novi S_astanak..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Novi cjelodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Odaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Obriši..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodnu/zauzetu informaciju"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Premjesti u mapu..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Proslijedi kao iCalendar... "
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "_Idi na Danas"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Postavke..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Završni datum"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Nepoznato"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Ponavljajući"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Ne"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Geografsko mjesto mora biti uneto u obliku: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5845,36 +5886,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "razmaci od %02i minuta"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "razmaci od %02i minuta"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5982,10 +6023,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stanje:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6015,7 +6052,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "U redu"
 
@@ -6228,60 +6265,56 @@ msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema dijelove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Datoteka kalendara nije se mogla ažurirati!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objekt se ne može naći\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Osvježeno stanje prisutne osobe\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutne osobe nije moglo biti osvježeno!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Stavka poslana!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslan!\n"
 
@@ -6398,28 +6431,6 @@ msgstr "Delegirano"
 msgid "In Process"
 msgstr "U toku"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Odsutan..."
@@ -6480,7 +6491,34 @@ msgstr "Početno vrijeme _sastanka:"
 msgid "Meeting _end time:"
 msgstr "Završno vrijem_e sastanka:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Unesite lozinku za %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6489,24 +6527,19 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
-"Podrška zadataka za\n"
-"%s\n"
-" je prestala raditi."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6515,51 +6548,105 @@ msgstr ""
 "Greška pri otvaranju %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Učitavanje zadataka"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Završavam zadatke..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Brišem odabrane objekte..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zadaci"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam sastanke kod %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zadatke kod %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Brisanje"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar i zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Podesite vašu vremensku zonu, kalendar i popis zadataka ovdje "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola podešavanja Evolution kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Preglednik zakazanih poruka Evolution kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Urednik Evolution kalendara/zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Kalendar komponenta Evolutiona"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponenta zadataka Evolutiona"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zadaci"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Travanj"
@@ -6705,6 +6792,23 @@ msgstr "Rođendani i obljetnice"
 msgid "On The Web"
 msgstr "Na webu"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Nije moguće otvoriti kalendar '%s'."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nije moguće otvaranje zadataka u '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6924,7 +7028,7 @@ msgid "Contacts: "
 msgstr "Konatkti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Pogled prije ispisa"
 
@@ -6936,69 +7040,81 @@ msgstr "Ispiši stavku"
 msgid "Print Setup"
 msgstr "Podešavanje ispisa"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Novi popis zadataka"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "Novi zadatak"
+msgstr[1] "Novi zadatak"
+msgstr[2] "Novi zadatak"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Obrisano"
+msgstr[1] "Obrisano"
+msgstr[2] "Obrisano"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Učitavanje zadataka"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Ne postoji kalendar dostupan za stvaranje zadataka"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Novi zadatak"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Zadatak"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Interesne grupe"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa popisa zadataka"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novi zadatak"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI za prikaz direktorija zadataka"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Ne mogu učitati poslove u `%s"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7010,11 +7126,11 @@ msgstr ""
 "\n"
 "Jeste li sigurni da želite obrisati zadatke?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovno."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Ispiši zadatke"
 
@@ -8662,7 +8778,7 @@ msgstr "Kopiraj sadržaj mape lokalno za neumreženi rad"
 msgid "Downloading new messages for offline mode"
 msgstr "Skidanje novih poruka za neumreženi način rada"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam mapu '%s' za neumreženi rad"
@@ -8755,33 +8871,6 @@ msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primjene filtera pretrage: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Ne mogu parsirati trženi izraz: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Greška kod izvršavanja izraza za pretragu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8813,7 +8902,52 @@ msgstr "Učim koje su poruke neželjena pošta."
 msgid "Filtering new message(s)"
 msgstr "Filtriranje novih poruka"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Ne mogu parsirati trženi izraz: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Greška kod izvršavanja izraza za pretragu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) zahtijeva samo jedan logički (boolean) rezultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Izvršavam pretragu na nepoznatom zaglavlju: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8824,15 +8958,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao pročitati gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao pročitati zahtjev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8841,27 +8975,27 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\"3+"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao otključati tajni ključ: date su 3 pogrešne lozinke."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao dekriptirati: nisu označeni ispravni primatelji. "
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8872,82 +9006,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao primjeniti GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Ne mogu stvoriti podatke za potpis: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Nisam mogao izvršiti gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Nisam mogao izvršiti gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Dio poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Ne mogu provjeriti potpis poruke: Neispravan format poruke"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ne mogu provjeriti potpis poruke: nisam mogao napraviti temp datoteku: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Ne mogu stvoriti podatke za kriptiranje: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno kriptirani dio poruke"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Kriptirani sadržaj"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Nije moguća analiza sadržaja poruke"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu podijeliti pomoćnika zaključavanja: %s"
-
-#: 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 "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Ne mogu zaključati '%s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8970,6 +9084,26 @@ msgstr "Nisam mogao zaključiti koristeći fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao zaključiti koristeći flock(2): %s "
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne mogu kreirati pomoćni cjevovod za zaključavanje (baze podataka): %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne mogu podijeliti pomoćnika zaključavanja: %s"
+
+#: 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 "Ne mogu zaključati '%s': greška u protokolu s pomoćnikom zaključavanja"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Ne mogu zaključati '%s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9222,7 +9356,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Neispravan odgovor autentifikacije od servera."
 
@@ -9422,7 +9556,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Potvrda kriptiranja:"
 
 #: camel/camel-smime-context.c:360
@@ -9439,7 +9573,7 @@ msgstr "Ne mogu zaključati  mapu %s: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Nisam mogao smjestiti poštu u lokalnu mapu \"Poslano\": %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Neuspjela prijava.\n"
@@ -9504,98 +9638,98 @@ msgstr "Ne mogu stvoriti mapu: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Ne mogu dobiti poruku %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Nevažeći potpis certifikata"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Ispravni potpis"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisao: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Greška kod izvršavanja naredbe DATA"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Ne mogu zaključati  mapu %s: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Nisam uspio poslati korisničko ime poslužitelju"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Naredba nije ostvarena"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9612,16 +9746,26 @@ msgstr "Ne mogu stvoriti mapu: `%s': mapa postoji"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu napraviti mapu: neispravna operacija"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Smeće"
@@ -9742,7 +9886,7 @@ msgstr "Upotreba ključa ne podržava potpis certifikatom"
 msgid "Error in application verification"
 msgstr "Greška kod provjere programa"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9755,11 +9899,11 @@ msgstr ""
 "Oznaka:       %s\n"
 "Potpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "DOBAR"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "LOŠ"
 
@@ -9783,7 +9927,7 @@ msgstr ""
 "Želite li ipak prihvatiti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9798,7 +9942,7 @@ msgstr ""
 "\n"
 "Želite li prihvatiti?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9807,7 +9951,7 @@ msgstr ""
 "Problem sa certifikatom: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9816,7 +9960,7 @@ msgstr ""
 "Neispravna domena certifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9825,7 +9969,7 @@ msgstr ""
 "Certifikat istekao: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9839,17 +9983,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao obraditi URL `%s"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Greška kod spremanja `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke %s u %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 
@@ -9858,11 +10002,6 @@ msgstr "Ne mogu kopirati ili premjestiti poruke u Virtualnu Mapu"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9877,10 +10016,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Ne možete kopirati poruke u mapu \"Smeće\""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Provjeravam za novu poštu"
 
 #: 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 "Provjeri za nove poruke u svim mapama"
@@ -9911,6 +10052,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristupanje Novell Groupwise serverima"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9929,26 +10071,322 @@ msgstr "Spajanje na IMAP poslužitelje korištenjem lozinke u čistom tekstu."
 msgid "Checklist"
 msgstr "Kontrolni popis"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne mogu dohvatiti mapu: `%s': %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 "Veza s poslužiteljom je neočekivano prekinuta: %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 "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne mogu dohvatiti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne mogu dobiti poruku: %s iz mape %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 ""
+"Ne mogu dobiti poruku: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne mogu dodati poruku u mh mapu: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne mogu dodati poruku u mh mapu: %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 ""
+"Ne mogu dobiti poruku: %s iz mape %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 ""
+"Ne mogu dobiti poruku: %s iz mape %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 ""
+"Ne mogu dobiti poruku: %s iz mape %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 ""
+"Ne mogu dobiti poruku: %s iz mape %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 "Mape"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Pokaži samo pretplaćene mape"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Pređi preko formata imena mape kojeg daje poslužitelj"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Prostor naziva"
+
+#: 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 "Za čitanje i spremanje pošte na IMAP servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za %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: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/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 "Nisam se mogao povezati na %s (port %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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezivanje poništeno"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nisam mogao da se povežem na POP poslužitelj %s: Traženi mehanizam prijave "
+"nije podržan."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sMolim, upišite SMTP lozinku za %s na računalu %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nisam se mogao prijaviti na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne mogu obrisati mapu: %s: nema takve mape"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Naredba:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ne mogu obrisati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne mogu preimenovati mapu: %s: neispravna operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočekivan odgovor od IMAP poslužitelja: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operacija je opozvana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza s poslužiteljom je neočekivano prekinuta: %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:1089
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9993,21 +10431,21 @@ msgstr "Ne mogu kreirati mapu %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Ne mogu učitati sažetak za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je uništena i ponovo kreirana na serveru."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Tragam za promijenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10023,25 +10461,25 @@ msgstr ""
 "Ne mogu dobiti poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nema takve poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ova poruka je trenutno nedostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao pronaći tekst poruke u FETCH odgovoru."
 
@@ -10080,23 +10518,6 @@ msgstr "Koristi prilagođenu naredbu za spajanje na poslužitelj"
 msgid "Command:"
 msgstr "Naredba:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mape"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Pokaži samo pretplaćene mape"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Pređi preko formata imena mape kojeg daje poslužitelj"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Prostor naziva"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primjeni filtere na nove poruke u INBOXu ovog servera"
@@ -10119,86 +10540,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP poslužitelj %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nisam se mogao povezati na %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nedostupan"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nisam se mogao povezati na IMAP server %s u sigurnosnom načinu rada: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspjeli"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Niste unijeli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10209,25 +10587,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takve mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime mape \"%s\" nije ispravno jer sadrži karakter \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10235,7 +10606,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznata glavna mapa: %s"
@@ -10345,58 +10716,58 @@ msgstr ""
 "Također se može koristiti za čitanje stabla direktorija u Elm, Pine, ili "
 "Mutt stilu."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Spremnik root %s nije apsolutna putanja"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Spremnik root %s nije regularan direktorij"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Ne mogu dobiti mapu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokalna spremišta ne sadrže sandučić za poštu."
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisam mogao preimenovati direktorij %s u %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao preimenovati '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nisam mogao obrisati datoteku sažetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nisam mogao obrisati indeks datoteku mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10462,7 +10833,7 @@ msgstr "Nisam mogao obrisati direktorij `%s': %s"
 msgid "not a maildir directory"
 msgstr "nije maildir direktorij"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10793,7 +11164,7 @@ 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:258
+#: 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
@@ -10802,8 +11173,8 @@ msgid "User cancelled"
 msgstr "Korisnik poništen"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10812,46 +11183,46 @@ msgstr "Korisnik poništen"
 msgid "Cannot get message %s: %s"
 msgstr "Ne mogu dobiti poruku %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Interna greška: uid je u neispravnom formatu: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne možete kopirati poruke iz NNTP mape!"
 
@@ -10976,7 +11347,8 @@ msgid "Could not get group: %s"
 msgstr "Ne mogu dobiti grupu: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Ne mogu dohvatiti poruke: nenavedena greška"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11029,8 +11401,8 @@ msgstr "Nema poruka sa uid-om %s"
 msgid "Retrieving POP message %d"
 msgstr "Preuzimam POP poruke (%d)"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
@@ -11474,7 +11846,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "prilog"
 
@@ -11518,6 +11890,105 @@ msgstr "Mime tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje privitka"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
+"korisnički račun"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
+"za ovaj korisnički račun"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne mogu otvoriti datoteku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ne mogu da povratim poruku iz urednika"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvori datoteku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatski stvoren"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Potpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "Dodana <b>%d</b> datoteka"
+msgstr[1] "Dodane <b>%d</b> datoteke"
+msgstr[2] "Dodano <b>%d</b> datoteka"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Prikaži Traku s privicima (ovdje ubaciti privitke)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Sastavi poruku"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Ne mogu kreirati prozor za sastavljanje:\n"
+"Ne mogu pokrenuti kontrolu biranja adresa."
+
+#: 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 ""
+"Ne mogu kreirati prozor za sastavljanje:\n"
+"Ne mogu aktivirati komponentu HTML urednika.\n"
+"Molim vas da provjerite imate li odgovarajuće inačice\n"
+"gtkhtml i libgtkhtml na sistemu.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Ne mogu kreirati prozor za sastavljanje:\n"
+"Ne mogu aktivirati komponentu HTML urednika."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Urednik sadrži poruku koja nije tekstualna, te ne može biti mijenjana.)"
+"<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Odredište slanja"
@@ -11598,212 +12069,134 @@ msgstr "Kliknite ovdje za odabir mapa u koje će se slati poruke"
 msgid "Attach file(s)"
 msgstr "Priloži datoteku(e)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Ne mogu potpisati izlaznu poruku: Nije postavljen certifikat za ovaj "
-"korisnički račun"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Ne mogu kriptirati izlaznu poruku: Nije postavljen certifikaz za kriptiranje "
-"za ovaj korisnički račun"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu otvoriti datoteku"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Otvori datoteku"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatski stvoren"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "Dodana <b>%d</b> datoteka"
-msgstr[1] "Dodane <b>%d</b> datoteke"
-msgstr[2] "Dodano <b>%d</b> datoteka"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Sakrij traku s privitcima (ubacite privitke ovdje)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Prikaži Traku s privicima (ovdje ubaciti privitke)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Sastavi poruku"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Dodaj datoteku poruci"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu pokrenuti kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu aktivirati komponentu HTML urednika.\n"
-"Molim vas da provjerite imate li odgovarajuće inačice\n"
-"gtkhtml i libgtkhtml na sistemu.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Ne mogu kreirati prozor za sastavljanje:\n"
-"Ne mogu aktivirati komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Urednik sadrži poruku koja nije tekstualna, te ne može biti mijenjana.)"
-"<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Nepročitane poruke"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Želite li spremiti promjene?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nisam mogao napraviti cjevovod: %s"
+msgid "Don't Recover"
+msgstr "Nemoj ukloniti"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
+msgid "Recover"
+msgstr "Ukloni"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promjene"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Želite li spremiti promjene?"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Upozorenje: izmjenjena poruka"
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Don't Recover"
-msgstr "Nemoj ukloniti"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Sigurni ste da želite obrisati ovaj nenaslovljeni sastanak?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Ukloni"
+msgid "Discard Changes"
+msgstr "_Zanemari promjene"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Spremi poruku..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nisam mogao napraviti cjevovod: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Nepročitane poruke"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Upozorenje: izmjenjena poruka"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Dodaj datoteku poruci"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Morate da podesite nalog da biste mogli sastaviti poruku."
 
@@ -11933,7 +12326,8 @@ msgstr ""
 "Datoteka pod tim imenom već postoji.\n"
 "Da je prepišem?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Prepiši datoteku?"
 
@@ -12117,81 +12511,97 @@ msgstr "Odaberite ime za usporedbu"
 msgid "_Filter Rules"
 msgstr "<b>Pravila _filtera</b>"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Greška u regularnom izrazu '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Ažuriranje sastanka"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Morate izabrati datum."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Posebno _ime:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Morate dati ime datoteci."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Premještam mapu %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Datoteka '%s' ne postoji ili nije regularna."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Dodjela"
+msgid "Missing folder."
+msgstr "Premještam mapu %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Morate odrediti mapu."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Nije odabran poslužitelj"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Greška u regularnom izrazu '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Morate izabrati datum."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Dodjela"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Morate imenovati ovaj vfolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Morate dati ime datoteci."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Morate odrediti mapu."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nije odabran poslužitelj"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12203,64 +12613,11 @@ msgstr "Izaberite datoteku"
 msgid "<b>Then</b>"
 msgstr "<b>Tada</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Označi mapu"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Važno"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Za napraviti"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Kasnije"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Ime pravila: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Bez naslova"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Ako</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Izvrši akcije"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "ako su svi uvjeti zadovoljeni"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ako je bilo koji uvjet zadovoljen"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "dolazeći"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "odlazeći"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12349,6 +12706,75 @@ 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
+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
+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
+msgid "Later"
+msgstr "Kasnije"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Ime pravila: "
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Ako</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ako su svi uvjeti zadovoljeni"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ako je bilo koji uvjet zadovoljen"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Izvrši akcije"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegirano"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Primatelji"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Odgovara na %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Uključi:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "dolazeći"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "odlazeći"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12478,7 +12904,7 @@ msgstr "nije označen"
 msgid "Junk Test"
 msgstr "Testiranje pošte smeća"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Oznaka"
@@ -12515,7 +12941,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Čitaj"
 
@@ -12584,9 +13010,9 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12649,102 +13075,60 @@ msgstr "Subjekt ne sadrži"
 msgid "Virtual _Folders"
 msgstr "<b>Virtualne _mape</b>"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder izvor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Postavke uređivača poruka"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Podesite postavke pošte, uključujući sigurnost i prikaz poruka"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Podesite provjeru pravopisa, potpise, i sastavljač poruke ovdje"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovdje"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Preglednik za direktorije Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštanski račun"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Predefinirano]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Ime računa"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Neimenovano"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Dod_aj potpis"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Proslijeđena poruka --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtualnu mapu iz pretrage..."
 
@@ -12778,264 +13162,437 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gdje napraviti mapu:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Napravi mapu"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime mape:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolder-i"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "Neupariv"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Dolazna pošta"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Učitavam..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premještam mapu %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiram mapu %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premještam poruke u mapu %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u mapu %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Ne mogu ispustiti poruke u spremište najviše razine"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Pomakni"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Otkaži zadatak"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izaberite direktorij"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopiraj"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Stvaram mapu \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Napravi mapu"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapu \"%s\" u:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Preimenuj mapu"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "P_ogled"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "_Otvori u novom prozoru"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Pomakni"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Novi direktorij..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Promijeni ime"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VFolder-i"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "Neupariv"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Dolazna pošta"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Ispis"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _popis"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Odgovori svima"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Naprijed"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Ukloni oznaku"
 
-#: mail/em-folder-view.c:787 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 "Označi kao pročitano"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Označi kao nepročitano"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Označ_i kao važno"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nebitno "
 
-#: mail/em-folder-view.c:791 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 "Označi kao smeće"
 
-#: mail/em-folder-view.c:792 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 "Označi da nije smeće"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Poništi brisanje"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Premjesti u mapu..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u mapu..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Pri_mjeni filtere"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltriraj neželjenu poštu"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu "
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder na niti"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter na Sub_jekt"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter na P_ošiljatelja"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter na Pri_matelje"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter na _Dopisni popis"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtar na niti"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Uobičajeno"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Ispiši poruku"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Kopiraj lokaciju veze"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite za slanje pošte %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Od"
+
+#: 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 "Odgovor-Za"
+
+#: 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 "Prima"
+
+#: 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 (kopija)"
+
+#: 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 (nevidljiva kopija)"
+
+#: 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
+msgid "Newsgroups"
+msgstr "Interesne grupe"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Kliknite za otvaranje %s"
+msgid "%s attachment"
+msgstr "%s prilog"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Nepodržano šifriranje za višedjelno/šifrirano"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepodržani format potpisa"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Greška pri provjeri potpisa"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nepoznata greška pri provjeri potpisa"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Dohvaćanje `%s'"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Nepotpisano"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Ispravni potpis"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Neispravni potpis"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Nekriptirano"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Kriptirano, slaba enkripcija"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Šifrirano"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Kriptirano, jaka enkripcija"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Neispravan vanjski dio poruke."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pokazivač na FTP adresu (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pokazivač na lokalnu datoteku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pokazivač na mrežne podatke (%s) "
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatiranje poruke"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Program e-pošte"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13043,22 +13600,14 @@ msgstr "Kliknite za otvaranje %s"
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Nepotpisano"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ova poruka nije potpisana. Nema jamstva da je pošiljatelj poruke istinit."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Ispravni potpis"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13066,22 +13615,18 @@ msgstr ""
 "Ova poruka je potpisana i valjana, pošiljatelj je vrlo vjerojatno onaj za "
 "kojeg se predstavlja."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Neispravni potpis"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 "Potpis poruke ne može biti provjeren, možda je promijenjen tijekom prijenosa."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravni potpis, ne mogu provjeriti pošiljatelja"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13089,11 +13634,7 @@ msgstr ""
 "Poruka je potpisana valjanim certifikatom, no posiljaoc moruke se ne može "
 "provjeriti"
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Nekriptirano"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13102,11 +13643,7 @@ msgstr ""
 "Ova poruka nije kriptirana. Njezin sadržaj može biti vidljiv dok putuje "
 "internetom."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Kriptirano, slaba enkripcija"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13116,22 +13653,14 @@ msgstr ""
 "teško, ali ne i nemoguće stranoj osobi vidjeti sadržaj poruke u razumno "
 "kratkom vremenu."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Šifrirano"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 "Ova poruka je kriptirana. Bilo bi teško stranoj osobi vidjeti sadržaj poruke."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Kriptirano, jaka enkripcija"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13140,178 +13669,60 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "Po_gledaj certifikat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Ovaj potvrda nije vidljiva"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno na %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Pogledaj unutar"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Dohvaćanje `%s'"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Neispravan vanjski dio poruke."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP adresu (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pokazivač na lokalnu datoteku (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na mrežne podatke (%s) "
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na nepoznati vanjski podatak (\"%s\" tipa) "
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formatiranje poruke"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Odgovor-Za"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Prima"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc (kopija)"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc (nevidljiva kopija)"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Program e-pošte"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Interesne grupe"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu parsirati S/MIME poruku: Nepoznata greška"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržano šifriranje za višedjelno/šifrirano"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisam mogao obraditi MIME poruku. Pokazujem kao izvor."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Nepodržani format potpisa"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Greška pri provjeri potpisa"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri provjeri potpisa"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ugrađeni)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Uvijek"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Jednom dnevno"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Tjedno"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Mjesečno"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13323,25 +13734,55 @@ msgstr ""
 "\n"
 "Molim pričekajte dok Evolution ne migrira vaše mape..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Nije uspjela migracija pop3 uid međuspremnika: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Ne mogu stvoriti mapu: `%s': %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Neuspjelo migriranje proširenog stanja mape: %s"
+#: mail/em-migrate.c:1532
+#, 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:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, 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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Nisam uspio otvoriti spremište za `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Nije uspjelo stvaranje direktorija `%s': %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13352,88 +13793,74 @@ msgstr "Snimi kao..."
 msgid "untitled_image.%s"
 msgstr "nenaslovljena_slika.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Postavi kao _pozadinu"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u pregledniku"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Pošalji poruku na..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Dodaj u adresar"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ova lokacija ne podržava pretplate ili nije omgućena"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "U pretplati"
 
-#: mail/em-subscribe-editor.c:637 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 "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Molim odaberite server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nije odabran poslužitelj"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovno ovu poruku."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Proslijeđena poruka --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Na %a, %Y-%m-%d u %H:%M %%+05d, %%s napisao:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "cedulja"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Spremi poruku..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -13451,11 +13878,13 @@ msgid "Check incoming mail being junk"
 msgstr "Provjera _dolazne pošte koja je prepoznata kao smeće"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13560,14 +13989,20 @@ msgid "Last time empty trash was run"
 msgstr "Zadnji put je bio pokrenut prazni koš za smeće"
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Izlistavanje oznaka i njima pridruženih boja"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Popis korisničkih računa"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Popis korisničkih računa"
+
+#: 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."
@@ -13576,28 +14011,33 @@ msgstr ""
 "sadrži znakovne nizove s imenima poddirektorija relativnih s /apps/evolution/"
 "mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Popis prilagođenih zaglavlja i da li su oni omogućeni."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Popis korisničkih računa poznat komponenti za e-poštu Evolutiona. Popis "
 "sadrži znakovne nizove u obliku ime:boja gdje boja koristi HTML heks "
 "kodiranje."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Popis mime tipova koji traže bonobo preglednike komponenata"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Učitavanje slika za HTML poruke preko http-a"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13607,90 +14047,90 @@ msgstr ""
 "Nikad ne učitavaj slike s mreže 1 - Učitavaj slike ako je pošiljatelj u "
 "adresaru 2 - Uvijek učitavaj slike s mreže"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Logiranje akcija filtra u navedenu log datoteku."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Logiranje akcija filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Logiranje akcija filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao pregledano nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao pregledano nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označivanje citata u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označivanje citata u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Visina prozora poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Širina prozora poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (normalno, puna zaglavlja, kod)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanji broj dana između pražnjenja koša za smeće"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Najmanji broj dana između pražnjenja koša za smeće kod izlaska iz programa."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Zvučna datoteka za obavijest o novopristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Nova vrsta obavijesti o pristigloj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Iskoči u slučaju praznog naslova"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upitaj korisnika kada pokuša obrisati mapu."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 "Upitaj korisnika kada pokuša poslati poruku bez naslova."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Upitaj korisnika prilikom brisanja"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik popuni samo Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13698,34 +14138,26 @@ msgstr ""
 "Upitaj kada korisnik pokuša poslati HTML poštu primateljima koji možda ne "
 "žele primati HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upitaj kada korisnik pokuša poslati neželjeni HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zamijeni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaj smješke u tekstu i zamijeni ih slikama."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Pokreni testiranje na smeće na dolaznoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Pošalji poštu formatiranu kao HTML"
@@ -13772,7 +14204,7 @@ msgstr "Provjera pravopisa na licu mjesta"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Visina prozora poruke"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13917,33 +14349,63 @@ msgstr "veza za pokretanje korisnički pokrenutim spamd"
 msgid "spamd port"
 msgstr "spamd port"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucija Netscape pošta uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Postavke uređivača poruka"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolucija Outlook Express 4 uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Podesite postavke pošte, uključujući sigurnost i prikaz poruka"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite provjeru pravopisa, potpise, i sastavljač poruke ovdje"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovdje"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolucija naloga za poštu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštanski račun"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13951,15 +14413,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim pričekajte"
 
@@ -13988,18 +14450,46 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvoz `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Uvoz sandučića"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucija Netscape pošta uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolucija Outlook Express 4 uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolucija Pine uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem %s"
@@ -14009,7 +14499,7 @@ msgstr "Pretražujem %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14035,7 +14525,7 @@ msgstr ""
 "prioriteta. Provjerite uvežene filtere da se uvjerite\n"
 "radi li sve kao što bi trebalo."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14047,7 +14537,7 @@ msgstr ""
 "opciju, koju Evolution ne podržava.\n"
 "Ovi filteri neće ostati."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14061,23 +14551,23 @@ msgstr ""
 "su promjenjeni da bi mogli provjeriti je li taj niz\n"
 "sadržan u tijelu poruke ili nije."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution uvozi vaše stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Uvoz Netscape podataka"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Postavke"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filteri pošte"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14110,124 +14600,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolution računa"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Ključni dogovor"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Računalo:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Korisničko ime:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subjekt je %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Odgovara na %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo za filter"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Obrisano"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr ""
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "Datum slanja"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Obrisano"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova poruka poštom"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nova mapa za poštu"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Mapa pošte"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Stvori novu mapu e-pošte"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "URI poruke koju će pogled pokazati"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Provjeravam servis"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Spajam se na server...\r"
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14237,12 +14739,12 @@ msgstr ""
 "moraju biti popunjena, osim ako ne želite ove podatke uključiti u poruke "
 "koje šaljete."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Primanje pošte"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14250,15 +14752,15 @@ msgstr ""
 "Molim unesite podatke o vašem dolazećem serveru za poštu. Ako niste sigurni, "
 "pitajte sustav administratora ili davatelja Internet usluga."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Molim odaberite neku od slijedećih opcija"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14266,11 +14768,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Upravljanje računima"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14284,14 +14786,6 @@ msgstr ""
 "korisnički račun. Ime će biti korištenosamo za potrebe prikazivanja na "
 "zaslonu."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Provjeravam servis"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Spajam se na server...\r"
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14581,7 +15075,8 @@ msgid "Execute Command..."
 msgstr "Izvrši zapovijed..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Fik_sirana -širina:"
 
 #: mail/mail-config.glade.h:82
@@ -14888,345 +15383,450 @@ msgstr "boja"
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Mapa pod imenom \"%s\" već postoji. Molim koristite neko drugo ime."
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Sigurni ste da želite obrisati ovaj račun?"
+msgid "Invalid authentication"
+msgstr "SMTP prijava"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Trajno uklanjanje svih obrisanih poruka iz ovog direktorija"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP poslužitelj %s ne podržava traženi tip autorizacije (%s)."
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Trajno ukloni sve obrisane poruke iz svih direktorija"
+"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-errors.xml.in.h:6
+#. 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 "Jeste li sigurni da želite obrisati ovu adresu?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Šaljete HTML formatiranu poruku. Osigurajte se da sljedeći primatelji\n"
+"žele i mogu primati HTML poruke:\n"
+"%s Treba li ipak poslati?"
+
+#: 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 "Pošalji"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 "Upitaj korisnika kada pokuša poslati poruku bez naslova."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Upitaj kada korisnik pokuša poslati poruku bez To ili Cc primatelja."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ne mogu stvoriti mapu: %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nisam mogao napraviti privremeni direktorij: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Ne mogu otvoriti direktorij  `%s': %s."
+msgid "Use default drafts folder?"
+msgstr "Putanja do uobičajene mape kontakata"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Ne mogu obrisati mapu %s."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Ne mogu otvoriti mapu sa pripremom za ovaj račun.\n"
+"Želite li da koristite predefinisanu mapu sa pripremom?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ne mogu obrisati mapu %s."
+msgid "Use _Default"
+msgstr "Uobičajeno"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Trajno uklanjanje svih obrisanih poruka iz ovog direktorija"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Ne mogu otvoriti izvor"
+msgid "_Expunge"
+msgstr "_Izbaci"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Ne mogu otvoriti izvor"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Trajno ukloni sve obrisane poruke iz svih direktorija"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Ne mogu otvoriti poruku"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgid "_Empty Trash"
+msgstr "Isprazni smeće"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Ne mogu preimenovati mapu %s."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Imate neposlane poruke, želite li svejedno izaći?"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Ne mogu otvoriti direktorij  `%s': %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Ne mogu spremiti u `%s'\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Dod_aj potpis"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Obriši \"%s\""
+msgid "Error while {0}."
+msgstr ""
+"Greška pri '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Obriši odabrane kontakte"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "_Odbaci promjene"
+msgid "Error while performing operation."
+msgstr ""
+"Greška kod izvršenja operacije:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Želite li spremiti promjene?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ne briši"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Upišite lozinku"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Greška kod učitavanja podataka filtera:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Greška kod izvršenja operacije:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Greška pri '%s':\n"
-"%s"
+"Ne mogu spremiti u `%s'\n"
+" %s"
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Ne mogu otvoriti direktorij  `%s': %s."
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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
 msgid "File exists but cannot overwrite it."
 msgstr "Datoteka postoji, prepisai preko nje?"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Datoteka '%s' ne postoji ili nije regularna."
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Ne mogu obrisati mapu %s."
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne mogu obrisati mapu %s."
+
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ne mogu preimenovati mapu %s."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Obriši \"%s\""
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Treba li doista obrisati mapu \"%s\" i sve njene podmape?"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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-errors.xml.in.h:47
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "SMTP prijava"
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Mapa pod imenom \"%s\" već postoji. Molim koristite neko drugo ime."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+#, fuzzy
+msgid "Cannot open source \"{2}\"."
+msgstr "Ne mogu otvoriti izvor"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot open target \"{2}\"."
+msgstr "Ne mogu otvoriti poruku"
+
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
-"Šaljete HTML formatiranu poruku. Osigurajte se da sljedeći primatelji\n"
-"žele i mogu primati HTML poruke:\n"
-"%s Treba li ipak poslati?"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Treba li doista obrisati mapu \"%s\" i sve njene podmape?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ne mogu stvoriti mapu: %s: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Ne mogu otvoriti izvor"
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Niste unijeli sve potrebne podatke."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Ne možete otvoriti dva naloga sa istim imenom."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Obriši odabrane kontakte"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Sigurni ste da želite obrisati ovaj račun?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorij:\n"
-"    '%s'\n"
-"Potom su osvježeni."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ne briši"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorij:\n"
-"    '%s'\n"
-"Potom su osvježeni."
+msgid "Could not save signature file."
+msgstr "Nisam mogao sačuvati datoteku sa potpisom: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Dod_aj potpis"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Odbaci promjene"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP poslužitelj %s ne podržava traženi tip autorizacije (%s)."
+msgid "Do you wish to save your changes?"
+msgstr "Želite li spremiti promjene?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15234,85 +15834,97 @@ msgstr ""
 "\n"
 "Želite li ga spremiti?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Ne mogu otvoriti mapu sa pripremom za ovaj račun.\n"
-"Želite li da koristite predefinisanu mapu sa pripremom?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Uobičajeno"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Odbaci promjene"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Putanja do uobičajene mape kontakata"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Niste unijeli sve potrebne podatke."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Imate neposlane poruke, želite li svejedno izaći?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Ne možete otvoriti dva naloga sa istim imenom."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Ne mogu dohvatiti mapu `%s': mapa ne postoji."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Odbaci promjene"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Isprazni smeće"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Sledeći vFolder(i):\n"
+"%sKoristili su uklonjeni direktorij:\n"
+"    '%s'\n"
+"Potom su osvježeni."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Izbaci"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Pošalji"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Sledeći vFolder(i):\n"
+"%sKoristili su uklonjeni direktorij:\n"
+"    '%s'\n"
+"Potom su osvježeni."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Prebriši"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Pošalji"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingam %s"
@@ -15321,20 +15933,20 @@ msgstr "Pingam %s"
 msgid "Working"
 msgstr "Radim"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtriram direktorij"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Prikupljam poštu"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nisam mogao primjeniti odlazne filtere: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15343,115 +15955,115 @@ msgstr ""
 "Nisam mogao dodati u %s: %s\n"
 "Umjesto toga dodajem u lokalnu mapu \"Poslano\"."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Greška kod slanja %d od %d poruka"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Spremam poruku u mapu"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premještam poruke u %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorije u \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Prosljeđene poruke"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram mapu %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram smočnica %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam mapu %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorij '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i spreman korisnički račun \"%s\""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Spremam korisnički račun '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Osvježavam mapu"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Izbacujem mapu"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Direktoriji"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15460,7 +16072,7 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15469,11 +16081,11 @@ msgstr ""
 "Greška kod spremanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Spremam prilog"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15482,17 +16094,17 @@ msgstr ""
 "Ne mogu napraviti izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
@@ -15556,24 +16168,24 @@ msgstr "Ažuriram..."
 msgid "Waiting..."
 msgstr "Pričekajte..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Upišite šifru"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ovog postupka"
 
@@ -15614,89 +16226,94 @@ msgstr "Prosljeđena poruka"
 msgid "Invalid folder: `%s'"
 msgstr "Neispravna mapa: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Osvežavam vfolder-e za uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Osvežavam vfolder-e za uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Promjeni VMape"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "New VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Viši"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Najviši"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Danas %k:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Jučer %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Radim popis poruka"
 
@@ -15728,43 +16345,43 @@ msgstr "Primljeno"
 msgid "Size"
 msgstr "Veličina"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Poziv"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ne proslijeđuj"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "_Sljedi"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Naprijed"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Nije nužan odgovor"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 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 "Odgovori svima"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Ponovni pregled"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
@@ -15808,53 +16425,33 @@ msgstr "_Pretplati se"
 msgid "_Unsubscribe"
 msgstr "_Otkaži pretplatu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution Test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Probni dio Evolutiona"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Uobičajena grupa kratica"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Uobičajena širina za ploču trake mapa"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Uobičajena širina za ploču trake kratica"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Uobičajena širina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Uobičajena visina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Inačica podešavanja Evolutiona"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 "Identifikacijski broj ili  alias komponente koja se uobičajeno prikazuje "
 "prilikom pokretanja."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -15862,7 +16459,7 @@ msgstr ""
 "Ako je postavljeno, Evolution će se pokrenuti u neumreženom načinu rada "
 "umjesto uobičajenom umreženom načinu."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -15870,61 +16467,21 @@ msgstr ""
 "Ako je postavljeno, neće se prikazati dijalog s upozorenjem u razvojnim "
 "inačicama Evolutiona."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Popis putanja za mape koje se sinhroniziraju s diskom za neumreženu uporabu"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Putanja do uobičajene mape kalendara"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Putanja do uobičajene mape kontakata"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Putanja do uobičajene mape e-pošte"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Putanja do uobičajene mape zadataka"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Fizički URI do uobičajene mape kalendara"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Fizički URI do uobičajene mape kontakata"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Fizički URI do uobičajene mape e-pošte"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Fizički URI do uobičajene mape zadataka"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Treba li pokazati traku mapa"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Treba li pokazati traku kratica"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "oklop"
 
@@ -15932,6 +16489,32 @@ msgstr "oklop"
 msgid "Brought to you by"
 msgstr "Za vas su napravili"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Nepoznata greška"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Ne mogu se registrirati na OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Baza sa postavkama nije pronađena"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generička greška"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez naziva) "
@@ -16069,11 +16652,11 @@ msgstr "Nisam mogao izvršiti uvoznika"
 msgid "_Import"
 msgstr "_Uvoz"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Prekidam veze..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
 
@@ -16115,11 +16698,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
@@ -16133,14 +16740,15 @@ msgid "Bug buddy could not be run."
 msgstr "Ne mogu pokrenuti Bug buddy."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "O Ximian Evolutionu"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Neumreženi rad"
 
@@ -16148,51 +16756,6 @@ msgstr "_Neumreženi rad"
 msgid "Work Offline"
 msgstr "Neumreženi rad"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian 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:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Upozorenje: Evolution ne može nadograditi sve vaše podatke iz inačice  %d.%d."
-"%d.\n"
-"Podaci nisu obrisani, ali ih nećete moći vidjeti u ovoj inačici Evolutiona.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Ne mogu se registrirati na OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Baza sa postavkama nije pronađena"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generička greška"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kvadratić"
@@ -16263,6 +16826,43 @@ msgstr "Aktivne veze"
 msgid "Click OK to close these connections and go offline"
 msgstr "Odaberite OK za prekid ovih veza"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Konatkti: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Pošta:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "Za_duženja:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Vrsta mape"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Otvaranje mape drugog korisnika"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Račun:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Ime mape: "
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Korisnik:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
@@ -16305,6 +16905,18 @@ msgstr ""
 "\n"
 "Pritisnite gumb \"Primjeni\" da sačuvate vaša podešavanja. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolucija konzola"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution Test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Probni dio Evolutiona"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Odaberite \"Uvezi\" za početak uvoza datoteke u Evolution."
@@ -16364,13 +16976,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može uvesti podatke iz sijedećih datoteka:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16399,57 +17011,48 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaše doprinose!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Hvala\n"
 "The Ximian Evolution Team\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovno reći"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ne mogu pokreniti Ximian Evolution ljusku : %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evolution aktiviranjem određene komponente"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve dijelove evolutiona"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Inzistiraj na ponovnoj migraciji iz Evoultion 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih komponenti u datoteku."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16458,13 +17061,79 @@ msgstr ""
 "%s: --online i --offline se ne mogu koristiti zajedno.\n"
 "  Za više informacija, upišite %s.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Povezivanje"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ne mogu pristupiti ljusci Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Pomoćnik Evolution računa"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Certificate Name"
 
@@ -16694,11 +17363,6 @@ msgstr "You have certificates on file that identify these people:"
 msgid "Your Certificates"
 msgstr "Vaše potvrde"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Certifikat već postoji"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16889,6 +17553,11 @@ msgstr "Jedinstveni ID subjekta"
 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
+msgid "Certificate already exists"
+msgstr "Certifikat već postoji"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 datoteka s lozinkama"
@@ -16928,12 +17597,12 @@ msgstr "Predefinirani naslov poruke."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nisam mogao izvršiti \"%s\": %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
@@ -16997,7 +17666,8 @@ msgid "Select all contacts"
 msgstr "Odaberi sve kontakte"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Pošalji poruku odabranim kontaktima."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17028,8 +17698,8 @@ msgstr "Pregledaj tekući kontakt"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Akcije"
@@ -17047,7 +17717,8 @@ msgid "_Preview Pane"
 msgstr "_Prostor za pregled"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Sačuvaj kao VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17174,10 +17845,20 @@ msgstr "Pogledaj trenutni sastanak"
 msgid "Week"
 msgstr "Tjedan"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Radni tjedan"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otvori sastanak"
 
+#: 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 "_Zatvori"
+
 #: 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
@@ -17495,6 +18176,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Do_daj pošiljaoca u adresar"
@@ -17732,7 +18423,8 @@ msgid "Open the selected message in a new window"
 msgstr "Otvori odabranu poruku u novom prozoru"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Otvori odabranu poruku radi ponovnog slanja"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17847,58 +18539,46 @@ msgstr "VFolder na _Naslov..."
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiraj u mapu"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Napravi filter od poruke"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Veće"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Prikaz poruka"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Premjesti u mapu"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Slijedeća poruka "
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Normalan pri_kaz"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Otvori poruku"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_kao citate"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Ponovo poša_lji..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Alati"
@@ -17907,16 +18587,6 @@ msgstr "_Alati"
 msgid "_Undelete"
 msgstr "_Vrati obrisano"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Dodaj"
@@ -18307,6 +18977,11 @@ msgstr "_Brza referenca"
 msgid "_Send / Receive"
 msgstr "_Pošalji / Primi"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Prozor"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Prema _poduzeću"
@@ -18374,10 +19049,6 @@ msgstr "Datum krajnjeg roka:"
 msgid "With _Status"
 msgstr "Postavi status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zadaci"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18535,6 +19206,35 @@ msgstr "Ostalo..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolucija pošta"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informacije o sastanku"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution Test"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Prošireno"
@@ -18649,6 +19349,35 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "_Traži sad"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 već postoji\n"
+"Želite li  prepisati preko njega?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Ne mogu spremiti u `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Ne mogu spremiti u `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18659,13 +19388,150 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% dovršeno)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Preglednik direktorija Evolution adresara"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "_Adresa 2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Preglednik Evolution kalendara"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Preglednik Evolucija zadataka"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Ne mogu pokrenuti gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nisam mogao otvoriti direktorij u '%s"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI koju će kalendar pokazati"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Tip pogleda za prikaz"
+
+#~ msgid "Display a message"
+#~ msgstr "Pokaži poruku"
+
+#~ msgid "Alerts"
+#~ msgstr "Uzbune"
+
+#~ msgid "Time"
+#~ msgstr "Vrijeme"
+
+#~ msgid "_General"
+#~ msgstr "_Općenito"
+
+#~ msgid "calendar"
+#~ msgstr "kalendar"
+
+#~ msgid "task list"
+#~ msgstr "popis zadataka"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Datoteka kalendara nije se mogla ažurirati!\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
 #~ msgstr ""
-#~ "Adresar '%s' će biti uklonjen. Jeste li sigurni da želite nastaviti?"
+#~ "Podrška zadataka za\n"
+#~ "%s\n"
+#~ " je prestala raditi."
 
-#~ msgid "New Address Book"
-#~ msgstr "Novi adresar"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI za prikaz direktorija zadataka"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Ne mogu učitati poslove u `%s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Preglednik za direktorije Evolucija pošte"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder na niti"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtar na niti"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Nije uspjela migracija pop3 uid međuspremnika: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Neuspjelo migriranje proširenog stanja mape: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Nisam uspio otvoriti spremište za `%s': %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI poruke koju će pogled pokazati"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Uobičajena grupa kratica"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Uobičajena širina za ploču trake kratica"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Putanja do uobičajene mape kalendara"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Putanja do uobičajene mape kontakata"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Putanja do uobičajene mape e-pošte"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Putanja do uobičajene mape zadataka"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Fizički URI do uobičajene mape kalendara"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Fizički URI do uobičajene mape kontakata"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Fizički URI do uobičajene mape e-pošte"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Fizički URI do uobičajene mape zadataka"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Treba li pokazati traku mapa"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Treba li pokazati traku kratica"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Upozorenje: Evolution ne može nadograditi sve vaše podatke iz inačice  %d."
+#~ "%d.%d.\n"
+#~ "Podaci nisu obrisani, ali ih nećete moći vidjeti u ovoj inačici "
+#~ "Evolutiona.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ne mogu pokreniti Ximian Evolution ljusku : %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Ponovo poša_lji..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "UID izvora kontakata koje će pregled ispisati"
@@ -18835,9 +19701,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "S_pouse:"
 #~ msgstr "Su_pružnik:"
 
-#~ msgid "_Add"
-#~ msgstr "_Dodaj"
-
 #~ msgid "_Business:"
 #~ msgstr "_Posao:"
 
@@ -18961,15 +19824,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Datum isteka je prije datuma početka!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Početni datum"
-
-#~ msgid "Due Date:"
-#~ msgstr "Datum krajnjeg roka:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19001,13 +19855,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu kopirati opis datoteke: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19149,9 +19996,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Pogled koji pokazuje kada se kalendar pokreće"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Unesite lozinku za %s"
-
 #~ msgid "New task list"
 #~ msgstr "Novi popis zadataka"
 
@@ -19204,30 +20048,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Ne mogu naći navedenu dijeljenu mapu."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendar"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Pošta:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "Za_duženja:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Vrsta mape"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Otvaranje mape drugog korisnika"
-
-#~ msgid "_Account:"
-#~ msgstr "_Račun:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Ime mape: "
-
-#~ msgid "_User:"
-#~ msgstr "_Korisnik:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Stvori novi prozor"
 
@@ -19264,9 +20084,6 @@ msgstr "%s (%d%% dovršeno)"
 #~ msgid "[script]"
 #~ msgstr "[script]"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Sljedeće veze su trenutno aktivne:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Potraži kontakte"
 
diff --git a/po/hu.po b/po/hu.po
index ca3cd80fb4..f577fcb1a3 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Címjegyzék"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Névjegyek: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Összefoglaló"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,16 +57,6 @@ msgstr "kártya"
 msgid " card"
 msgstr "1 kártya"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Névjegyek: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution Összefoglaló"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Alapértelmezett szinkronizálási cím:"
@@ -72,67 +72,20 @@ msgstr "%s betöltése sikertelen: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nem sikerült a pilot Address application blokkját olvasni"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Névkiegészítési mappák"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "_Tanúsítványazonosító:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Postafiókok beállítása"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Névjegyek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Címjegyzék"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Címjegyzék előugró címek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Címjegyzék címnéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Címjegyzék kártyanéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Címjegyzék komponens"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Címjegyzék mappanéző"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution Levelező beállító kontroll"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution mappabeállító kontroll"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Sikertelen hitelesítés.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sÍrd be %s jelszavát (%s felhasználó)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -173,42 +126,46 @@ msgstr "_Névjegyek:"
 msgid "Create a new contacts group"
 msgstr "Új indítócsoport létrehozása"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Várakozás..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s pingelése"
@@ -216,8 +173,8 @@ msgstr "%s pingelése"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -225,7 +182,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Személyes"
@@ -275,20 +232,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Csatlakozás az LDAP-kiszolgálóhoz névtelenül"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Sikertelen hitelesítés.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Címjegyzék"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sÍrd be %s jelszavát (%s felhasználó)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -308,6 +287,63 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Névkiegészítési mappák"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Névjegyek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Tanúsítványazonosító:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Postafiókok beállítása"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Címjegyzék"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Címjegyzék előugró címek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Címjegyzék címnéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Címjegyzék kártyanéző"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Címjegyzék komponens"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution Levelező beállító kontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution mappabeállító kontroll"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  _Támogatott típusok lekérdezése"
@@ -329,6 +365,7 @@ msgstr "  _Támogatott típusok lekérdezése"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -401,7 +438,7 @@ msgstr "_Névjegyek:"
 msgid "Address Book Properties"
 msgstr "Címjegyzék forrásai"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Mindig"
@@ -416,109 +453,99 @@ msgid "Basic"
 msgstr "Alap"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "S_zínek"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Kapcsolódás"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: 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:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Megkülönböztető _név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Támogatott keresési típusok"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Általános"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Soha"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Egy"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Szín kiválasztása"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: 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:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Keresés _hatóköre: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Keresés"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -528,7 +555,7 @@ msgstr ""
 "csatlakozik \n"
 "az LDAP-kiszolgálóhoz, ha az támogatja az SSL vagy TLS protokollt."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -546,7 +573,7 @@ msgstr ""
 "kapcsolat\n"
 "már eleve biztonságos."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -560,19 +587,19 @@ msgstr ""
 "sebezhetővé \n"
 "válik a külső támadásokkal szemben."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Al"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Támogatott keresési típusok"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -583,7 +610,7 @@ msgstr ""
 "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:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -599,13 +626,13 @@ 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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -616,7 +643,7 @@ msgstr ""
 "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:63
+#: 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 "
@@ -627,7 +654,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -636,7 +663,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -647,128 +674,136 @@ msgstr ""
 "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:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Időformátum:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Megkülönböztető névvel (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "E-mail cím használatával"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Amikor csak lehetséges"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Névjegyek:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Letöltési korlát:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-mail cím:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Bejelentkezési mód:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Név:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Portszám:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritás:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Keresés _kiindulópontja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Kiszolgáló neve:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Kiszolgáló:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Szundi idő (percek)"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Biztonságos kapcsolat használata (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kártya"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "percenként"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Címjegyzék névkiválasztó felülete"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Mindet eltávolítja"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Eltávolítás"
 
+#: 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 "Név"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Mindet eltávolítja"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Névjegylista megtekintése"
@@ -791,23 +826,15 @@ msgstr "Hozzáadás a címjegyzékhez"
 msgid "Unnamed Contact"
 msgstr "Névtelen névjegy"
 
-#: 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
-msgid "Name"
-msgstr "Név"
-
 #: 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
 msgid "Source"
 msgstr "Forrás"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Címjegyzék névkiválasztó felülete"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -879,143 +906,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "_2. cím:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Cím:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "É_vforduló:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asszisztens"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Születésna_p:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bologna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "_Naptár:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Város:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Vállalat"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Névjegyszerkesztő"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Ors_zág:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Osztály:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "S_zabad-foglalt URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Teljes név..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Otthoni"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-mail cím összefésülése"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Főnök"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Be_cenév:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Felje_gyzések:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Egyéb"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postafiók:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1043,9 +1070,9 @@ msgstr "Oldal"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Munka"
@@ -1078,23 +1105,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Biztos vagy benne, hogy eltávolítod\n"
+"ezeket a névjegyeket?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Biztos vagy benne, hogy\n"
+"eltávolítod ezt a névjegyet?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Szerkeszthető"
 
@@ -2073,98 +2116,116 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Szolgáltatás rendelkezésre áll"
-
-#: 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 "Hely:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Felhasználónév:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Csoport"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Forrás"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Új névjegy"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Írható mező"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Megváltoztatva"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ez a névjegy az alábbi kategóriákhoz tartozik:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
+
+#: 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-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 "Szolgáltatás rendelkezésre áll"
+
+#: 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 "Hely:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Felhasználónév:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Gyors névjegy hozzáadás"
@@ -2182,22 +2243,6 @@ msgstr "_Teljes név:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Biztos vagy benne, hogy eltávolítod\n"
-"ezeket a névjegyeket?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Biztos vagy benne, hogy\n"
-"eltávolítod ezt a névjegyet?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. cím:"
@@ -2347,8 +2392,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Címjegyzék"
 
@@ -2409,6 +2454,465 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Haladó keresés"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Tagok"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Szervezet"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Csoport"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Munka"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Személyes"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Megjegyzés"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Beosztás"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Otthoni fax"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Sikerült"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Kapcsolat nélküli tároló"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Hozzáférés megtagadva"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, 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
+#, 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
+msgid "Protocol not supported"
+msgstr "A protokoll nem támogatott"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Megszakítva"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Hitelesítés sikertelen"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Hitelesítés szükséges"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Nincs ilyen levél"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Egyéb hiba"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy \n"
+"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
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy \n"
+"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
+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 ""
+"Ennek a keresésnek az eredménye több kártya, mint \n"
+"amennyi visszaadására ezt a kiszolgálót beállították vagy \n"
+"az Evolution megjeleníteni képes. Kérlek, határozd meg pontosabban\n"
+"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
+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 ""
+"Ennek a lekérdezésnek az elvégzése meghaladja a kiszolgáló vagy ennek\n"
+"a címjegyzéknek az időkorlátját. Szűkítsd jobban a keresési\n"
+"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
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Hiba a kártya hozzáadásakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Hiba a lista módosításakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Hiba a kártya módosításakor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Hiba a kártya törlésekor"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"A %d névjegyek megnyitásával egyidejűleg megnyitásra\n"
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s már létezik\n"
+"Szeretnéd felülírni?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Névjegy áthelyezése"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Névkártya másolása a következő helyre"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Névjegyek áthelyezése"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Névjegyek másolása"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Névjegyek kijelölése a címjegyzékből"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Több VKártya"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VKártyája"
+
+#.
+#. * 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 "(nincs)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Elsődleges e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "2. e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "3. e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Válassz egy műveletet"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Új névjegy készítése: %s"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Cím hozzáadása a létező %s névjegyhez"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "A címjegyzék lekérdezése..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Névjegy adatainak szerkesztése"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "E-mail cím összefésülése"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "és egy másik kártya"
+msgstr[1] "és egy másik kártya"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Teljes _fejléc megjelenítése"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Névjegy mentése VCard-ként"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Mentés a címjegyzékbe"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2424,8 +2928,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Lekérdezés"
 
@@ -2480,9 +2984,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Mentés VCard-ként"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2550,7 +3055,7 @@ msgid "Cut"
 msgstr "Kivágás"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2561,18 +3066,8 @@ msgstr "Másolás"
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Törlés"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktuális nézet"
 
@@ -2589,7 +3084,7 @@ msgstr ""
 "felületet"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Bármelyik kategória"
@@ -2630,21 +3125,6 @@ msgstr "Kategóriák"
 msgid "Company Phone"
 msgstr "Céges telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "2. e-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "3. e-mail"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Családi név"
@@ -2684,29 +3164,14 @@ msgstr "Jordánia"
 msgid "Manager"
 msgstr "Főnök"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Becenév"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Megjegyzés"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Hivatal"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Szervezet"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Egyéb fax"
@@ -2760,21 +3225,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Webhely"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Szélesség"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Magasság"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Fókuszban"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Kiválasztva"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Megmutatva"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Mező"
@@ -2791,10 +3264,6 @@ msgstr "Szöveg minta"
 msgid "Max field name length"
 msgstr "Mezőnév maximális hosszúsága"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Oszlop szélessége"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2823,439 +3292,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Csatlakozó"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Kiválasztva"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Megmutatva"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Tagok"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Csoport"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Munka"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Személyes"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Beosztás"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Otthoni fax"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Sikerült"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Kapcsolat nélküli tároló"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Hozzáférés megtagadva"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, 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:59
-#, 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:60
-msgid "Protocol not supported"
-msgstr "A protokoll nem támogatott"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Megszakítva"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Hitelesítés sikertelen"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Hitelesítés szükséges"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nincs ilyen levél"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Egyéb hiba"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy \n"
-"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:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nem sikerült megnyitni ezt a címjegyzéket. Ez vagy \n"
-"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:140
-msgid "Unable to open addressbook"
-msgstr "Nem sikerült megnyitni a címjegyzéket"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Ennek a keresésnek az eredménye több kártya, mint \n"
-"amennyi visszaadására ezt a kiszolgálót beállították vagy \n"
-"az Evolution megjeleníteni képes. Kérlek, határozd meg pontosabban\n"
-"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:167
-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 ""
-"Ennek a lekérdezésnek az elvégzése meghaladja a kiszolgáló vagy ennek\n"
-"a címjegyzéknek az időkorlátját. Szűkítsd jobban a keresési\n"
-"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:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Ez a keresés nem volt sikeres."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Mented a változtatásokat?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Elvetés"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Hiba a lista hozzáadásakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Hiba a kártya hozzáadásakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Hiba a lista módosításakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Hiba a kártya módosításakor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Hiba a lista törlésekor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Hiba a kártya törlésekor"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"A %d névjegyek megnyitásával egyidejűleg megnyitásra\n"
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s már létezik\n"
-"Szeretnéd felülírni?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Felülírás"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Névjegy áthelyezése"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Névkártya másolása a következő helyre"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Névjegyek áthelyezése"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Névjegyek másolása"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Névjegyek kijelölése a címjegyzékből"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Több VKártya"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VKártyája"
-
-#.
-#. * 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 "(nincs)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Elsődleges e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Válassz egy műveletet"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Új névjegy készítése: %s"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Cím hozzáadása a létező %s névjegyhez"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "A címjegyzék lekérdezése..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Névjegy adatainak szerkesztése"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-mail cím összefésülése"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "és egy másik kártya"
-msgstr[1] "és egy másik kártya"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Teljes _fejléc megjelenítése"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Névjegy mentése VCard-ként"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Mentés a címjegyzékbe"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Oszlop szélessége"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3299,11 +3338,6 @@ msgstr "Evolution VCard-importáló"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Boríték nyomtatása"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3315,6 +3349,11 @@ msgstr "Kijelölt névjegyek nyomtatása"
 msgid "Print contact"
 msgstr "Kijelölt névjegyek nyomtatása"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Boríték nyomtatása"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3501,18 +3540,6 @@ msgstr "_Címlista"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nem lehet megnyitni a levelet"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "A kártya nem található"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3570,6 +3597,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nem lehet megnyitni a levelet"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "A kártya nem található"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Hiba az alapértelmezett címjegyzék betöltése közben."
@@ -3582,11 +3621,12 @@ msgstr "Bemeneti fájl"
 msgid "No filename provided."
 msgstr "Nincs fájlnév megadva."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Névtelen lista"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Írd be a jelszót"
@@ -3619,120 +3659,55 @@ msgstr "Alapértelmezett prioritás:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nem sikerült a pilot Calendar ToDo blokkját olvasni"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Naptár és Feladatok"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Naptár"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Állítsd be a Naptárhoz és a Feladatlistához tartozó időzónát."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Naptár és Feladatok"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Naptár beállító kontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Naptár ütemezőüzenet-megtekintő"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Naptár nézőke"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Naptár/Feladat szerkesztő"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Feladatnéző"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution Naptár és Feladatok komponens"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution Teszt komponens"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Feladatok"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Naptár riasztó szolgáltatás"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Kezdet:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Vég:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution ébresztő"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Ébresztő %s-kor"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Bezárás"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "S_zundi"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Szundi idő (percek)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Találkozó szerkesztése"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "S_zundi"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Megnyitás"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nincs leírás."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3741,12 +3716,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Figyelmeztetés"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3758,7 +3733,7 @@ msgstr ""
 "lett beállítva. Az Evolution a szokásos emlékeztető\n"
 "párbeszédablakot fogja ehelyett megjeleníteni."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3775,19 +3750,19 @@ msgstr ""
 "\n"
 "Biztosan futtatni szeretnéd ezt a programot?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ne kérdezzen meg többet ezzel a programmal kapcsolatban."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Naptár riasztó szolgáltatás"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "A Bonobo inicializálása sikertelen"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "A gnome-vfs inicializálása nem sikerült"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nem sikerült létrehozni az riasztó szolgáltatás factoryját"
 
@@ -3900,61 +3875,46 @@ 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 "_Megerősítés kérése elemek törlésekor"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Megerősítés kérése elemek törlésekor"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Befejezett feladatok törlése"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Hét _számának megjelenítése a dátumnavigátorban"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Összefoglaló tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Leírás tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Megjegyzés tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Leírás tartalmazza"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Ki nem válogatott"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Naptár"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3966,123 +3926,134 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a feladatokat?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "visszatér kisebb mint"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "naponként"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%Y %B %d, %A"
 
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%b %d, %a"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 "%Y %b %d, %a"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%Y %B %d"
 
 #. 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:464
+#: 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 "%B %d"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Tulajdonságok..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Naptár betöltése folyamatban..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Naptár"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Új találkozó"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Találkozó"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Új találkozó létrehozása"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "É_rtekezlet"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Új értekezlet összehívási kérés létrehozása"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Új egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Egész napos találkozó"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Új egész napos esemény létrehozása"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Új-Kaledónia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Naptár:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Új mappa létrehozása"
@@ -4113,15 +4084,36 @@ msgstr "Hétnézet"
 msgid "Month View"
 msgstr "Hónapnézet"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Összefoglaló tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Leírás tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Megjegyzés tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Leírás tartalmazza"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Ki nem válogatott"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Hiba történt a naptár megnyitása közben"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "A metódus nem támogatott a naptár megnyitása közben"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Hozzáférés megtagadva a naptár megnyitásához"
 
@@ -4130,19 +4122,6 @@ msgstr "Hozzáférés megtagadva a naptár megnyitásához"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nem sikerült megnyitni a mappát '%s'-ben"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "Az URI, amit a naptár megjelenít"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "A megjelenítendő nézettípus"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Hangos riasztás beállításai"
@@ -4208,7 +4187,7 @@ msgstr "-szer minden"
 msgid "hours"
 msgstr "óránként"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4227,14 +4206,14 @@ msgstr "Alapok"
 msgid "Date/Time:"
 msgstr "Dátum és idő:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Levél megjelenítése"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Hangjelzés"
 
+#: 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 "Emlékeztetők"
@@ -4249,6 +4228,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
 msgid "Summary:"
 msgstr "Összefoglaló:"
@@ -4287,10 +4267,109 @@ msgstr "perc"
 msgid "start of appointment"
 msgstr "találkozó kezdete"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Új-Kaledónia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Feladatlista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Új-Kaledónia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Típus:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "hét"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Engedélyezve"
 
@@ -4306,19 +4385,19 @@ msgstr "Ne importálja"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Tiltás"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Engedélyezés"
 
@@ -4343,163 +4422,177 @@ msgid "60 minutes"
 msgstr "60 perc"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Figyelmeztetések"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Határidő:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Határidő:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Feladatlista"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Határidő:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Határidő:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Naptár és Feladatok beállításai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "A lejárt határidejű feladatok színe"
 
-#: 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 "A mai határidejű feladatok színe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Nap _vége:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "nappal"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Megjelenítés"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "E_ngedélyezés"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Péntek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "órával"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "perccel"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Hétfő"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_V"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Szombat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Emlékeztető megjelenítése"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Hét _számának megjelenítése a dátumnavigátorban"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Vasárnap"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "M_ai határidejű feladatok:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Cs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Feladatlista"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Csütörtök"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Idő"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Idő_zóna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Időformátum:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Kedd"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Hét kezdete:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Szerda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Munkahét"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Munkanapok:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 órás (de/du)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 órás"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Hozzáadás"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Megerősítés kérése elemek törlésekor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "A hétvégék össze_nyomása a hónapnézetben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Nap kezdete:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Megjelenítés"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4509,145 +4602,46 @@ msgstr "_Megjelenítés"
 msgid "_Edit"
 msgstr "S_zerkesztés"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Szabad/foglalt kérés"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_P"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "Á_ltalános"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Befejezett feladatok elrejtése"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_H"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Lejárt határidejű feladatok:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "S_zo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Találkozók _végpontjának megjelenítése a heti és a hónapnézetben"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Időo_sztások:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_K"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Sze"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "minden találkozó előtt"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Új-Kaledónia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Feladatlista"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iCalendar hiba"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Új-Kaledónia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Típus:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "hét"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4728,82 +4722,82 @@ msgstr "%s  Változtattál. Elveted a változásokat, és frissíted a szerkeszt
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nem változtattál, frissíted a szerkesztőt?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Érvényesítési hiba: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " - "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Befejezve"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Befejezve"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Esedékes "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Esedékes "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nem sikerült frissíteni az objektumot"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Találkozó szerkesztése"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Időpont - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Feladat - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Napló bejegyzés - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nincs összegzés"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Mentés másként..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Ennek a tételnek a módosításai felülírásra kerülhetnek egy beérkezett "
 "frissítés által"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nem sikerült megszerezni a legfrissebb változatot!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Érvényesítési hiba: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " - "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Befejezve"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Befejezve"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Esedékes "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Esedékes "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4931,27 +4925,27 @@ msgstr "A feladat végrehajtója:"
 msgid "Enter Delegate"
 msgstr "Végrehajtó megadása"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Találkozó"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Emlékeztető"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Ismétlődés"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Ütemezés"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Értekezlet"
 
@@ -4964,7 +4958,7 @@ msgstr "A lejárat dátuma a kezdő dátum előtt van!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Hibás a kezdés dátuma"
 
@@ -5050,10 +5044,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5072,15 +5066,15 @@ msgstr "A szervezőt be kell állítani."
 msgid "At least one attendee is required."
 msgstr "Legalább egy résztvevő szükséges."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Feladatkiadás..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5364,27 +5358,19 @@ msgstr "_Változások elvetése"
 msgid "Save Event"
 msgstr "Esemény mentése"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Válassz importálót"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Címzett címe"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Naptár"
+msgid "_Destination"
+msgstr "Mappa törlése"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Új feladat"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Feladatlista"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5412,38 +5398,44 @@ msgid "% _Complete"
 msgstr "% kész"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Befejezve"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Magas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Folyamatban"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Alacsony"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normál"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nem indult még el"
 
@@ -5480,11 +5472,11 @@ msgstr "_Weblap címe:"
 msgid "Assignment"
 msgstr "Kiosztás"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "A lejárat dátuma érvénytelen"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nem sikerült megnyitni a címjegyzéket"
@@ -5493,8 +5485,9 @@ msgstr "Nem sikerült megnyitni a címjegyzéket"
 msgid "Con_fidential"
 msgstr "Bi_zalmas"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Leírás:"
@@ -5649,101 +5642,56 @@ msgstr "%s %s-kor"
 msgid "%s for an unknown trigger type"
 msgstr "%s ismeretlen kiváltó okra"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Nyilvános"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Személyes"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Bizalmas"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Határidő"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Kezdés dátuma"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Összefoglaló"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Szabad"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Foglalt"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "É"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Kattints ide új feladat hozzáadásához"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "D"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Névtelen"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "K"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Ke_zdés dátuma:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Ny"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Le_járat:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"A földrajzi pozíció megadása a következő formátumban lehetséges: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Állapot:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritás:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nem"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Weblap címe:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ismeretlen"
+#: 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 "Nyilvános"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Ismétlődő"
+#: 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 "Személyes"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Hozzárendelve"
+#: 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 "Bizalmas"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5789,17 +5737,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Szabad"
+
+#: 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 "Foglalt"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Kijelölt objektumok törlése"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Megnyitás"
 
@@ -5809,41 +5766,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Beillesztés"
 
@@ -5901,78 +5859,157 @@ msgstr "Prioritás"
 msgid "Start date"
 msgstr "Kezdés dátuma"
 
+#: 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 "Összefoglaló"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Feladatrendezés"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Új _találkozó..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Ú_j egész napos esemény"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Új értekezlet"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Új feladat"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "_Szál kijelölése"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Törlés..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Mappába másolás..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Á_thelyezés mappába..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Értekezlet _tervezése..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Továbbítás iCalendarként..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Az _előfordulás törlése"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Az ö_sszes előfordulás törlése"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Ugrás a _mai napra"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Ugrás dátumra..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Beállítások..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Határidő"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Ismeretlen"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Ismétlődő"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nem"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "É"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "K"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Ny"
+
+#: 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 ""
+"A földrajzi pozíció megadása a következő formátumban lehetséges: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5996,36 +6033,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i perces osztá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/print.c:838
+msgid "am"
+msgstr "de"
+
+#. 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 "du"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 "%B %d, %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 "%b %d"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "de"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "du"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i perces osztás"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6133,10 +6170,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Nincs</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Állapot:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6166,7 +6199,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6379,62 +6412,58 @@ msgstr "A melléklet nem tartalmaz érvényes naptárüzenetet"
 msgid "The attachment has no viewable calendar items"
 msgstr "A melléklet nem tartalmaz megnézhető naptárelemet"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "A naptárfájlt nem lehetett frissíteni!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Frissítés kész\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Az elem nem található\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "A résztvevő állapota frissítve\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 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:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Törlés befejezve"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Elküldve!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Az elemet nem lehetett elküldeni!\n"
 
@@ -6551,28 +6580,6 @@ msgstr "Delegált"
 msgid "In Process"
 msgstr "Folyamatban"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%Y %B %d, %A"
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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 "%Y/%m/%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nincs bent"
@@ -6633,7 +6640,34 @@ msgstr "Megbeszélés _kezdődik:"
 msgid "Meeting _end time:"
 msgstr "Megbeszélés _vége:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 "%Y %B %d, %A"
+
+#. 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"
+
+#. 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 "%Y/%m/%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Írd be %s jelszavát"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6642,21 +6676,19 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Feladatok megnyitása %s-kor"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6665,53 +6697,109 @@ msgstr ""
 "Hiba a következőben %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Képek betöltése"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Feladatok befejezése..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Kijelölt objektumok törlése..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Tisztítás"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Feladatok"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nincsenek találkozók."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Képek betöltése"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Megnyitás ezzel: %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Naptár és Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Állítsd be a Naptárhoz és a Feladatlistához tartozó időzónát."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Naptár és Feladatok"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Naptár beállító kontroll"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Naptár ütemezőüzenet-megtekintő"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Naptár/Feladat szerkesztő"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution Naptár és Feladatok komponens"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Teszt komponens"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Naptár"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Feladatok"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "április"
@@ -6849,6 +6937,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Hozzáférés megtagadva a naptár megnyitásához"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nem sikerült megnyitni a címjegyzéket"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7068,7 +7173,7 @@ msgid "Contacts: "
 msgstr "Névjegyek: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Nyomtatási kép"
 
@@ -7080,68 +7185,78 @@ msgstr "Elem nyomtatása"
 msgid "Print Setup"
 msgstr "Nyomtatás beállítása"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Feladatlista"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Képek betöltése"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Feladat"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Új feladat"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Feladatlista"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Új feladat létrehozása"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "A megjelenítendő feladatmappa URI-ja"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nem sikerült betölteni a feladatot %s-be."
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7153,11 +7268,11 @@ msgstr ""
 "\n"
 "Valóban törlöd ezeket a feladatokat?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ne kérdezze meg többet."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Feladatok nyomtatása"
 
@@ -8806,7 +8921,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "%s mappa előkészítése a kapcsolat nélküli módhoz"
@@ -8899,33 +9014,6 @@ msgstr "Érvénytelen argumentumok (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Hiba a szűrt keresés végrehajtása közben: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nem sikerült értelmezni a keresőkifejezést:  %s\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Hiba a keresési kifejezés végrehajtása közben: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "a (match-all) egy darab logikai eredményt vár"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8958,7 +9046,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "%d levél letöltése"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nem sikerült értelmezni a keresőkifejezést:  %s\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Hiba a keresési kifejezés végrehajtása közben: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "a (match-all) egy darab logikai eredményt vár"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, 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
+#, 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
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Lekérdezés futtatása ismeretlen fejlécen: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8969,15 +9102,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "A gpg felhasználói azonosító sikertelen elemzése."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "A gpg jelmondat kérés sikertelen elemzése"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8986,28 +9119,28 @@ msgstr ""
 "Meg kell adnod a jelmondatot \"%s\"\n"
 "titkos kulcsának érvényesítéséhez."
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Megszakítva"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "A titkos kulcs érvényesítéséhez 3 alkalommal adtál meg rossz jelmondatot."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nem várt válasz a GnuPG részéről: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Sikertelen titkosítás: Nincs érvényes címzett megadva."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9018,89 +9151,69 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Sikertelen GPG-zés: %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Nem sikerült az adatok kiírása: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "A %s levél dekódolása sikertelen."
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "A gpg végrehajtása sikertelen."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ez az üzenetrész digitális aláírással van ellátva"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Nem lehet ellenőrizni a levél aláírását: nem sikerült létrehozni az "
 "ideiglenes fájlt: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nem lehet ellenőrizni a levél aláírását: nem sikerült létrehozni az "
 "ideiglenes fájlt: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ez az üzenetrész digitális aláírással van ellátva"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Szövegtörzs indexelése"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nem sikerült felépíteni a zároló segédcsővezetéket: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nem sikerült forkolni a zároló segédet: %s"
-
-#: 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 "Nem sikerült '%s' zárolása: segédzároló protokollhiba"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nem sikerült a zárolás: %s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9121,6 +9234,26 @@ msgstr "Sikertelen zárolás az fcntl(2) használatával: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Sikertelen zárolás az flock(2) használatával: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nem sikerült felépíteni a zároló segédcsővezetéket: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nem sikerült forkolni a zároló segédet: %s"
+
+#: 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 "Nem sikerült '%s' zárolása: segédzároló protokollhiba"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nem sikerült a zárolás: %s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9380,7 +9513,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Rossz hitelesítési válasz a kiszolgálótól"
 
@@ -9581,7 +9714,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Tanúsítványazonosító:"
 
 #: camel/camel-smime-context.c:360
@@ -9598,7 +9731,7 @@ msgstr "Nem sikerült létrehozni az S/MIME dekódoló részt."
 msgid "Failed to add data to CMS encoder"
 msgstr "Nem sikerült hozzáírni a helyi `Elküldött elemek' mappához: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Sikertelen hitelesítés.\n"
@@ -9669,99 +9802,99 @@ msgstr "Nem sikerült betölteni a mappát: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Nem sikerült betölteni a levelet: %s:  %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Tanúsítványaláírás-hiba"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Aláírás szerkesztése"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Kiszolgáló: %s,  Típus: %s "
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Az IMAP-parancs sikertelen: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nem található \"%s\" tanúsítványa."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Nem sikerült \"common bulk\" algoritmust találni."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "S_zabály gyártása levélből"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nem sikerült létrehozni az S/MIME dekódoló részt."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "A parancs nincs megvalósítva"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9780,16 +9913,26 @@ 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, 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:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Kuka"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9912,7 +10055,7 @@ msgstr "A használatban lévő kulcs nem támogatja tanúsítvány aláírását
 msgid "Error in application verification"
 msgstr "Hiba az alkalmazás igazolásában"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9925,11 +10068,11 @@ msgstr ""
 "Ujjlenyomat:       %s\n"
 "Aláírás:           %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "JÓ"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "ROSSZ"
 
@@ -9953,7 +10096,7 @@ msgstr ""
 "Ennek ellenére elfogadod?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9969,7 +10112,7 @@ msgstr ""
 "\n"
 "Elfogadod?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9978,7 +10121,7 @@ msgstr ""
 "Tanúsítványprobléma: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9987,7 +10130,7 @@ msgstr ""
 "Hibás tanúsítványtartomány: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9996,7 +10139,7 @@ msgstr ""
 "A tanúsítvány lejárt: %s\n"
 "Kibocsátó: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10010,17 +10153,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nem sikerült értelmezni ezt az URL-t: `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Hiba `%s' tárolásakor: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nincs ilyen levél (%s) ezen a helyen: %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
@@ -10029,11 +10172,6 @@ msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mapp�
 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:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10050,10 +10188,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Új levelek keresése"
 
 #: 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 "Új levelek keresése az összes mappában"
@@ -10087,6 +10227,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10108,26 +10249,328 @@ msgstr ""
 msgid "Checklist"
 msgstr "Sűrű köd"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nem sikerült betölteni a mappát: %s: %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 "A kiszolgáló váratlanul szétkapcsolt: %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 "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nem lehet a levelet az mh mappához fűzni: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nem lehet a levelet az mh mappához fűzni: %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 ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\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 ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\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 ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\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 ""
+"Nem sikerült betölteni a(z) %s levelet a(z) %s mappából.\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 "Mappák"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Csak az előfizetett mappák megjelenítése"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "A kiszolgáló által nyújtott mappanevek felülbírálata"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Névtér"
+
+#: 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 "Levélolvasás és -tárolás IMAP-kiszolgálókon."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Ez a beállítás sima szöveges jelszóval létesít kapcsolatot az IMAP-"
+"kiszolgálóval."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %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:140
+#: 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 "Nem sikerült csatlakozni %s %d portjához: %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Kapcsolat megszakítva"
+
+#: 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"
+msgstr ""
+"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
+"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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
+"kiszolgálóhoz: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Ismeretlen hiba"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nem sikerült kapcsolódni a %s POP-kiszolgálóhoz. A kért hitelesítési "
+"mechanizmus nem támogatott."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sAdd meg %s@%s SMTP-jelszavát"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Sikertelen hitelesítés a(z) %s POP-kiszolgálón: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Héjparancs"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült törölni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nem sikerült átnevezni a mappát: %s: Érvénytelen művelet"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Váratlan válasz az IMAP-kiszolgálótól: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Nincsenek feladatok"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 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:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "A kiszolgáló váratlanul szétkapcsolt: %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:1089
-msgid "Unknown error"
-msgstr "Ismeretlen hiba"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10172,21 +10615,21 @@ msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 msgid "Could not load summary for %s"
 msgstr "Nem sikerült betölteni %s összefoglalóját"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "A mappa megsemmisült, és újra létre lett hozva a kiszolgálón."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Megváltozott levelek keresése"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nem lehet elhozni a levelet: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10202,25 +10645,25 @@ msgstr ""
 "Nem sikerült betölteni a levelet: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nincs ilyen levél"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ez a levél jelenleg nem elérhető"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Összefoglaló adatok letöltése az új levelekhez."
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nem található a levéltörzs a FETCH válaszban."
 
@@ -10262,23 +10705,6 @@ msgstr "Nem sikerült kapcsolatba lépni az LDAP-kiszolgálóval."
 msgid "Command:"
 msgstr "Héjparancs"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mappák"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Csak az előfizetett mappák megjelenítése"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "A kiszolgáló által nyújtott mappanevek felülbírálata"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Névtér"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Szűrők alkalmazása az új levelekre ennek a kiszolgálónak az INBOX-ában"
@@ -10301,88 +10727,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "%s IMAP-kiszolgáló"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-szolgáltatás a következőnek %s, ezen a címen: %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nem sikerült csatlakozni %s %d portjához: %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS nem elérhető"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Kapcsolat megszakítva"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nem sikerült biztonságos kapcsolattal kapcsolódni a(z) %s IMAP-"
-"kiszolgálóhoz: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Nem adtál meg jelszót."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10393,25 +10774,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nincs %s mappa."
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "A mappanév \"%s\"  nem érvényes, mert a \"%c\" karaktert tartalmazza."
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: 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 +10793,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ismeretlen szülőmappa: %s"
@@ -10525,58 +10899,58 @@ msgstr ""
 "fájlokban.\n"
 "Hasznos lehet Elm, Pine vagy Mutt típusú mappák olvasásakor."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s tárológyökér nem abszolút útvonal"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s tárológyökér nem közönséges könyvtár"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Nem sikerült betölteni a mappát: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "A helyi tárolók nem rendelkeznek Bejövő mappával"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "%s helyi levél fájl"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nem sikerült %s mappát %s névre átnevezni: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nem sikerült '%s' mappaösszegzőfájt törölni: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nem sikerült '%s' mappaindexfájlt törölni: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10642,7 +11016,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10979,7 +11353,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10988,8 +11362,8 @@ msgid "User cancelled"
 msgstr "Felhasználó megszakította"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10998,48 +11372,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Hiba a levelek automatikus mentése közben: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nem lehetséges másolni vagy áthelyezni leveleket egy virtuális mappába"
@@ -11162,7 +11536,7 @@ msgstr "Nem sikerült a csoportot letölteni: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Nem sikerült elküldeni a levelet: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11215,8 +11589,8 @@ msgstr "Nincs %s azonosítójú levél"
 msgid "Retrieving POP message %d"
 msgstr "%d. POP-levél letöltése"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Ismeretlen ok"
 
@@ -11671,7 +12045,7 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "melléklet"
 
@@ -11715,6 +12089,101 @@ msgstr "MIME-típus:"
 msgid "Suggest automatic display of attachment"
 msgstr "Javasolja a melléklet automatikus megjelenítését"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nem lehet megnyitni a levelet"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Névtelen levél)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Fájl megnyitása"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatikusan létrehozott"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Aláírás:"
+
+#: 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.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 "Levél írása"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nem sikerült létrehozni a szerkesztőablakot:\n"
+"Nem lehetett aktiválni a címkiválasztó kontrollt."
+
+#: 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 ""
+"Nem sikerült létrehozni a szerkesztőablakot:\n"
+"A HTML-szerkesztő komponens aktiválása sikertelen.\n"
+"Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
+"libgtkhtml van-e telepítve.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nem sikerült létrehozni a szerkesztőablakot:\n"
+"A HTML-szerkesztő komponens aktiválása sikertelen."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(A szerkesztő olyan nem szöveg jellegű üzenettörzset tartalmaz, melyet "
+"nem szerkeszthetsz.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Címzett címe"
@@ -11797,210 +12266,135 @@ msgstr "<kattints ide a mappa kiválasztásához>"
 msgid "Attach file(s)"
 msgstr "Fájl csatolása"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "M_indig írja alá az ebből a postafiókból kimenő leveleket"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Nem lehet megnyitni a levelet"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nem sikerült betölteni a levelet a szerkesztőből"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Névtelen levél)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Fájl megnyitása"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatikusan létrehozott"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Aláírás:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Levél írása"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Fájl csatolása a levélhez"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Nem sikerült létrehozni a szerkesztőablakot:\n"
-"Nem lehetett aktiválni a címkiválasztó kontrollt."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Nem sikerült létrehozni a szerkesztőablakot:\n"
-"A HTML-szerkesztő komponens aktiválása sikertelen.\n"
-"Ellenőrizd, hogy a megfelelő verziójú gtkhtml és\n"
-"libgtkhtml van-e telepítve.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Nem sikerült létrehozni a szerkesztőablakot:\n"
-"A HTML-szerkesztő komponens aktiválása sikertelen."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(A szerkesztő olyan nem szöveg jellegű üzenettörzset tartalmaz, melyet "
-"nem szerkeszthetsz.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Tényleg törölni akarod ezt a névtelen találkozót?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "_Következő olvasatlan levél"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Mented a változtatásokat?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nem sikerült csővezetéket létrehozni: %s"
+msgid "Don't Recover"
+msgstr "Ne importálja"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nem sikerült menteni az aláírásfájlt: %s"
+msgid "Recover"
+msgstr "Eltávolítás"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nem sikerült menteni az aláírásfájlt: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Változások elvetése"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Mented a változtatásokat?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Nem sikerül elmenteni az elemeket."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ne importálja"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Figyelem: Módosított levél"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Nem sikerül elmenteni az elemeket."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Tényleg törölni akarod ezt a névtelen találkozót?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Eltávolítás"
+msgid "Discard Changes"
+msgstr "_Változások elvetése"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Levél mentése másként..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nem sikerült csővezetéket létrehozni: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "_Következő olvasatlan levél"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nem sikerült menteni az aláírásfájlt: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Figyelem: Módosított levél"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Fájl csatolása a levélhez"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Be kell állítanod egy postafiókot, mielőtt levelet küldhetnél."
 
@@ -12134,7 +12528,8 @@ msgstr ""
 "A megadott néven már létezik fájl.\n"
 "Felülírod?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Felülírod a fájlt?"
 
@@ -12311,81 +12706,97 @@ msgstr "Idő megadása"
 msgid "_Filter Rules"
 msgstr "Szűrő szabályok"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Hiba a '%s' reguláris kifejezésben:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Értekezlet frissítése"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Kötelező kiválasztani a dátumot."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Megkülönböztető _név:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Meg kell adnod egy fájlnevet."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "%s mappa eltávolítása"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Kiosztás"
+msgid "Missing folder."
+msgstr "%s mappa eltávolítása"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Meg kell adnod egy mappát."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Nincs kiszolgáló kiválasztva."
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Hiba a '%s' reguláris kifejezésben:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Kötelező kiválasztani a dátumot."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Kiosztás"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Meg kell adnod a szűrő nevét."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Meg kell adnod a vmappa nevét."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Meg kell adnod egy fájlnevet."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Meg kell adnod egy mappát."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nincs kiszolgáló kiválasztva."
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12398,66 +12809,11 @@ msgstr "Fájl kiválasztása"
 msgid "<b>Then</b>"
 msgstr "<b>Határidő:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Mappa kiválasztása"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Fontos"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Teendő"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Később"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Teszt"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Szabály neve:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Névtelen"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Határidő:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Művelet végrehajtása,"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "ha minden feltétel teljesül"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ha bármelyik feltétel teljesül"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "bejövő"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "kimenő"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12549,6 +12905,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Később"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Teszt"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Szabály neve:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Határidő:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ha minden feltétel teljesül"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ha bármelyik feltétel teljesül"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Művelet végrehajtása,"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegált"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Címzettek"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Válasz"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Beleértve:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "bejövő"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "kimenő"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12679,7 +13106,7 @@ msgstr "nem megjelölt"
 msgid "Junk Test"
 msgstr "június"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Címke"
@@ -12719,7 +13146,7 @@ msgstr "Kilépés a programból"
 msgid "Play Sound"
 msgstr "Hangjelzés"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Olvasott"
 
@@ -12789,9 +13216,9 @@ msgstr "kezdete"
 msgid "Stop Processing"
 msgstr "Feldolgozás leállítása"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12854,106 +13281,62 @@ msgstr "A tárgy nem tartalmazza"
 msgid "Virtual _Folders"
 msgstr "Virtuális mappák"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Hozzáadás"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VMappa-forrás"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Levélszerkesztő beállításai"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Itt állíthatod be a levelezés tulajdonságait, beleértve a biztonsági és "
-"üzenet képernyőket is."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Itt állíthatod be a helyesírás ellenőrzést, az aláírásokat és a "
-"levélszerkesztőt"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Postafiókok beállítása"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Levelező"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Levelező postafiók-beállító kontroll"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Levelező komponens"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution levélszerkesztő"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Levelezés levélszerkesztő beállító kontrollja"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Levelező mappamegjelenítő"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Levelező beállító kontroll"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Levél"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Postafiókok"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Levelezés beállításai"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Alapértelmezett]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Postafiók neve:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Névtelen"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Nyelv(ek)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Aláírás hozzáadása"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Aláírás(ok)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Továbbított levél"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "_Virtuális mappa gyártása a keresésből"
 
@@ -12991,274 +13374,454 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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."
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Mappanév:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VMappák"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Beérkezett levelek"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Betöltés..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Áthelyezés"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "A feladat lemondása"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Válassz mappát"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Másolás"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" mappa átnevezése erre:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Mappa átnevezése"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Nézet"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Megnyitás új ablakban"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Áthelyezés"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "Új _mappa..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Á_tnevezés"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VMappák"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Beérkezett levelek"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "S_zerkesztés új levélként..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Nyomtatás"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Válasz a _listának"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Válasz _mindenkinek"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Továbbítás"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Követés..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Befejezve _Jelölő"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Jelölő törlése"
 
-#: mail/em-folder-view.c:787 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 "_Elolvasva"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Nem fontos"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "_Olvasatlan"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "_Fontos"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Visszaállítás"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Á_thelyezés mappába..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Másolás mappába..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "_Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "_Szűrők alkalmazása"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Szűrő szabályok"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "S_zabály gyártása levélből"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VMappa a _tárgyra"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VMappa a _feladóra"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VMappa a _címzettekre"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VMappa a _levelezőlistára"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "VMappa a _feladóra"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Szű_rő a tárgyra"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Szűrő a f_eladóra"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Szűrő a _címzettekre"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Szűrő a _levelezőlistára"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Szűrő a f_eladóra"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Alapértelmezett"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Levél nyomtatása"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Hivatkozás címének másolása"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kattints ide új feladat hozzáadásához"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Feladó"
+
+#: 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 "Válaszcím"
+
+#: 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 "Címzett"
+
+#: 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 "Másolat"
+
+#: 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 "Rejtett másolat"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s melléklet"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nem támogatott séma"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nem lehet ellenőrizni a levél aláírását"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nem lehet ellenőrizni a levél aláírását"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Kattints ide új feladat hozzáadásához"
+msgid "Retrieving `%s'"
+msgstr "%s levél letöltése"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Hozzárendelve"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Aláírás szerkesztése"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Aláírás mentése"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Megszakítva"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP titkosítás"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Hibás külső törzsrész."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Mutató FTP-helyre (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Mutató helyi fájlra (%s), amely \"%s\" helyen érvényes"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Mutató hely fájlra (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Mutató távoli adatra (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Mutató ismeretlen külső adatra (\"%s\" típus)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Levelek áthelyzése"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Levelező"
+
+#. 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 ""
+
+#. 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
@@ -13266,46 +13829,31 @@ msgstr "Kattints ide új feladat hozzáadásához"
 msgid "Matches: %d"
 msgstr "Találatok:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Hozzárendelve"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Aláírás szerkesztése"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Aláírás mentése"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13314,236 +13862,95 @@ msgstr ""
 "Az input_token érvénytelen aláírást tartalmaz, vagy az aláírás nem "
 "ellenőrizhető."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Megszakítva"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "PGP titkosítás"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Tanúsítványazonosító:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "A tanúsítvány még nem érvényes"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Lejárt elemek:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y %B %d, %l:%M %P szerint"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Megtekintés beágyazva"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Elrejtés"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d/%d oldal"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s levél letöltése"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Hibás külső törzsrész."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Mutató FTP-helyre (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Mutató helyi fájlra (%s), amely \"%s\" helyen érvényes"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Mutató hely fájlra (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Mutató távoli adatra (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Mutató ismeretlen külső adatra (\"%s\" típus)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Levelek áthelyzése"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Feladó"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Válaszcím"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Címzett"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Másolat"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Rejtett másolat"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Levelező"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dátum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s melléklet"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nem sikerült értelmezni a MIME-üzenetet. Megjelenítés forrásként."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nem támogatott séma"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Nem lehet ellenőrizni a levél aláírását"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Nem lehet ellenőrizni a levél aláírását"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Minden évben"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "Egy _nap"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Egy _hét"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Egy hón_ap"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13551,25 +13958,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
+
+#: mail/em-migrate.c:1532
+#, 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:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+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
+#, 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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Nem sikerült feloldani a gépnevet: `%s': %s"
+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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13580,98 +14019,82 @@ msgstr "Mentés másként..."
 msgid "untitled_image.%s"
 msgstr "Névtelen levél"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Válasz a feladónak"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hivatkozás megnyitása böngészőben"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Ü_zenet küldése a listának..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Feladó hozzáadása a címjegyzékhez"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Megnyitás ezzel: %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Feliratkozás"
 
-#: mail/em-subscribe-editor.c:637 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 "Mappa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Válassz egy kiszolgálót."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nincs kiszolgáló kiválasztva."
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ne jelenjen meg többé ez az üzenet."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Szűrők"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Továbbított levél"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, 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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Üzenet"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Levél mentése másként..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Cím"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "A feladó %s"
@@ -13689,11 +14112,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13806,164 +14229,165 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Postafiókok"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Postafiókok"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Művelet végrehajtása,"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Alapértelmezett prioritás:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Értesítés új levélről"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Értesítés új levélről"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "_Kérdez, ha HTML levelet küldesz olyan címre, aki nem akar ilyet kapni"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Kérdez, ha csak _rejtett másolat szerepel a címzettek között"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14019,8 +14443,9 @@ msgid "Spell check inline"
 msgstr "_Helyesírás-ellenőrzés"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Alapértelmezett prioritás:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14163,33 +14588,67 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importálás"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importáló"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importáló"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Levélszerkesztő beállításai"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importáló"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Itt állíthatod be a levelezés tulajdonságait, beleértve a biztonsági és "
+"üzenet képernyőket is."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importáló"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Itt állíthatod be a helyesírás ellenőrzést, az aláírásokat és a "
+"levélszerkesztőt"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importáló"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Postafiókok beállítása"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Levelező"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Levelező postafiók-beállító kontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Levelező komponens"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution levélszerkesztő"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Levelezés levélszerkesztő beállító kontrollja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Levelező beállító kontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Postafiókok"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Levelezés beállításai"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Levél:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14197,15 +14656,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Várj"
 
@@ -14237,19 +14696,47 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importálás folyamatban"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Fájlok importálása"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importáló"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s pásztázása"
@@ -14259,7 +14746,7 @@ msgstr "%s pásztázása"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritásszűrő \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14285,7 +14772,7 @@ msgstr ""
 "Ellenőrizd az importált szűrőket, hogy minden úgy működik-e,\n"
 "ahogy szeretnéd."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14298,7 +14785,7 @@ msgstr ""
 "támogat az Evolution.\n"
 "Ezek a szűrők elvetésre kerülnek."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14312,24 +14799,24 @@ msgstr ""
 "ellenőrzik, hogy az adott karakterláncot tartalmazzák-e a \n"
 "levelek vagy sem."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Az Evolution importálja a régi Netscape adatokat."
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Beállítások"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Levélszűrők"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14363,128 +14850,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Postafiók-szerkesztő"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Gép:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Felhasználónév:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "Ú_tvonal:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "A címzett %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "A téma %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "A feladó %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s levelezőlista"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Válasz"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Szűrőszabály hozzáadása"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d kijelölve"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d postázandó"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Piszkozatok"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d elküldve"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d postázandó"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "összesen %d"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d postázandó"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d kijelölve"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Új levél"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Levél"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Új levél írása"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Új VMappa"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Levélszűrők"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Új mappa létrehozása"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "Az URI, amit a naptár megjelenít"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Szolgáltatás ellenőrzése"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Kapcsolódás a kiszolgálóhoz..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Azonosító"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14494,12 +14992,12 @@ msgstr ""
 "kell kitöltened, ha szeretnéd feltüntetni ezeket az adatokat a kimenő "
 "leveleidben."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14508,15 +15006,15 @@ msgstr ""
 "Ha nem vagy biztos az adatokban, kérdezd meg a rendszergazdát vagy az "
 "internetszolgáltatót."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Válassz az alábbi lehetőségek közül"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Levelek küldése"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14525,11 +15023,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Postafiók-kezelés"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14542,14 +15040,6 @@ 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.c:888
-msgid "Checking Service"
-msgstr "Szolgáltatás ellenőrzése"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Kapcsolódás a kiszolgálóhoz..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14868,7 +15358,8 @@ msgid "Execute Command..."
 msgstr "Parancs végrehajtása..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Fix szélességű:"
 
 #: mail/mail-config.glade.h:82
@@ -15197,351 +15688,456 @@ msgstr "szín"
 msgid "description"
 msgstr "leírás"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Már létezik \"%s\" nevű mappa. Használj más nevet."
+msgid "Invalid authentication"
+msgstr "Hitelesítés"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "%s SMTP-kiszolgáló nem támogatja a kért %s hitelesítési típust."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Tényleg törölni akarod ezt a postafiókot?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Tényleg külön ablakban akarod megnyitni mind a %d levelet?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Tényleg újra akarod küldeni mind a %d üzenetet?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Minden törölt levél végleges eltávolítása az összes mappából"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"HTML formátumú levelet küldesz. Ellenőrizd, hogy a címzettek \n"
+"akarnak-e és tudnak-e HTML formátumú leveleket fogadni:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Tényleg újra akarod küldeni mind a %d üzenetet?"
+msgid "_Send"
+msgstr "Küldés"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Tényleg újra akarod küldeni mind a %d üzenetet?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Tényleg újra akarod küldeni mind a %d üzenetet?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nem sikerült a mappa másolása: %s"
+msgid "Use default drafts folder?"
+msgstr "Alapértelmezett feladat mappa megnyitása"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Nem sikerült betölteni a mappát: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Nem sikerült megnyitni az ehhez a postafiókhoz tartozó piszkozatok mappát.\n"
+"Szeretnéd használni az alapértelmezett piszkozatok mappát?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
+msgid "Use _Default"
+msgstr "Alapértelmezett"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Nem sikerült létrehozni a könyvtárat\n"
-"%s\n"
-"Hiba: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Tényleg külön ablakban akarod megnyitni mind a %d levelet?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Nem sikerült törölni a mappát:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
+msgid "_Expunge"
+msgstr "_Tisztítás"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "`%s' mappa nem létezik."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Minden törölt levél végleges eltávolítása az összes mappából"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Nem sikerült a mappa áthelyezése: %s"
+msgid "_Empty Trash"
+msgstr "_Kuka ürítése"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Az átnevezés nem sikerült '%s': %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Vannak el nem küldött levelek. Biztosan kilépsz?"
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Az átnevezés nem sikerült '%s': %s"
+msgid "Error while {0}."
+msgstr ""
+"Hiba `%s' közben:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Nem lehet megnyitni a levelet"
+msgid "Error while performing operation."
+msgstr ""
+"Hiba a művelet végrehajtása közben:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
+msgid "Enter password."
+msgstr "Írd be a jelszót"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Hiba a szűrőinformációk betöltése közben:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nem sikerült létrehozni %s könyvtárat: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Nem sikerült menteni: `%s'\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Aláírás hozzáadása"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Nem sikerült létrehozni a könyvtárat\n"
+"%s\n"
+"Hiba: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Nem sikerült menteni az aláírásfájlt: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "\"%s\" törlése"
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "A kijelölt névjegyek törlése"
+msgid "Cannot create temporary save directory."
+msgstr "Nem sikerült létrehozni az ideiglenes könyvtárat: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Változások elvetése"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Mented a változtatásokat?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Nem töröl"
+msgid "File exists but cannot overwrite it."
+msgstr "A fájl létezik, felülírod?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Írd be a jelszót"
+msgid "File exists but is not a regular file."
+msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Hiba a szűrőinformációk betöltése közben:\n"
+"Nem sikerült törölni a mappát:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Hiba a művelet végrehajtása közben:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Nem sikerült törölni a mappát: %s: Nincs ilyen mappa"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Hiba `%s' közben:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "A fájl létezik, felülírod?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Nem sikerült átnevezni a mappát: %s: Nincs ilyen mappa"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "A(z) '%s' fájl nem létezik, vagy  nem közönséges fájl."
+msgid "Delete \"{0}\"?"
+msgstr "\"%s\" törlése"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "Már létezik \"%s\" nevű mappa. Használj más nevet."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Hitelesítés"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Nem sikerült a mappa áthelyezése: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Az átnevezés nem sikerült '%s': %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Nem lehet megnyitni a levelet"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Nem sikerült a mappa másolása: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"HTML formátumú levelet küldesz. Ellenőrizd, hogy a címzettek \n"
-"akarnak-e és tudnak-e HTML formátumú leveleket fogadni:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nem sikerült betölteni a mappát: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Tényleg törlöd ezt a mappát: \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Az átnevezés nem sikerült '%s': %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Nem adtad meg az összes szükséges információt."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Nem hozhatsz létre két egyező nevű postafiókot."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "A kijelölt névjegyek törlése"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Tényleg törölni akarod ezt a postafiókot?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"A következő vMappák:\n"
-"%shasználták az eltávolított mappát:\n"
-"    '%s'\n"
-"és frissítve lettek."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Nem töröl"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"A következő vMappák:\n"
-"%shasználták az eltávolított mappát:\n"
-"    '%s'\n"
-"és frissítve lettek."
+msgid "Could not save signature file."
+msgstr "Nem sikerült menteni az aláírásfájlt: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Aláírás hozzáadása"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Változások elvetése"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "%s SMTP-kiszolgáló nem támogatja a kért %s hitelesítési típust."
+msgid "Do you wish to save your changes?"
+msgstr "Mented a változtatásokat?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15549,85 +16145,97 @@ msgstr ""
 "\n"
 "Akarod menteni a változásaidat?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nem sikerült megnyitni az ehhez a postafiókhoz tartozó piszkozatok mappát.\n"
-"Szeretnéd használni az alapértelmezett piszkozatok mappát?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Alapértelmezett"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Változások elvetése"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Alapértelmezett feladat mappa megnyitása"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Nem adtad meg az összes szükséges információt."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Vannak el nem küldött levelek. Biztosan kilépsz?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Nem hozhatsz létre két egyező nevű postafiókot."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "`%s' mappa nem létezik."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Változások elvetése"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "_Kuka ürítése"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"A következő vMappák:\n"
+"%shasználták az eltávolított mappát:\n"
+"    '%s'\n"
+"és frissítve lettek."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Tisztítás"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Küldés"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"A következő vMappák:\n"
+"%shasználták az eltávolított mappát:\n"
+"    '%s'\n"
+"és frissítve lettek."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Felülírás"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s pingelése"
@@ -15636,20 +16244,20 @@ msgstr "%s pingelése"
 msgid "Working"
 msgstr "Várj"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Mappa szűrése"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Levelek fogadása"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nem sikerült alkalmazni a kimenő szűrőket: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15658,115 +16266,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:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d üzenet küldése"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "A levél dekódolása sikertelen."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Kész."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Levél mentése a mappába"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Levelek áthelyezése %s-be"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Levelek másolása %s-be"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mappák pásztázása \"%s\"-ben"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Továbbított levelek"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "%s tároló megnyitása"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s mappa eltávolítása"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "%s mappa tárolása"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Mappa frissítése"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Mappa tisztítása"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Kuka ürítése: '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Helyi mappák"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s levél letöltése"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15775,7 +16383,7 @@ msgstr ""
 "Nem sikerült létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15784,11 +16392,11 @@ msgstr ""
 "Hiba a levelek mentése közben: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Melléklet mentése"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15797,17 +16405,17 @@ msgstr ""
 "Nem lehet létrehozni a kimeneti fájlt: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nem sikerült az adatok kiírása: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Szétkapcsolódás %s kiszolgálóval"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Újrakapcsolódás %s kiszolgálóhoz"
@@ -15872,24 +16480,24 @@ msgstr "Frissítés..."
 msgid "Waiting..."
 msgstr "Várakozás..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "A felhasználó megszakította a műveletet."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Írd be %s jelszavát"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Írd be a jelszót"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Jelszó megjegyzése"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Jelszó megjegyzése a munkafolyamat hátralevő részére"
 
@@ -15931,89 +16539,94 @@ msgstr "Továbbított levél"
 msgid "Invalid folder: `%s'"
 msgstr "%s mappa megnyitása"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "vMappa beállítása: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "vMappák frissítése erre az uri-ra: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "vMappák frissítése erre az uri-ra: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMappák"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "VMappa szerkesztése"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Új VMappa"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nem nézett"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Nézett"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Megválaszolt"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Több láthatatlan levél"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Több levél"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Alacsonyabb"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Magasabb"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Legmagasabb"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Ma %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Tegnap %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Levéllista létrehozása"
 
@@ -16045,43 +16658,43 @@ msgstr "Érkezett"
 msgid "Size"
 msgstr "Méret"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Hívás"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ne küldd tovább"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Nyomon követés"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Tudd meg, hogy..."
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Továbbítás"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Nem szükséges válaszolni"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Válasz"
 
-#: mail/message-tag-followup.c:70 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 "Válasz mindenkinek"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Átnézés"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Jelölő nyomon követéshez"
 
@@ -16126,20 +16739,6 @@ msgstr "_Feliratkozás"
 msgid "_Unsubscribe"
 msgstr "_Leiratkozás"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Héj"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution Teszt komponens"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16147,112 +16746,56 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Indítóikon-csoport átnevezése"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Megjelenjen-e a mappasáv"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Indítósáv elrejtése"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Alapértelmezett prioritás:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Alapértelmezett prioritás:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Levelezést Levelező beállító kontrollja"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr ""
 "A melléklet megjelölése, hogy alapértelmezésként beágyazva jelenjen meg"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Alapértelmezett feladat mappa megnyitása"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Alapértelmezett feladat mappa megnyitása"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Alapértelmezett feladat mappa megnyitása"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Alapértelmezett feladat mappa megnyitása"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Megjelenjen-e a mappasáv"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Megjelenjen-e az indítósáv"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-mail"
@@ -16261,6 +16804,32 @@ msgstr "E-mail"
 msgid "Brought to you by"
 msgstr "Készítették:"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Ismeretlen hiba"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Érvénytelen argumentumok"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Nem sikerült regisztrálni az OAF-ban"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "A beállítások adatbázisa nem található"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Általános hiba"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Névtelen)"
@@ -16405,11 +16974,11 @@ msgstr "A gpg végrehajtása sikertelen."
 msgid "_Import"
 msgstr "Importálás"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Kapcsolatok bezárása..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Az Evolution beállításai"
 
@@ -16446,11 +17015,35 @@ msgstr "A mappanév nem tartalmazhatja a \"#\" karaktert."
 msgid "'.' and '..' are reserved folder names."
 msgstr "A '.' és a '..' fenntartott mappanevek."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "A címzett %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Hiba a %s végrehajtása közben."
@@ -16464,14 +17057,15 @@ msgid "Bug buddy could not be run."
 msgstr "Nem sikerült futtatni a Bug buddy-t."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "A Ximian Evolution névjegye"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Munka a hálózatban"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "K_apcsolat nélküli munka"
 
@@ -16479,48 +17073,6 @@ msgstr "K_apcsolat nélküli munka"
 msgid "Work Offline"
 msgstr "Kapcsolat nélküli munka"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian 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:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Érvénytelen argumentumok"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Nem sikerült regisztrálni az OAF-ban"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "A beállítások adatbázisa nem található"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Általános hiba"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Jelölőnégyzet"
@@ -16594,6 +17146,43 @@ msgstr "Aktív kapcsolatok"
 msgid "Click OK to close these connections and go offline"
 msgstr "Kattints az OK gombra a kapcsolat bezárásához"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Naptár:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Névjegyek: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Levél:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Feladatok:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Mappa_típus:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Más felhasználó mappájának megnyitása"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Postafiók:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mappanév:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Felhasználó:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution beállító varázsló"
@@ -16635,6 +17224,20 @@ msgstr ""
 "\n"
 "Beállításaid mentéséhez kattints az \"Alkalmaz\" gombra. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Héj"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution Teszt komponens"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "A fájl importálásához kattints az \"Importálás\" gombra."
@@ -16699,13 +17302,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Az Evolution a következő fájlokból képes adatokat importálni:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16734,57 +17337,48 @@ msgstr ""
 "Reméljük, élvezni fogod a kemény munkánk eredményét, és várjuk\n"
 "hozzájárulásod! \n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Köszönettel\n"
 "A Ximian Evolution Csapat\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ne jelenítse meg többet"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "A Ximian Evolution héj nem elérhető."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Nem sikerült inicializálni a Ximian Evolution héjat: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Indítás kapcsolat nélküli módban"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Indítás online módban"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Az összes Evolution-összetevő kényszerített bezárása"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Minden összetevő hibakereső üzeneteit fájlba irányítja."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16794,14 +17388,80 @@ msgstr ""
 "egyszerre\n"
 "--Haználd a(z)%s --help parancsot további információk eléréséhez\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "A Ximian Evolution héj nem elérhető."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Postafiók varázsló"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Tanúsítványazonosító:"
@@ -17054,12 +17714,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Tanúsítványazonosító:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "A kártyaazonosító már létezik"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17278,6 +17932,12 @@ msgstr "A téma %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "A kártyaazonosító már létezik"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17320,12 +17980,12 @@ msgstr "A levél alapértelmezett tárgya"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s' végrehajtása nem sikerült: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Leállítás: %s (%s)\n"
@@ -17389,7 +18049,8 @@ msgid "Select all contacts"
 msgstr "Az összes névjegy kijelölése"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Levél küldése a kijelölt címekre."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17421,8 +18082,8 @@ msgstr "Az aktuális névjegy megtekintése"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Műveletek"
@@ -17440,7 +18101,8 @@ msgid "_Preview Pane"
 msgstr "_Betekintő ablaktábla"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Mentés VCard-ként"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17571,11 +18233,21 @@ msgstr "Az aktuális névjegy megtekintése"
 msgid "Week"
 msgstr "Hét"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Munkahét"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Találkozó"
 
+#: 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 "_Bezárás"
+
 #: 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
@@ -17899,6 +18571,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Bezárás"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18147,7 +18829,8 @@ msgid "Open the selected message in a new window"
 msgstr "Az kijelölt levél megnyitása új ablakban"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "A kijelölt levél megnyitása a szerkesztőben újraküldés céljából"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18264,58 +18947,46 @@ msgstr "VMappa a _tárgyra..."
 msgid "_Attached"
 msgstr "_Mellékletként"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Másolás mappába"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Szűrő _gyártása levélből"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Ugrás"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Beágyazva"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "N_agyobb"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Levél _megjelenítése"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Á_thelyezés mappába"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Következő levél"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Szokásos megjelenítés"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Levél _megnyitása"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Előző levél"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Idézetként"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Újraküldés..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Eszközök"
@@ -18324,16 +18995,6 @@ msgstr "_Eszközök"
 msgid "_Undelete"
 msgstr "_Visszaállítás"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Bezárás"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Csatolás"
@@ -18730,6 +19391,11 @@ msgstr "Levelezés beállításai"
 msgid "_Send / Receive"
 msgstr "_Küldés / Fogadás"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Keresés most"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Cég szerint"
@@ -18803,10 +19469,6 @@ msgstr "Le_járat:"
 msgid "With _Status"
 msgstr "Állapot beállítása"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Feladatok"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18965,6 +19627,34 @@ msgstr "Egyéb..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution hiba"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution Levelező"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Információ az értekezletről"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Elküldött levelek és piszkozatok"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19083,6 +19773,35 @@ msgstr "Szöveg"
 msgid "Find _Now"
 msgstr "Keresés most"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 már létezik\n"
+"Szeretnéd felülírni?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Nem sikerült menteni: `%s'\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Nem sikerült menteni: `%s'\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19093,9 +19812,132 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% kész)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Címjegyzék mappanéző"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Címjegyzék"
+#~ msgid "Address 2:"
+#~ msgstr "_2. cím:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bologna"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Naptár nézőke"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Feladatnéző"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "A gnome-vfs inicializálása nem sikerült"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nem sikerült megnyitni a mappát '%s'-ben"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "Az URI, amit a naptár megjelenít"
+
+#~ msgid "The type of view to show"
+#~ msgstr "A megjelenítendő nézettípus"
+
+#~ msgid "Display a message"
+#~ msgstr "Levél megjelenítése"
+
+#~ msgid "Alerts"
+#~ msgstr "Figyelmeztetések"
+
+#~ msgid "Time"
+#~ msgstr "Idő"
+
+#~ msgid "_General"
+#~ msgstr "Á_ltalános"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Válassz importálót"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Naptár"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Új feladat"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "A naptárfájlt nem lehetett frissíteni!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "A megjelenítendő feladatmappa URI-ja"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nem sikerült betölteni a feladatot %s-be."
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution Levelező mappamegjelenítő"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "VMappa a _feladóra"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Szűrő a f_eladóra"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Nem sikerült csővezetéket létrehozni: '%s': %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Nem sikerült feloldani a gépnevet: `%s': %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Az URI, amit a naptár megjelenít"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Indítóikon-csoport átnevezése"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Indítósáv elrejtése"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Alapértelmezett feladat mappa megnyitása"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Alapértelmezett feladat mappa megnyitása"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Alapértelmezett feladat mappa megnyitása"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Alapértelmezett feladat mappa megnyitása"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Megjelenjen-e a mappasáv"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Megjelenjen-e az indítósáv"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Nem sikerült inicializálni a Ximian Evolution héjat: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Újraküldés..."
 
 #, fuzzy
 #~ msgid "The URI that the address book will display"
@@ -19272,9 +20114,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "S_pouse:"
 #~ msgstr "Háza_stárs:"
 
-#~ msgid "_Add"
-#~ msgstr "_Hozzáadás"
-
 #~ msgid "_Business:"
 #~ msgstr "Ü_zleti:"
 
@@ -19394,18 +20233,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "A lejárat dátuma a kezdő dátum előtt van!"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Ke_zdés dátuma:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "Le_járat:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioritás:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19437,13 +20264,6 @@ msgstr "%s (%d%% kész)"
 #~ " %s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nem sikerült másolni a fájlleírót: %s\n"
-#~ " %s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19585,10 +20405,6 @@ msgstr "%s (%d%% kész)"
 #~ msgstr "A nyomtatandó naptár nyomtatási képe"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Írd be %s jelszavát"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Új feladat"
 
@@ -19647,30 +20463,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "A megadott megosztott mappa nem található."
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Naptár:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Levél:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Feladatok:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Mappa_típus:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Más felhasználó mappájának megnyitása"
-
-#~ msgid "_Account:"
-#~ msgstr "_Postafiók:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mappanév:"
-
-#~ msgid "_User:"
-#~ msgstr "_Felhasználó:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Új mappa létrehozása"
@@ -19984,9 +20776,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Asszisztens"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Pillanatnyilag a következő kapcsolatok aktívak:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Névjegyek keresése"
 
@@ -20217,9 +21006,6 @@ msgstr "%s (%d%% kész)"
 #~ msgstr ""
 #~ "Az üzenetet digitálisan aláírták, de nem bizonyítható, hogy hiteles."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution hiba"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -21427,9 +22213,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Asia"
 #~ msgstr "Ázsia"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22480,9 +23263,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22546,9 +23326,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25531,9 +26308,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28339,9 +29113,6 @@ msgstr "%s (%d%% kész)"
 #~ msgid "Shown"
 #~ msgstr "Megjelenített"
 
-#~ msgid "No tasks"
-#~ msgstr "Nincsenek feladatok"
-
 #~ msgid "blue"
 #~ msgstr "kék"
 
diff --git a/po/is.po b/po/is.po
index 177c1dcf5b..1f0089b0c0 100644
--- a/po/is.po
+++ b/po/is.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -21,6 +21,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr ""
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr ""
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr ""
@@ -42,14 +50,6 @@ msgstr ""
 msgid " card"
 msgstr ""
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr ""
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -64,63 +64,20 @@ msgstr ""
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sLykilorð fyrir %s (notandann %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -158,41 +115,45 @@ msgstr ""
 msgid "Create a new contacts group"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -202,8 +163,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -213,7 +174,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
@@ -260,20 +221,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr ""
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sLykilorð fyrir %s (notandann %s)"
+#: 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
+#: 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
+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
+#: 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 ""
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -293,6 +276,58 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+msgid "C_ontacts"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr ""
@@ -314,6 +349,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -380,7 +416,7 @@ msgstr ""
 msgid "Address Book Properties"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Ávallt"
@@ -395,109 +431,99 @@ msgid "Basic"
 msgstr ""
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Loka"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Tengist"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Almennt"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Aldrei"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Einn"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Leita"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -508,7 +534,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -517,19 +543,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -537,7 +563,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -547,34 +573,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -582,125 +608,132 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tími"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "_Nota SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Aldrei"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "mínútur"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:208
-msgid "Remove All"
-msgstr "Fjarlægja Allt"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjarlægja"
 
+#: 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 "Nafn"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Fjarlægja Allt"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr ""
@@ -723,21 +756,14 @@ msgstr ""
 msgid "Unnamed Contact"
 msgstr ""
 
-#: 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
-msgid "Name"
-msgstr "Nafn"
-
 #: 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
 msgid "Source"
 msgstr ""
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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
@@ -801,133 +827,132 @@ msgid "<b>Work</b>"
 msgstr "Forsýn:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "_Heimilisfang:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "B_org:"
 
 #  create the dialog
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Afrita"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Lan_d:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Fullt _Nafn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+msgid "Home Page:"
+msgstr ""
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 #, fuzzy
 msgid "Job title:"
 msgstr "Starfs Titill"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "_Heimilisfang:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Annað"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+msgid "PO Box:"
+msgstr ""
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr ""
@@ -951,9 +976,9 @@ msgstr ""
 #  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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Vinna"
@@ -982,23 +1007,35 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Breytanlegt"
 
@@ -1970,91 +2007,106 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+msgid "No image"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 ""
 
+#: 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
+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
+msgid "Location"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr ""
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2072,18 +2124,6 @@ msgstr "_Fullt Nafn"
 msgid "E-_mail:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr ""
@@ -2229,8 +2269,8 @@ msgstr ""
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bók"
 
@@ -2287,6 +2327,408 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Starfs Titill"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr ""
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr ""
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+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
+msgid "Permission denied"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr ""
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr ""
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr ""
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr ""
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard fyrir %s"
+
+#.
+#. * 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 "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 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 ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr ""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+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
+#, 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
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr ""
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr ""
@@ -2301,8 +2743,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr ""
 
@@ -2356,10 +2798,11 @@ msgstr ""
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Vista sem..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
@@ -2424,7 +2867,7 @@ msgstr "Klippa"
 
 #  create the dialog
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2435,18 +2878,8 @@ msgstr "Afrita"
 msgid "Paste"
 msgstr "Líma"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Eyða"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr ""
 
@@ -2459,7 +2892,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
@@ -2500,21 +2933,6 @@ msgstr ""
 msgid "Company Phone"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr ""
@@ -2551,29 +2969,14 @@ msgstr ""
 msgid "Manager"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr ""
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr ""
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr ""
@@ -2625,21 +3028,29 @@ msgstr ""
 msgid "Web Site"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 ""
@@ -2656,10 +3067,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2680,381 +3087,8 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Starfs Titill"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr ""
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr ""
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-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:57
-msgid "Permission denied"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr ""
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 ""
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr ""
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr ""
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-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:114
-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 ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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:140
-msgid "Unable to open addressbook"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Yfirskrifa"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard fyrir %s"
-
-#.
-#. * 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:568
-msgid "Select an Action"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr ""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-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
-#, 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
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3099,11 +3133,6 @@ msgstr ""
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 msgid "Print contacts"
 msgstr ""
@@ -3113,6 +3142,11 @@ msgstr ""
 msgid "Print contact"
 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"
 msgstr ""
@@ -3297,16 +3331,6 @@ msgstr ""
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3361,6 +3385,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3373,11 +3407,12 @@ msgstr ""
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr ""
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3409,117 +3444,53 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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"
+msgid "Snooze _time (minutes):"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+msgid "_Edit appointment"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Opna"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3528,12 +3499,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Aðvörun"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3541,7 +3512,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3552,19 +3523,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
-msgid "Could not initialize Bonobo"
+#: 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:167
-msgid "Could not initialize gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:139
+msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3673,73 +3644,59 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr ""
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
+msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Dagatal"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dagar"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -3751,18 +3708,22 @@ msgstr "%A %d %B %Y"
 #  specifiers or add anything.
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
 
@@ -3772,84 +3733,89 @@ 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Nýtt dagatal"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Stillingar..."
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
+msgstr ""
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr ""
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Nýtt dagatal"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "D_agatal:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr ""
 
@@ -3879,34 +3845,41 @@ msgstr ""
 msgid "Month View"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:408
-msgid "Error while opening the calendar"
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:419
-msgid "Method not supported when opening the calendar"
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
-msgid "Permission denied to open the calendar"
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:474
-#, c-format
-msgid "open_client(): %s"
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
 msgstr ""
 
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
+#: calendar/gui/comp-editor-factory.c:409
+msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
+#: calendar/gui/comp-editor-factory.c:420
+msgid "Method not supported when opening the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:426
+msgid "Permission denied to open the calendar"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:474
+#, c-format
+msgid "open_client(): %s"
 msgstr ""
 
 #: calendar/gui/dialogs/alarm-options.c:466
@@ -3974,7 +3947,7 @@ msgstr ""
 msgid "hours"
 msgstr "klukkustundir"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -3993,12 +3966,12 @@ msgstr ""
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
+#: 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/e-alarm-list.c:444
-msgid "Play a sound"
+#: 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
@@ -4015,6 +3988,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
 msgid "Summary:"
 msgstr ""
@@ -4053,10 +4027,100 @@ msgstr ""
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Dagatal"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dagatal"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+msgid "_Refresh:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+msgid "_Type:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 ""
 
@@ -4070,19 +4134,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 ""
 
@@ -4107,162 +4171,174 @@ msgid "60 minutes"
 msgstr "60 mínútur"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "Forsýn:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Forsýn:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Forsýn:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "Forsýn:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Forsýn:"
+
+#: 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/cal-prefs-dialog.glade.h:16
+msgid "Display"
+msgstr ""
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+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:563
 msgid "Friday"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Mánudagur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Laugardagur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Sunnudagur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Fimmtudagur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Tími"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "_Tímabelti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Þriðjudagur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Miðvikudagur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4272,135 +4348,46 @@ msgstr ""
 msgid "_Edit"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Dagatal"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dagatal"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-msgid "_Refresh:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-msgid "_Type:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4475,79 +4462,79 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "til"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Vista sem..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "til"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr ""
@@ -4668,27 +4655,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 ""
 
@@ -4700,7 +4687,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr ""
 
@@ -4792,10 +4779,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4814,15 +4801,15 @@ msgstr ""
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5090,24 +5077,17 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
+msgid "Select destination"
 msgstr "Valið:"
 
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+msgid "_Destination"
 msgstr ""
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "dagatal"
-
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
 msgstr ""
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5136,38 +5116,44 @@ msgid "% _Complete"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr ""
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 ""
 
@@ -5202,11 +5188,11 @@ msgstr ""
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5215,8 +5201,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr ""
@@ -5360,97 +5347,54 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr ""
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr ""
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr ""
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Valið:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Fullt Nafn"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 calendar/gui/e-meeting-store.c:159
-#: calendar/gui/e-meeting-store.c:169 calendar/gui/e-meeting-store.c:765
-msgid "Yes"
+#: calendar/gui/e-cal-component-preview.c:247
+msgid "Priority:"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Síða"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
+#: 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-cal-model.c:872
-msgid "Recurring"
+#: 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-cal-model.c:874
-msgid "Assigned"
+#: 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
@@ -5497,17 +5441,26 @@ msgstr ""
 msgid "100%"
 msgstr ""
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr ""
 
@@ -5516,41 +5469,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr ""
 
@@ -5605,77 +5559,153 @@ msgstr ""
 msgid "Start date"
 msgstr ""
 
+#: 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:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Valið:"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "D_agatal:"
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Nýtt dagatal"
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr ""
+
+#: 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: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-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:168 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
+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:629
+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 ""
+
 #. 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
@@ -5696,35 +5726,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. 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 ""
+
+#. 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 ""
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
@@ -5832,10 +5862,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr ""
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5865,7 +5891,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr ""
 
@@ -6078,59 +6104,55 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6247,28 +6269,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 ""
-
-#. 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 ""
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6329,77 +6329,156 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "%sLykilorð fyrir %s (notandann %s)"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr ""
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
+#: calendar/gui/gnome-cal.c:2894
+msgid "Purging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2757
-msgid "Purging"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Dagatal"
+
+#: 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
@@ -6539,6 +6618,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr ""
@@ -6758,7 +6854,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr ""
 
@@ -6770,64 +6866,73 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Eyða"
+msgstr[1] "Eyða"
+
+#: calendar/gui/tasks-component.c:447
+msgid "Failed upgrading tasks."
+msgstr ""
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6835,11 +6940,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr ""
 
@@ -8479,7 +8584,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8572,29 +8677,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8626,7 +8708,46 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8634,42 +8755,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8677,99 +8798,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9004,7 +9125,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9194,7 +9315,7 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr ""
 
 #: camel/camel-smime-context.c:360
@@ -9209,7 +9330,7 @@ msgstr ""
 msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr ""
 
@@ -9269,91 +9390,91 @@ msgstr ""
 msgid "Cannot set message digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr ""
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr ""
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr ""
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9370,16 +9491,26 @@ msgstr ""
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr ""
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
@@ -9500,7 +9631,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9509,11 +9640,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9530,7 +9661,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9540,28 +9671,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9573,17 +9704,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9592,11 +9723,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9611,10 +9737,12 @@ 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 ""
@@ -9645,6 +9773,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9663,26 +9792,302 @@ msgstr ""
 msgid "Checklist"
 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:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr ""
+
+#: 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
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: 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
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 ""
+
+#: 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:815
+#: 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/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: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/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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 msgid "Unknown error"
 msgstr "Óþekkt villa"
 
+#: 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 "%sLykilorð fyrir %s (notandann %s)"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, c-format
+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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+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
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9725,21 +10130,21 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -9753,25 +10158,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9809,23 +10214,6 @@ msgstr ""
 msgid "Command:"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -9846,85 +10234,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -9932,25 +10278,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -9958,7 +10297,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10057,58 +10396,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10174,7 +10513,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10495,7 +10834,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10504,8 +10843,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10514,46 +10853,46 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -10664,7 +11003,7 @@ msgid "Could not get group: %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -10717,8 +11056,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11148,7 +11487,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
@@ -11192,6 +11531,87 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr ""
+
+#: 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:1479
+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.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 ""
@@ -11270,187 +11690,125 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-msgid "Could not open file"
-msgstr ""
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr ""
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
 msgstr ""
 
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
 msgstr ""
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
 msgstr ""
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
 msgstr ""
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Fjarlægja"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "Fjarlægja"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Vista Sem"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11568,7 +11926,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -11744,72 +12103,88 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Vista í möppu..."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -11821,65 +12196,11 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr ""
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "_Fullt Nafn"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr ""
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -11962,6 +12283,72 @@ 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
+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
+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
+msgid "Later"
+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 "_Fullt Nafn"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+msgid "Include threads"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12091,7 +12478,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr ""
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12128,7 +12515,7 @@ msgstr ""
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr ""
 
@@ -12197,9 +12584,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 ""
@@ -12260,101 +12647,60 @@ msgstr ""
 msgid "Virtual _Folders"
 msgstr ""
 
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "_Bæta við"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12388,525 +12734,551 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "Króatía"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr ""
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Vista í möppu..."
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr ""
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+msgid "Cancel _Drag"
+msgstr ""
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2080
+#  create the dialog
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Afrita"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr ""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr ""
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr ""
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
+#: 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-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: 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-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
+#: 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-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: 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 ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: 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 ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: 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-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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."
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:1002
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1013
-msgid "by %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
+#: 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 ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
+#: 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."
 msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: 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 ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: 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 ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:757
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:772
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
+#: mail/em-format-html-display.c:1007
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr ""
+
+#: mail/em-format-html-display.c:1018
+msgid "by %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr ""
+
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
+msgstr ""
+
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr ""
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -12914,24 +13286,50 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
+#, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1532
+#, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1715
+#, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:1919
 #, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1933
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2480
+#, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:699
@@ -12943,88 +13341,74 @@ msgstr ""
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr ""
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr ""
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr ""
@@ -13042,11 +13426,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13145,157 +13529,157 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13343,7 +13727,7 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13480,49 +13864,79 @@ msgstr ""
 msgid "spamd port"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Email"
+
 #: mail/importers/elm-importer.c:88
 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13549,18 +13963,46 @@ msgid "Select folder to import into"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr ""
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr ""
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -13570,7 +14012,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13585,7 +14027,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13593,7 +14035,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13602,23 +14044,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13647,160 +14089,172 @@ msgid "Pine"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Eyða"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "dagar"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "mínútur"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr ""
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr ""
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Eyða"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr ""
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr ""
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -13809,14 +14263,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14103,7 +14549,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14401,366 +14847,483 @@ msgstr ""
 msgid "description"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:4
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+#. 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-errors.xml.in.h:5
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"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-errors.xml.in.h:6
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:7
-msgid "Are you sure you want to send a message with only BCC recipients?"
+#. 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"
+"{0}\n"
+"Send anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:8
+#: 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 "Senda Til:"
+
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
+#. 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-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:16
-msgid "Cannot create the save directory, because \"{1}\""
+#. 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?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:17
-msgid "Cannot delete folder \"{0}\"."
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:18
-msgid "Cannot delete system folder \"{0}\"."
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+#. 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-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-msgid "Cannot open source \"{2}\"."
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
-msgid "Cannot open target \"{2}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
+#. 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-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Eyða"
-
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+msgid "Enter password."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:37
-msgid "Enter password."
+#. 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-errors.xml.in.h:38
-msgid "Error loading filter definitions."
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. 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/mail-errors.xml.in.h:41
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
+msgstr ""
+
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Eyða"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
+#. 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-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. 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-errors.xml.in.h:49
-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."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
+msgid "Cannot open source \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
+msgid "Cannot open target \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. 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-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. 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-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Senda Til:"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#. 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-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 "Yfirskrifa"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Senda Til:"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14769,170 +15332,170 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] ""
 msgstr[1] ""
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -14996,24 +15559,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15053,89 +15616,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:235
 #, c-format
-msgid "Updating vfolders for uri: %s"
+msgid "Updating vFolders for '%s:%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, c-format
+msgid "Updating vFolders for '%s'"
+msgstr ""
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15167,43 +15735,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15245,121 +15813,90 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr ""
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "mail"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
-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
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr ""
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Óþekkt villa"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-msgid "mail"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1107
+msgid "Generic error"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15484,11 +16021,11 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15525,11 +16062,28 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -15543,14 +16097,15 @@ msgid "Bug buddy could not be run."
 msgstr ""
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
-msgstr ""
+#, fuzzy
+msgid "About Evolution"
+msgstr "_Um Ximian Evolution..."
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
@@ -15558,44 +16113,6 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15654,6 +16171,45 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "D_agatal:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr ""
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr ""
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr ""
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "_Fullt Nafn"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Innsetja"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -15687,6 +16243,18 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr ""
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -15743,13 +16311,13 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -15763,67 +16331,122 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Tengist"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr ""
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+msgid "Evolution can not start."
+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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr ""
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr ""
 
@@ -16047,11 +16670,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr ""
@@ -16242,6 +16860,11 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16281,12 +16904,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr ""
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16350,7 +16973,7 @@ msgid "Select all contacts"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16381,8 +17004,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr ""
@@ -16400,8 +17023,9 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "Vista sem..."
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -16526,10 +17150,20 @@ msgstr ""
 msgid "Week"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr ""
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 ""
+
 #: 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
@@ -16847,6 +17481,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Loka"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr ""
@@ -17084,7 +17728,7 @@ msgid "Open the selected message in a new window"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17199,58 +17843,46 @@ msgstr ""
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Go To"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:115
-msgid "_Inline"
+msgid "_Go To"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:116
-msgid "_Larger"
+msgid "_Inline"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:117
-msgid "_Message Display"
+msgid "_Larger"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Endursenda..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr ""
@@ -17259,16 +17891,6 @@ msgstr ""
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Loka"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -17657,6 +18279,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "_Sækja / Senda"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Leita"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -17722,10 +18349,6 @@ msgstr ""
 msgid "With _Status"
 msgstr "Bandaríkin"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -17878,6 +18501,32 @@ msgstr "Annað..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr ""
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+msgid "Evolution Warning"
+msgstr ""
+
+#: widgets/misc/e-error.c:118
+msgid "Evolution Information"
+msgstr ""
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Ximian Evolution _FAQ"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -17991,6 +18640,26 @@ msgstr "Texti"
 msgid "Find _Now"
 msgstr ""
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+msgid "Do you wish to overwrite it?"
+msgstr ""
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18002,9 +18671,22 @@ msgid "%s (%d%% complete)"
 msgstr ""
 
 #, fuzzy
-#~ msgid "_Address Book"
+#~ msgid "Address 2:"
 #~ msgstr "_Heimilisfang:"
 
+#~ msgid "Time"
+#~ msgstr "Tími"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Valið:"
+
+#~ msgid "calendar"
+#~ msgstr "dagatal"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Endursenda..."
+
 #, fuzzy
 #~ msgid "_minute(s)"
 #~ msgstr "mínútur"
diff --git a/po/it.po b/po/it.po
index fabbfa7491..e6a663c1b8 100644
--- a/po/it.po
+++ b/po/it.po
@@ -8,14 +8,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: it\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-12 10:40+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-12 17:07+0200\n"
 "Last-Translator: Marco Ciampa <ciampix@libero.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\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
@@ -119,7 +119,8 @@ msgstr "Crea un nuovo gruppo contatti"
 
 #: addressbook/gui/component/addressbook-component.c:182
 msgid "Failed upgrading Addressbook settings or folders."
-msgstr "Fallito l'aggiornamento delle impostazioni o delle cartelle della rubrica."
+msgstr ""
+"Fallito l'aggiornamento delle impostazioni o delle cartelle della rubrica."
 
 #: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
@@ -137,15 +138,15 @@ msgstr "Impossibile eseguire interrogazione su DSE Root"
 msgid "The server responded with no supported search bases"
 msgstr "Il server ha risposto con basi di ricerca non supportate"
 
-#: addressbook/gui/component/addressbook-config.c:1242
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Questo server non supporta le informazioni di schema LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1263
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Errore nel caricare le informazioni di schema"
 
-#: addressbook/gui/component/addressbook-config.c:1271
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Il server non risponde con informazioni di schema valide"
 
@@ -161,20 +162,16 @@ msgid "Migrating `%s':"
 msgstr "Migrazione di `%s':"
 
 #. create the local source group
-#. On This Computer is always first and VFolders is always last
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: 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:243
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Su questo computer"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: 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
@@ -266,9 +263,8 @@ msgstr "Proprietà..."
 #. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: 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"
@@ -296,47 +292,56 @@ msgstr ""
 "URI per la cartella usata più recentemente nella finestra di selezione nomi"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletamento"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contatti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificati"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Configura qui l'autocompletamento"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Pop-up della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Visualizzatore di indirizzi della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Visualizzatore di card della rubrica di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Componente della rubrica di Evolution."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Geatione controllo certificati S/Mime di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr ""
 "Controllo di configurazione delle impostazioni delle cartelle di Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 #, fuzzy
 msgid "Manage your S/MIME certificates here"
 msgstr "Gestione dei certificati S/Mime"
@@ -869,9 +874,9 @@ msgid "<b>Work</b>"
 msgstr "<b>Lavoro</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
@@ -905,7 +910,7 @@ msgid "Company:"
 msgstr "Società:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -913,7 +918,7 @@ msgid "Contact"
 msgstr "Contatto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor dei contatti"
 
@@ -934,7 +939,7 @@ msgid "Full _Name..."
 msgstr "_Nome e cognome..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Casa"
@@ -979,61 +984,66 @@ msgid "Novell Groupwise"
 msgstr "GroupWise Novell"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Altro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Casella postale:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Informazioni personali"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Profession:"
 msgstr "Professione:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "State/Province:"
 msgstr "Stato/Provincia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: addressbook/gui/contact-editor/contact-editor.glade.h:41
 msgid "Wants to receive HTML mail"
 msgstr "Vuole ricevere messaggi in HTML"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "Webcam:"
 msgstr "Webcam:"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: 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-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Lavoro"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "Zip/Postal Code:"
 msgstr "CAP:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Categories"
 msgstr "_Categorie"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_File under:"
 msgstr "_File sotto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Where:"
 msgstr "_Dove:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item7"
 msgstr "voce7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "item8"
 msgstr "voce8"
 
@@ -1054,13 +1064,13 @@ msgstr ""
 "questo contatto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Indirizzo"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2041,65 +2051,82 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Libro sorgente"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Libro oggetto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Nuovo contatto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Campi scrivibili"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Cambiato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Editor delle categorie non disponibile."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Questo contatto appartiene a queste categorie:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2592
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Selezionare una delle seguenti opzioni"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 "Impossibile trovare il widget per un campo: `%s'"
@@ -2351,143 +2378,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Ricerca avanzata"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(mappa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "mappa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Elenco membri"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organizzazione"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Posizione"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Di gruppo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Video conferenza"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Telefono"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "lavoro"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Cellulare"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "personale"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Note"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Qualifica"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Pagina web"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Completato"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Backend occupato"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Deposito non in linea"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "La rubrica non esiste"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 msgid "No Self Contact defined"
 msgstr "Nessun auto contatto definito"
 
 #. E_BOOK_ERROR_URI_NOT_LOADED
 #. E_BOOK_ERROR_URI_ALREADY_LOADED
 #. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Permesso negato"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contatto non trovato"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "ID del contatto esiste già"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocollo non supportato"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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
@@ -2500,37 +2528,37 @@ msgid "Cancelled"
 msgstr "Annullato"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Impossibile annullare"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Autenticazione non riuscita"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autenticazione richiesta"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 msgid "TLS not Available"
 msgstr "TLS non disponibile"
 
 #. E_BOOK_ERROR_CORBA_EXCEPTION
 #. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "Nessuna sorgente"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Altro errore"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: 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."
@@ -2538,7 +2566,7 @@ msgstr ""
 "Impossibile aprire questa rubrica. Controllare che il percorso esista e che "
 "si abbia il permesso di accedervi."
 
-#: addressbook/gui/widgets/eab-gui-util.c:109
+#: 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."
@@ -2546,7 +2574,7 @@ msgstr ""
 "Impossibile aprire questa rubrica.  Questo significa che è stata inserita "
 "una URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: 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 "
@@ -2556,7 +2584,7 @@ msgstr ""
 "LDAP con Evolution è necessario compilare il programma dai sorgenti CVS dopo "
 "aver scaricato Open LDAP dal collegamento sottostante."
 
-#: addressbook/gui/widgets/eab-gui-util.c:123
+#: 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."
@@ -2564,11 +2592,11 @@ msgstr ""
 "Impossibile aprire questa rubrica. Questo significa che è stata inserita una "
 "URI errata, oppure che il server LDAP non è raggiungibile."
 
-#: addressbook/gui/widgets/eab-gui-util.c:140
+#: addressbook/gui/widgets/eab-gui-util.c:141
 msgid "Unable to open addressbook"
 msgstr "Impossibile aprire la rubrica"
 
-#: addressbook/gui/widgets/eab-gui-util.c:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2581,7 +2609,7 @@ msgstr ""
 "più specifica o aumentare il limite di risultati nelle preferenze \n"
 "del server di elenchi per questa rubrica."
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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"
@@ -2593,56 +2621,56 @@ msgstr ""
 "la ricerca più specifica o elevare il limite di tempo del\n"
 "server di elenchi nelle preferenze di questa rubrica."
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 msgid "The backend for this addressbook was unable to parse this query."
 msgstr ""
 "Il backend per questa rubrica è incapace di elaborare questa interrogazione."
 
-#: addressbook/gui/widgets/eab-gui-util.c:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 msgid "The backend for this addressbook refused to perform this query."
 msgstr ""
 "Il backend per questa rubrica si è rifiutato di eseguire questa "
 "interrogazione."
 
-#: addressbook/gui/widgets/eab-gui-util.c:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "Questa interrogazione non è stata completata con successo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: addressbook/gui/widgets/eab-gui-util.c:206
 msgid "Do you want to save changes?"
 msgstr "Salvare le modifiche?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Annulla"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Errore nell'aggiungere l'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Errore nell'aggiungere un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Errore nella modifica dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Errore nella modifica di un contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Errore nella rimozione dell'elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Errore nella rimozione di una contatto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2651,7 +2679,7 @@ msgstr ""
 "L'apertura di %d contatti causerà l'apertura di %d nuove finestre.\n"
 " Visualizzare tutti i contatti indicati?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2660,49 +2688,49 @@ msgstr ""
 "%s esiste già\n"
 "Sovrascriverlo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Sovrascrivi"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: addressbook/gui/widgets/eab-gui-util.c:400
 #, c-format
 msgid "Error saving %s: %s"
 msgstr "Errore nel salvare %s: %s"
 
 #. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "card.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "elenco"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Sposta contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Copia contatto su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Sposta contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Copia contatti su"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Seleziona rubrica obbiettivo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "VCard multiple"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard per %s"
@@ -2847,7 +2875,8 @@ msgstr "Rubrica"
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
 #: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Salva come vcard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2924,7 +2953,7 @@ msgid "Paste"
 msgstr "Incolla"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Vista corrente"
 
@@ -3156,17 +3185,17 @@ msgstr "Vista della card"
 msgid "GTK Tree View"
 msgstr "Vista da albero GTK"
 
-#: addressbook/gui/widgets/test-reflow.c:119
+#: addressbook/gui/widgets/test-reflow.c:106
 msgid "Reflow Test"
 msgstr "Prova di rifresco"
 
-#: 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 "Questo dovrebbe controllare il rinfresco delle voci immagini"
 
@@ -3536,24 +3565,24 @@ msgstr "_Modifica appuntamenti"
 msgid "_Snooze"
 msgstr "_Suoneria"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Apri"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Abbandona"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Abbandona tutto"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nessuna descrizione disponibile."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3566,12 +3595,12 @@ msgstr ""
 "Inizia da %s\n"
 "Finisce a %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Attenzione"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3583,7 +3612,7 @@ msgstr ""
 "richiede l'invio di un messaggio Email.  Per questo,\n"
 "Evolution visualizzerà invece un messaggio a video."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3600,7 +3629,7 @@ msgstr ""
 "\n"
 "Si vuole davvero eseguire questo programma?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Non chiedere più su questo programma in futuro."
 
@@ -3608,15 +3637,11 @@ msgstr "Non chiedere più su questo programma in futuro."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Servizio di notifica dell'avviso sonoro del calendario di Evolution"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Impossibile inizializzare Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Impossibile inizializzare gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "Impossibile creare la fabbrica per il servizio di notifica dell'avviso sonoro"
@@ -3727,30 +3752,34 @@ msgid "Weekday the week starts on"
 msgstr "Giorno di inizio della settimana"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Chiedi conferma prima di cancellare un appuntamento"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Chiedi conferma prima di eliminare una cartella"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Nascondi attività completate"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Imposta un allarme predefinito per gli eventi"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Mostra l'ora in formato di 24h o usando am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Mostra i numeri delle settimane nel navigatore date"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: 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
@@ -3758,7 +3787,7 @@ msgstr "Mostra i numeri delle settimane nel navigatore date"
 msgid "Calendar"
 msgstr "Calendario"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3768,40 +3797,36 @@ msgstr ""
 "dell'ammontare di tempo impostato. Se si continua, non sarà più possibile "
 "ripristinare questi eventi."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Elimina eventi più vecchi di"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "giorni"
 
-#: calendar/gui/calendar-commands.c:431 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:434 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1589 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
@@ -3810,7 +3835,7 @@ 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:464 calendar/gui/calendar-component.c:533
+#: 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"
@@ -3847,7 +3872,7 @@ msgstr ""
 "creati. Selezionare un calendario abilitato in scrittura."
 
 #: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Calendari"
 
@@ -3945,15 +3970,15 @@ msgstr "La locazione contiene"
 msgid "Unmatched"
 msgstr "Non corrispondenti"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Errore durante l'apertura del calendario"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metodo non supportato durante l'apertura del calendario"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Negato il permesso di aprire il calendario"
 
@@ -4027,7 +4052,7 @@ msgstr "tempo in più ogni"
 msgid "hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Azione"
 
@@ -4046,14 +4071,14 @@ msgstr "Di base"
 msgid "Date/Time:"
 msgstr "Data/ora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Visualizza un messaggio"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Emetti un suono"
 
+#: 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 "Promemoria"
@@ -4576,7 +4601,7 @@ msgid "No summary"
 msgstr "Nessuna descrizione"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salva come..."
@@ -4744,27 +4769,27 @@ msgstr "Delega a:"
 msgid "Enter Delegate"
 msgstr "Inserire delegato"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Appuntamento"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Promemoria"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Ricorrenza"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Pianificazione"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Riunione"
 
@@ -4860,17 +4885,12 @@ msgid "_Start time:"
 msgstr "_Ora di inizio:"
 
 #. 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:927 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:2039 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: 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
@@ -4896,8 +4916,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2619 mail/em-folder-view.c:918
+#: 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
 #: 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
@@ -5171,8 +5191,9 @@ msgid "Save Event"
 msgstr "Salva eventi"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Seleziona sorgente"
+#, fuzzy
+msgid "Select destination"
+msgstr "Seleziona un'azione"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5221,7 +5242,7 @@ msgstr "Completato"
 
 #: 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:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Alta"
 
@@ -5235,14 +5256,14 @@ msgstr "In corso"
 
 #: 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:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Bassa"
 
 #: 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:927
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normale"
 
@@ -5443,7 +5464,7 @@ msgstr "%s alle %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s per un'attivazione di tipo sconosciuto"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2331
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Fare clic qui per aprire %s"
@@ -5552,8 +5573,8 @@ msgid "Updating objects"
 msgstr "Aggiornamento elementi in corso"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:893 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Apri"
 
@@ -5562,41 +5583,42 @@ msgid "Open _Web Page"
 msgstr "Apri pagina _web"
 
 #: calendar/gui/e-calendar-table.c:1024 calendar/gui/e-calendar-table.c:1069
-#: calendar/gui/e-calendar-view.c:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:895 mail/em-popup.c:690 mail/em-popup.c:806
+#: 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
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salva con nome..."
 
 #: calendar/gui/e-calendar-table.c:1025 calendar/gui/e-calendar-table.c:1067
-#: calendar/gui/e-calendar-view.c:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "S_tampa..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
 msgstr "_Taglia"
 
 #: calendar/gui/e-calendar-table.c:1030 calendar/gui/e-calendar-table.c:1056
-#: calendar/gui/e-calendar-view.c:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2612 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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 "_Copia"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Incolla"
 
@@ -5660,67 +5682,67 @@ msgstr "Sommario"
 msgid "Task sort"
 msgstr "Ordina attività"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nuovo _appuntamento..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nuovo _evento del giorno"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nuova riunione"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nuova attività"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleziona _oggi"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Seleziona data..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Pubblica le informazioni sulla disponibilità"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "_Copia nel calendario..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "_Sposta nel calendario..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Pianifica una riunione..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Inoltra come iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "_Elimina questa ricorrenza"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Elimina _tutte le ricorrenze"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Vai a _oggi"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Vai alla data..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Impostazioni..."
 
@@ -5738,7 +5760,7 @@ msgstr "Inizio"
 #: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
+#: 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
@@ -5747,8 +5769,9 @@ msgstr "Inizio"
 #: 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:1046
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Sconosciuto"
 
@@ -5798,20 +5821,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 %m/%d/%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"
@@ -5829,34 +5844,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 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:1572 calendar/gui/e-day-view-top-item.c:690
+#: 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:1605 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"
@@ -5960,6 +5968,7 @@ msgstr "Errore iCalendar"
 msgid "An unknown person"
 msgstr "Partecipante sconosciuto"
 
+#. Describe what the user can do
 #: calendar/gui/e-itip-control.c:910
 msgid ""
 "<br> Please review the following information, and then select an action from "
@@ -6452,10 +6461,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
@@ -6464,10 +6469,6 @@ msgstr "%a %m/%d/%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"
@@ -6525,7 +6526,7 @@ msgid "Expunging"
 msgstr "Pulizia"
 
 #: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: 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/importers/icalendar-importer.c:79
@@ -6558,37 +6559,55 @@ msgid "Purging"
 msgstr "Pulizia"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Calendario e attività"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configura quì il tuo fuso orario, il calendario e l'elenco attività"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Calendario e attività di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Controllo di configurazione del calendario di Evolution."
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visualizzatore di messaggi di scadenze del calendario di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor del calendario/attività di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Componente del calendario di Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Evolution's Tasks component"
 msgstr "Componente delle attività di Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Attività"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprile"
@@ -6968,7 +6987,7 @@ msgid "Contacts: "
 msgstr "Contatti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Anteprima di stampa"
 
@@ -6996,7 +7015,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d totale"
 msgstr[1] "%d totali"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:498
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8716,7 +8735,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr "Scaricamento nuovi messaggi per la modalità non in linea"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparazione cartella '%s' per l'accesso fuorilinea"
@@ -8865,7 +8884,8 @@ msgid "(match-all) requires a single bool result"
 msgstr "(match-all) richiede un singolo risultato booleano"
 
 #: camel/camel-folder-search.c:755
-msgid "(match-threads) now allowed inside match-all"
+#, fuzzy
+msgid "(match-threads) not allowed inside match-all"
 msgstr "(match-threads) è ora consentito dentro match-all"
 
 #: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
@@ -8885,7 +8905,7 @@ msgstr "(match-threads) richiede l'impostazione cartella"
 msgid "Performing query on unknown header: %s"
 msgstr "É stata effettuata una ricerca su un header sconosciuto: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8896,15 +8916,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Analisi userid hint gpg non riuscita."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Analisi richiesta passphrase gpg non riuscita."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8913,29 +8933,29 @@ msgstr ""
 "È necessaria una passphrase per sbloccare la chiave\n"
 "per l'utente: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Annullato."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Sblocco della chiave segreta non riuscito: sono state fornite 3 passphrases "
 "errate."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Risposta inaspettata da GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Impossibile cifrare: nessun destinatario valido specificato."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8946,61 +8966,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Impossibile elaborare con GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Impossibile generare i dati per la firma: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Esecuzione di gpg non riuscita: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Esecuzione di gpg non riuscita."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Questa parte del messaggio è firmata"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 ""
 "Impossibile verificare la firma del messaggio: formato messaggio non valido"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Impossibile verificare la firma di questo messaggio: impossibile creare un "
 "file temporaneo: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Impossibile generare i dati per la crittografia: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Questa parte del messaggio è cifrata"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Contenuto cifrato"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Impossibile elaborare i contenuti del messaggio"
 
@@ -9304,7 +9324,7 @@ msgstr "Le credenziali di riferimento sono scadute."
 #: 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:1207
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Risposta di autenticazione dal server errata."
 
@@ -9520,7 +9540,7 @@ msgstr "Impossibile creare contesto del codificatore"
 msgid "Failed to add data to CMS encoder"
 msgstr "Impossibile aggiungere dati al codificatore CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Fallita la codifica dei dati"
 
@@ -9580,93 +9600,95 @@ msgstr "Impossibile calcolare le raccolte"
 msgid "Cannot set message digests"
 msgstr "Impossibile impostare le raccolte messaggi"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Importazione certificato non riuscita"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Messaggio di soli certificati, impossibile verificare i certificati"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Messaggio di soli certificati, certificati importati e verificati"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Impossibile trovare le raccolte firma"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Firmatario: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Decodificatore fallito"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Impossibile trovare certificato per `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Impossibile trovare algoritmo di crittografia di uso comune"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 #, fuzzy
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Impossibile allocare uno slot per la crittografia di una chiave comune"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Impossibile creare messaggio CMS"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Impossibile creare dati busta CMS"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Impossibile allegare dati busta CMS"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Impossibile allegare oggetto dati CMS"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Impossibile creare informazioni destinatario CMS"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Impossibile aggiungere informazioni destinatario CMS"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Impossibile creare contesto codificatore"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Fallita l'aggiunta dati al codificatore"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Decoder fallito, errore %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Decrittazione S/MIME: non è stato trovato nessun contenuto crittato"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "importazione chiavi: non implementato"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "esportazione chiavi: non implementato"
 
@@ -9686,16 +9708,26 @@ msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 "Impossibile creare una cartella: operazione non supportata in questo archivio"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Impossibile creare la cartella `%s': la cartella esiste"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Impossibile eliminare la cartella: %s: operazione non valida"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Impossibile rinominare la cartella %s: operazione non valida"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Cestino"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Da cestinare"
@@ -9917,12 +9949,12 @@ msgstr "Impossibile interpretare URL `%s'"
 msgid "Error storing `%s': %s"
 msgstr "Errore durante la memorizzazione `%s': %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Non é presente il messaggio %s in %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
@@ -9931,11 +9963,6 @@ msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Impossibile rinominare la cartella %s: operazione non valida"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10147,21 +10174,21 @@ msgstr ""
 "testo semplice."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "servizio IMAP per %s su %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: 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/pop3/camel-pop3-store.c:175
@@ -10172,15 +10199,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Impossibile connettersi a %s (porta %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:548
+#: 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 non disponibile"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:563
-#: camel/providers/imap/camel-imap-store.c:810
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10196,8 +10223,8 @@ msgid ""
 msgstr "Impossibile connettersi al server IMAP.%s in modalità sicura: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:644
-#: camel/providers/imap/camel-imap-store.c:675
+#: 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 "Impossibile connettersi al server IMAP.%s in modalità sicura: %s"
@@ -10234,9 +10261,11 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Impossibile avere la cartella %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
 #, fuzzy, c-format
 msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr ""
 "Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
 "\""
@@ -10314,12 +10343,12 @@ msgstr "Il server si é disconnesso inaspettatamente: %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:3129
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operazione annullata"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3132
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Il server si é disconnesso inaspettatamente: %s"
@@ -10368,21 +10397,21 @@ msgstr "Impossibile creare la directory %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Impossibile caricare il sommario di %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Cartella distrutta e ricreata sul server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Ricerca messaggi modificati"
 
-#: camel/providers/imap/camel-imap-folder.c:1936
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Impossibile la ricezione del messaggio: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1973
+#: 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
@@ -10398,25 +10427,25 @@ msgstr ""
 "Impossibile prendere il messaggio: %s\n"
 "%s"
 
-#: camel/providers/imap/camel-imap-folder.c:1973
+#: 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
 msgid "No such message"
 msgstr "Messaggio assente"
 
-#: camel/providers/imap/camel-imap-folder.c:2015
-#: camel/providers/imap/camel-imap-folder.c:2617
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Questo messaggio non è al momento disponibile"
 
-#: camel/providers/imap/camel-imap-folder.c:2281
-#: camel/providers/imap/camel-imap-folder.c:2351
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Ricezione delle informazioni sul sommario per i nuovi messaggi"
 
-#: camel/providers/imap/camel-imap-folder.c:2655
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Impossibile trovare il corpo del messaggio nella risposta di FETCH."
 
@@ -10474,43 +10503,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Per leggere e memorizzare la posta su server IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:645
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Estensione SSL/TLS non supportata"
 
-#: camel/providers/imap/camel-imap-store.c:676
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Negoziazione SSL non riuscita"
 
-#: camel/providers/imap/camel-imap-store.c:813
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Impossibile connettersi con il comando \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1237
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Il server IMAP %s non supporta il tipo di autenticazione richiesto %s "
 
-#: camel/providers/imap/camel-imap-store.c:1247
+#: camel/providers/imap/camel-imap-store.c:1252
 #: camel/providers/smtp/camel-smtp-transport.c:486
 #, c-format
 msgid "No support for authentication type %s"
 msgstr "Nessun supporto per il tipo di autenticazione %s"
 
-#: camel/providers/imap/camel-imap-store.c:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
 msgstr "%sInserire la password IMAP per %s@%s"
 
-#: camel/providers/imap/camel-imap-store.c:1284
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Non è stata inserita la password."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10521,27 +10550,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1800
-#: camel/providers/imap/camel-imap-store.c:1990
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Non è presente la cartella %s"
 
-#: camel/providers/imap/camel-imap-store.c:1818
-#: camel/providers/imap/camel-imap-store.c:2196
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"Il nome della cartella \"%s\" non è valido perché contiene il carattere \"%c"
-"\""
-
-#: camel/providers/imap/camel-imap-store.c:1876
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Alla cartella madre non è permesso contenere sottocartelle"
 
-#: camel/providers/imap/camel-imap-store.c:1931
+#: camel/providers/imap/camel-imap-store.c:1970
 #: 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 +10569,7 @@ msgstr "Alla cartella madre non è permesso contenere sottocartelle"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Impossibile creare la cartella: `%s': la cartella esiste."
 
-#: camel/providers/imap/camel-imap-store.c:2207
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Cartella madre sconosciuta: %s"
@@ -10657,58 +10677,58 @@ msgstr ""
 "Può anche essere usata per leggere un albero di cartelle stile Elm, Pine o "
 "Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "La radice di archiviazione %s non è un percorso assoluto"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "La radice di archiviazione %s non è una directory normale"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Impossibile avere la cartella %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Gli archivi locali non hanno una cartella della posta in arrivo"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "File di posta locale: %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Impossibile rinominare la cartella %s con %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Impossibile rinominare la cartella '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Impossibile cancellare il sommario della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Impossibile cancellare il file indice della cartella `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10775,7 +10795,7 @@ msgstr "Impossibile cancellare la cartella `%s': %s"
 msgid "not a maildir directory"
 msgstr "non è una directory maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11111,7 +11131,7 @@ msgid "Server rejected username/password"
 msgstr "Il server ha respinto il nomeutente/password"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -11120,8 +11140,8 @@ msgid "User cancelled"
 msgstr "Utente cancellato"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11130,53 +11150,53 @@ msgstr "Utente cancellato"
 msgid "Cannot get message %s: %s"
 msgstr "Impossibile prendere il messaggio: %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Errore interno: uid in formato non valido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr "Impossibile ricevere l'articolo %s dal server NNTP"
 
-#: camel/providers/nntp/camel-nntp-folder.c:357
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "Spedizione di posta non permessa dal server delle news"
 
-#: camel/providers/nntp/camel-nntp-folder.c:368
+#: camel/providers/nntp/camel-nntp-folder.c:373
 #, c-format
 msgid "Failed to send newsgroups header: %s: message not posted"
 msgstr ""
 "Fallita la spedizione dell'intestazione dei newsgroup: %s: messaggio non "
 "spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:408
-#: camel/providers/nntp/camel-nntp-folder.c:421
+#: 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 ""
 "Errore durante la spedizione ad un newsgroup: %s: messaggio non spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:433
+#: camel/providers/nntp/camel-nntp-folder.c:438
 msgid "Error reading response to posted message: message not posted"
 msgstr ""
 "Errore durante la lettura della risposta al messaggio spedito: messaggio non "
 "spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:436
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr "Errore nella spedizione del messaggio: %s: messaggio non spedito"
 
-#: camel/providers/nntp/camel-nntp-folder.c:452
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 "È impossibile spedire messaggi NNTP durante una sessione di lavoro non in "
 "linea!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:463
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "È impossibile copiare messaggi da una cartella NNTP!"
 
@@ -11820,7 +11840,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "allegato"
 
@@ -12331,16 +12351,12 @@ msgstr "Categorie Sync:"
 
 #. 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 %m/%d/%Y %H:%M"
@@ -12392,31 +12408,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"
@@ -12513,7 +12521,6 @@ msgid "Missing file name."
 msgstr "Manca il nome file."
 
 #. 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 "È necessario indicare un nome file."
@@ -12544,7 +12551,6 @@ msgid "Could not compile regular expression \"{1}\"."
 msgstr "Impossibile compilare espressione regolare \"{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 "Manca il nome."
@@ -12574,6 +12580,7 @@ msgstr "Scegliere un'altro nome."
 msgid "No sources selected."
 msgstr "Nessuna sorgente selezionata."
 
+#. filter:vfolder-no-source secondary
 #: filter/filter-errors.xml.h:36
 #, fuzzy
 msgid ""
@@ -12594,7 +12601,7 @@ msgstr "Scegli un file"
 msgid "<b>Then</b>"
 msgstr "<b>allora</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
 #: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Scegli cartella"
@@ -12889,7 +12896,7 @@ msgstr "non è segnato"
 msgid "Junk Test"
 msgstr "Test spazzatura"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:926
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etichetta"
@@ -12997,8 +13004,8 @@ msgstr "comincia per"
 msgid "Stop Processing"
 msgstr "Arresta processo in corso"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: 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"
@@ -13062,7 +13069,12 @@ msgstr "L'oggetto non contiene"
 msgid "Virtual _Folders"
 msgstr "Cartelle virtuali"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "A_ggiungi"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Sorgente delle cartelle virtuali"
 
@@ -13080,7 +13092,7 @@ msgid "Protocol"
 msgstr "Protocollo"
 
 #: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1061
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Senza nome"
 
@@ -13097,17 +13109,17 @@ msgstr "_Aggiungi firma"
 msgid "Signature(s)"
 msgstr "Firme"
 
-#: mail/em-composer-utils.c:883
+#: mail/em-composer-utils.c:888
 msgid "-------- Forwarded Message --------"
 msgstr "------- Messaggio inoltrato -------"
 
-#: mail/em-composer-utils.c:1494
+#: mail/em-composer-utils.c:1499
 msgid "an unknown sender"
 msgstr "un mittente sconosciuto"
 
 #. translators: attribution string used when quoting messages,
 #. it must contain a single single %%+05d followed by a single '%%s'
-#: mail/em-composer-utils.c:1504
+#: mail/em-composer-utils.c:1509
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "Lì %A, %Y/%m/%d alle %H:%M, %%+05d, %%s ha scritto:"
 
@@ -13145,95 +13157,120 @@ msgstr "<fare clic qui per selezionare una cartella>"
 msgid "Create New Folder"
 msgstr "Crea nuova cartella"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2344
-#: mail/mail-component.c:698
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Specificare dove creare la cartella:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crea cartella"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome della cartella:"
 
-#: mail/em-folder-tree.c:937
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Rimozione cartella %s"
 
-#: mail/em-folder-tree.c:939
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Lettura cartella %s in corso"
 
-#: mail/em-folder-tree.c:946
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Sposta messaggii in %s"
 
-#: mail/em-folder-tree.c:948
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copia messaggi in %s"
 
-#: mail/em-folder-tree.c:964
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Impossibile copiare o spostare messaggi in una cartella virtuale"
 
-#: mail/em-folder-tree.c:2118 mail/em-folder-tree.c:2131
-#: mail/em-folder-view.c:797 mail/em-folder-view.c:811
+#: mail/em-folder-tree.c:956 ui/evolution-mail-message.xml.h:110
+msgid "_Copy to Folder"
+msgstr "_Copia nella cartella"
+
+#: mail/em-folder-tree.c:957 ui/evolution-mail-message.xml.h:119
+msgid "_Move to Folder"
+msgstr "_Sposta nella cartella"
+
+#: 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
+msgid "_Move"
+msgstr "_Sposta"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Annulla attività"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Scegli cartella"
 
-#: mail/em-folder-tree.c:2158
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copia"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Archiviazione cartella '%s'"
 
-#: mail/em-folder-tree.c:2344 mail/mail-component.c:698
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Crea cartella"
 
-#: mail/em-folder-tree.c:2536
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Rinominare la cartella \\\"%s\\\" in:"
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Rinomina cartella"
 
-#: mail/em-folder-tree.c:2607 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Visualizza"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Apri in una nuova _finestra"
 
-#: mail/em-folder-tree.c:2613
-msgid "_Move"
-msgstr "_Sposta"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Nuova cartella..."
 
-#: mail/em-folder-tree.c:2620
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Rinomina"
 
-#: mail/em-folder-tree.c:2623 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Proprietà..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "Cartelle virtuali"
 
@@ -13251,306 +13288,308 @@ msgstr "Posta in arrivo"
 msgid "Loading..."
 msgstr "Sto caricando..."
 
-#: mail/em-folder-view.c:413 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: 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:506
-#: mail/mail-component.c:549
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 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:894 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Modifica come nuovo messaggio..."
 
-#: mail/em-folder-view.c:896
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "S_tampa"
 
-#: mail/em-folder-view.c:899 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Rispondi al mittente"
 
-#: mail/em-folder-view.c:900 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Rispondi alla _lista"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Rispondi a _tutti"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:813
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Inoltra"
 
-#: mail/em-folder-view.c:905
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Segue..."
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Flag completata"
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Flag annullata"
 
-#: mail/em-folder-view.c:910 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 "Segna come _letto"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Segna come non letto"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Segna come _importante"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Segna come non i_mportante"
 
-#: mail/em-folder-view.c:914 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 "Segna come _da cancellare"
 
-#: mail/em-folder-view.c:915 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 "Segna come _non da cancellare"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Ripristina"
 
-#: mail/em-folder-view.c:922
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Sposta nella cartella..."
 
-#: mail/em-folder-view.c:923 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copia nella cartella..."
 
-#: mail/em-folder-view.c:931
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Aggiungi mittente alla ru_brica"
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Applica _filtri"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Regole dei filtri"
 
-#: mail/em-folder-view.c:938
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Crea re_gola dal messaggio"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Cartella virtuale sull'_oggetto"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Cartella virtuale sul _mittente"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Cartella virtuale sui _destinatari"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Cartella virtuale sulla mailing _list"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtro sull'_oggetto"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtro sul _mittente"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtro sui _destinatari"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtro sulla _mailing list"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1717 mail/em-folder-view.c:1757
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Predefinito"
 
-#: mail/em-folder-view.c:1807
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Stampa messaggio"
 
-#: mail/em-folder-view.c:2072
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copia indirizzo del collegamento"
 
-#: mail/em-folder-view.c:2326
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Fare clic per spedire %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:84 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 "Da"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:85
+#: 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 "Rispondi-a"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:86 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 "A"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:87
+#: 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:746 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:88
+#: 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:748 mail/em-format-html.c:1577 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+#: 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:749 mail/em-format-html.c:1598 mail/em-mailer-prefs.c:91
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "News"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "%s allegato"
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Impossibile interpretare il messaggio S/MIME: errore sconosciuto"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Crittografia non supportata per tipo multipart/encrypted"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 "Impossibile interpretare il messaggio MIME.  Viene visualizzato il sorgente."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Formato firma non supportato"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 #, fuzzy
 msgid "Error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Errore sconosciuto durante la verifica della firma"
 
-#: mail/em-format-html.c:453 mail/em-format-html.c:455
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Scaricamento di '%s'"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Non firmato"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Firma valida"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:648
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Firma errata"
 
-#: mail/em-format-html.c:563 mail/em-format-html-display.c:649
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Firma valida, non è possibile verificare il mittente"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Non decifrato"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Cifrato, crittografia debole"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Cifrato"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:658
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Cifrato, crittografia forte"
 
-#: mail/em-format-html.c:834
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte esterna del messaggio malformulata."
 
-#: mail/em-format-html.c:864
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Puntatore al sito FTP (%s)"
 
-#: mail/em-format-html.c:875
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Puntatore al file locale (%s) valido al sito \"%s\""
 
-#: mail/em-format-html.c:877
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Puntatore a un file locale (%s)"
 
-#: mail/em-format-html.c:898
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Puntatore a dati remoti (%s)"
 
-#: mail/em-format-html.c:909
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Puntatore a dati esterni sconosciuti (tipo \"%s\")"
 
-#: mail/em-format-html.c:1151
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formattazione messaggio in corso"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:932
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Gestore di posta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13560,7 +13599,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Corrisponde: %d"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13569,7 +13608,7 @@ msgstr ""
 "Questo messaggio non è firmato. Non c'è garanzia che il mittente sia "
 "autentico."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13578,7 +13617,7 @@ msgstr ""
 "Questo messaggio è firmato ed è valido. Chi ha spedito il messaggio è molto "
 "probabilmente chi sostiene di essere."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13586,7 +13625,11 @@ msgstr ""
 "La firma di questo messaggio non può essere verificata. Può essere stata "
 "alterata durante il transito."
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr "Firma valida, non è possibile verificare il mittente"
+
+#: 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."
@@ -13594,7 +13637,7 @@ msgstr ""
 "Il messaggio è firmato con una firma valida ma chi ha spedito il messaggio "
 "non può essere verificato."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13603,7 +13646,7 @@ msgstr ""
 "Il messaggio non è cifrato. Il suo contenuto può essere letto durante il "
 "tragitto attraverso Internet."
 
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13613,7 +13656,7 @@ msgstr ""
 "difficile, ma non impossibile che un estraneo abbia letto il contenuto di "
 "questo messaggio in un tempo ragionevolmente breve."
 
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13621,7 +13664,7 @@ msgstr ""
 "Questo messaggio è crittografato. È difficile che un estraneo possa leggere "
 "il contenuto del messaggio."
 
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13631,57 +13674,57 @@ msgstr ""
 "Dovrebbe essere molto difficile che un estraneo riesca a vedere il contenuto "
 "di questo messaggio in un tempo ragionevole."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Visualizza certificato"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Certificato non è visualizzabile"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Completato il %d %B %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Scadute:"
 
 # per il %d %b %l:%M %p
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "per il %d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Visualizza inlinea"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Nascondi"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d di %d"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrato)"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Ogni volta"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Ogni giorno"
 
-#: mail/em-mailer-prefs.c:104
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Ogni settimana"
 
-#: mail/em-mailer-prefs.c:105
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Ogni mese"
 
@@ -13743,7 +13786,9 @@ msgstr ""
 msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
-msgstr "Impossibile leggere le impostazioni dalle installazioni precedenti di Evolution, `evolution/config.xmldb' non esiste o è danneggiato."
+msgstr ""
+"Impossibile leggere le impostazioni dalle installazioni precedenti di "
+"Evolution, `evolution/config.xmldb' non esiste o è danneggiato."
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13800,28 +13845,28 @@ msgstr "Selezionare un server."
 msgid "No server has been selected"
 msgstr "Nessun server è stato selezionato"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Non mostrare questo messagio in futuro."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "messaggio"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Salva messaggio..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Aggiungi indirizzo"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:989
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail da %s"
@@ -14321,58 +14366,67 @@ msgid "spamd port"
 msgstr "porta di spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Preferenze di composizione"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configura qui le preferenze della posta, incluse sicurezza e aspetto "
 "visualizzazione"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Configura qui il controllo ortografico, le firme e il compositore dei "
 "messaggi"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configura qui gli account di posta elettronica"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Controllo di configurazione degli account di posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente della posta di Evolution."
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Compositore della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Controllo di configurazione del compositore di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Controllo delle preferenze della posta di Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "Account di posta"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Preferenze di posta"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Posta"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution sta importando posta da Elm"
@@ -14630,74 +14684,75 @@ msgstr "%s mailing list"
 msgid "Add Filter Rule"
 msgstr "Aggiungi una regola di filtro"
 
-#: mail/mail-component.c:459
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d eliminato"
 
-#: mail/mail-component.c:461
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d spazzatura"
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d bozze"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d spediti"
 
-#: mail/mail-component.c:488
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d non spediti"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totali"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d non letti"
 
-#: mail/mail-component.c:650
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nuovo messaggio di posta"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Invia _messaggio"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Componi un nuovo messaggio di posta"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nuova cartella di posta"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "Cartella di _posta"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Crea una nuova cartella di posta"
 
-#: mail/mail-component.c:760
+#: mail/mail-component.c:795
 msgid "Failed upgrading Mail settings or folders."
-msgstr "Fallito l'aggiornamento delle impostazioni della posta o delle cartelle."
+msgstr ""
+"Fallito l'aggiornamento delle impostazioni della posta o delle cartelle."
 
-#: mail/mail-config.c:911
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Verifica servizi"
 
-#: mail/mail-config.c:989 mail/mail-config.c:993
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Connessione al server..."
 
@@ -15419,6 +15474,7 @@ msgstr ""
 msgid "Are you sure you want to send a message in HTML format?"
 msgstr "Sicuro di voler cancellare questo URL?"
 
+#. mail:ask-send-html secondary
 #: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
@@ -15453,12 +15509,12 @@ msgstr ""
 "un'idea dell'argomento della lettera."
 
 #. 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?"
 msgstr "Segnala l'invio di messaggi senza i campi A o Cc."
 
+#. mail:ask-send-only-bcc-contact secondary
 #: mail/mail-errors.xml.h:24
 #, fuzzy
 msgid ""
@@ -15537,7 +15593,6 @@ msgid ""
 msgstr "Rimuovi permanentemente i messaggi cancellati da questa cartella"
 
 #. 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 "Se si continua non si sarà più in grado di recuperare questi messaggi."
@@ -15577,6 +15632,7 @@ msgstr ""
 msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr "Il vostro messaggio con oggetto \"{0}\" non è stato spedito."
 
+#. mail:camel-exception secondary
 #: mail/mail-errors.xml.h:59
 #, fuzzy
 msgid ""
@@ -15611,13 +15667,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
@@ -15647,8 +15696,6 @@ 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}\"."
@@ -15665,9 +15712,6 @@ msgid "Cannot create temporary save directory."
 msgstr "Impossibile creare una cartella di salvataggio temporanea."
 
 #. 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}\"."
@@ -15696,7 +15740,6 @@ msgid "Cannot delete system folder \"{0}\"."
 msgstr "Impossibile eliminare la cartella %s: cartella inesistente"
 
 #. 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 "
@@ -15730,13 +15773,11 @@ msgstr ""
 "sottocartelle, saranno persi irrimediabilmente."
 
 #. 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 "Impossibile rinominare \"{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 "Una cartella di nome \"{1}\" esiste già. Usare un altro nome."
@@ -15747,25 +15788,21 @@ msgid "Because \"{2}\"."
 msgstr "Perché \"{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 "Impossibile spostare la cartella \"{0}\" su \"{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 "Impossibile aprire sorgente \"{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 "Impossibile aprire l'obbiettivo \"{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 "Impossibile copiare la cartella \"{0}\" su \"{1}\"."
@@ -15781,7 +15818,6 @@ msgid "Cannot open source \"{1}\""
 msgstr "Impossibile aprire sorgente \"{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 "Impossibile salvare i cambiamenti sull'account."
@@ -15885,6 +15921,7 @@ msgstr "Impossibile aggiungere cartella virtuale \"{0}\"."
 msgid "vFolders automatically updated."
 msgstr "Cartelle virtuali aggiornate automaticamente."
 
+#. mail:vfolder-updated secondary
 #: mail/mail-errors.xml.h:196
 #, fuzzy
 msgid ""
@@ -15904,6 +15941,7 @@ msgstr ""
 msgid "Mail filters automatically updated."
 msgstr "Filtri posta aggiornati automaticamente."
 
+#. mail:filter-updated secondary
 #: mail/mail-errors.xml.h:204
 #, fuzzy
 msgid ""
@@ -15919,8 +15957,10 @@ msgstr ""
 #. mail:ask-migrate-existing primary
 #: mail/mail-errors.xml.h:210
 msgid "Problem migrating old mail folder \"{0}\"."
-msgstr "Problemi durante la migrazione dalla vecchia cartella di posta \"{0}\"."
+msgstr ""
+"Problemi durante la migrazione dalla vecchia cartella di posta \"{0}\"."
 
+#. mail:ask-migrate-existing secondary
 #: mail/mail-errors.xml.h:212
 msgid ""
 "A non-empty folder at \"{1}\" already exists.\n"
@@ -15930,7 +15970,8 @@ msgid ""
 msgstr ""
 "Esiste già una cartella non vuota su \"{1}\".\n"
 "\n"
-"Puoi: saltare questa cartella, sovrascriverla, aggiungerne il contenuto o uscire.\n"
+"Puoi: saltare questa cartella, sovrascriverla, aggiungerne il contenuto o "
+"uscire.\n"
 
 #: mail/mail-errors.xml.h:216
 msgid "Ignore"
@@ -15945,7 +15986,7 @@ msgstr "S_ovrascrivi"
 msgid "_Append"
 msgstr "_Invia"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Sto facendo ping a %s"
@@ -16253,84 +16294,89 @@ msgstr "Cartella non valida: `%s' "
 msgid "Setting up vfolder: %s"
 msgstr "Impostazione cartella virtuale %s in corso"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Aggiornamento cartella virtuale per %s in corso"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Aggiornamento cartella virtuale per %s in corso"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Cartelle virtuali"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Modifica cartella virtuale"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nuova cartella virtuale"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Non visto"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Visto"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Risposto"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Messaggi multipli non visti"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Messaggi multipli"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Il più basso"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Più basso"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Più alto"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Il più alto"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Oggi %I:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l %M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3124
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generazione elenco messaggi"
 
@@ -16739,37 +16785,42 @@ msgstr ""
 "Evolution di Ximian è attualmente in modalità non in linea. Fare clic su "
 "questo tasto per lavorare in linea."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Posta a %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "I tool di GNOME Pilot non sembrano essere installati."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Errore nell'esecuzione di %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy non è installato."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy non può essere eseguito."
 
-#: shell/e-shell-window-commands.c:170
+#: shell/e-shell-window-commands.c:171
 #, fuzzy
 msgid "About Evolution"
 msgstr "Informazioni su Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_In linea"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Non in linea"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Non in linea"
 
@@ -17006,8 +17057,9 @@ msgstr "Non chiedere di nuovo"
 msgid "Evolution can import data from the following files:"
 msgstr "Evolution può importare dati dai seguenti file:"
 
-#: shell/main.c:230
-#, fuzzy, c-format
+#. Preview/Alpha/Beta version warning message
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
 "of the Evolution groupware suite.\n"
@@ -17042,7 +17094,7 @@ msgstr ""
 "Speriamo che il risultato dei nostri sforzi Vi piaccia e attendiamo con\n"
 "ansia i Vostri contributi!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
@@ -17051,49 +17103,39 @@ msgstr ""
 "Grazie\n"
 "Il Gruppo Evolution di Ximian\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Non chiedere più"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Evolution shell."
-msgstr "Impossibile inizializzare la shell di Ximian Evolution."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Impossibile inizializzare la shell di Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Attivazione del componente Evolution specificato."
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Inizia in modalità non in linea"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Inizia in modalità in linea"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forza la chiusura di tutti i componenti di Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forza la migrazione da Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Inviare l'output del debugging di tutte i componenti ad un file."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -17107,6 +17149,7 @@ msgstr ""
 msgid "Insufficient disk space for upgrade."
 msgstr "Spazio su disco insufficiente per l'aggiornamento."
 
+#. shell:upgrade-nospace secondary
 #: shell/shell-errors.xml.h:4
 msgid ""
 "Upgrading your data and settings will require upto {0} of disk space, but "
@@ -17116,6 +17159,7 @@ msgid ""
 "can continue."
 msgstr ""
 
+#. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
 msgid ""
 "Upgrade from previous version failed:\n"
@@ -17124,6 +17168,7 @@ msgstr ""
 "Aggiornamento dalla versione precedente fallito:\n"
 "{0}"
 
+#. shell:upgrade-failed secondary
 #: shell/shell-errors.xml.h:11
 msgid ""
 "{1}\n"
@@ -17133,12 +17178,43 @@ msgid ""
 msgstr ""
 "{1}<\n"
 "\n"
-"Se si sceglie di continuare, potresti non avere accessi a qualche tuo vecchio dato.\n"
+"Se si sceglie di continuare, potresti non avere accessi a qualche tuo "
+"vecchio dato.\n"
 
 #: shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Continua"
 
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Impossibile inizializzare la shell di Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Guida agli account di Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17731,7 +17807,8 @@ msgid "_Preview Pane"
 msgstr "_Anteprima"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Salva come VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18439,7 +18516,8 @@ msgid "Open the selected message in a new window"
 msgstr "Apre il messaggio selezionato in una nuova finestra"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 "Apre il messaggio selezionato in una finestra di composizione per rinviarlo"
 
@@ -18555,58 +18633,46 @@ msgstr "Cartella virtuale sull'_oggetto..."
 msgid "_Attached"
 msgstr "_Allegato"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copia nella cartella"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crea filtro dal messaggio"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Vai a"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Più _grande"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Visualizzazione _messaggio"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Sposta nella cartella"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Messaggio successivo"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Visualizzazione _normale"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Apri messaggio"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Messaggio _precedente"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citato"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Rispedisci..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "S_trumenti"
@@ -19008,6 +19074,11 @@ msgstr "Preferenze di posta"
 msgid "_Send / Receive"
 msgstr "_Invia / ricevi"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Finestra"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Per società"
@@ -19075,10 +19146,6 @@ msgstr "Sca_denza:"
 msgid "With _Status"
 msgstr "Imposta _stato"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Attività"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19237,30 +19304,30 @@ msgstr "Altro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 #, fuzzy
 msgid "Evolution Error"
 msgstr "Evolution"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 #, fuzzy
 msgid "Evolution Warning"
 msgstr "Posta di Evolution"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 #, fuzzy
 msgid "Evolution Information"
 msgstr "Dettagli della riunione"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 #, fuzzy
 msgid "Evolution Query"
 msgstr "Test di Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:389
+#: widgets/misc/e-error.c:410
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19409,3 +19476,27 @@ msgstr "%s (...)"
 #, c-format
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% completata)"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Impossibile inizializzare gnome-vfs"
+
+#~ msgid "Display a message"
+#~ msgstr "Visualizza un messaggio"
+
+#~ msgid "Select source"
+#~ msgstr "Seleziona sorgente"
+
+#, fuzzy
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
+#~ "\""
+#~ msgstr ""
+#~ "Il nome della cartella \"%s\" non è valido perché contiene il carattere "
+#~ "\"%c\""
+
+#, fuzzy
+#~ msgid "Cannot initialize the Evolution shell: %s"
+#~ msgstr "Impossibile inizializzare la shell di Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Rispedisci..."
diff --git a/po/ja.po b/po/ja.po
index 45c0cbf46b..043af6b48f 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution HEAD\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-04-25 00:12+0900\n"
 "Last-Translator: Takeshi AIHANA <aihana@gnome.gr.jp>\n"
 "Language-Team: Japanese <gnome-translation@gnome.gr.jp>\n"
@@ -23,6 +23,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution アドレス帳"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "連絡先のヘッダ: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution ミニカード"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "現在のアドレス帳フォルダには"
@@ -43,14 +51,6 @@ msgstr "カードがあります"
 msgid " card"
 msgstr "カードがあります"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "連絡先のヘッダ: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution ミニカード"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "デフォルトで同期するアドレス:"
@@ -65,63 +65,20 @@ msgstr "アドレス帳を読み込めませんでした"
 msgid "Could not read pilot's Address application block"
 msgstr "パイロットのアドレス・アプリケーション・ブロックを読み込めませんでした"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "自動補完"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "証明書"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "連絡先"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution アドレス帳"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolutoin アドレス帳アドレス・ポップアップ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution アドレス帳アドレス・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution アドレス帳カード・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution アドレス帳コンポーネント"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution アドレス帳フォルダ・ビューア"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/MIME 証明書管理コントロール"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名で LDAP サーバにアクセスします"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution フォルダ設定コントロール"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "認証に失敗しました。\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "この S/MIME 証明書のマネージャ"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -159,41 +116,45 @@ msgstr "連絡先グループ(_C):"
 msgid "Create a new contacts group"
 msgstr "新しい連絡先グループを作成します"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP サーバを使った認証に失敗しました"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "ルート DSE に問い合わせできませんでした"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "サーバがサポートしていない検索ベースを返しました"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "このサーバは LDAPv3 スキーマ情報をサポートしていません"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "スキーマ情報の取得でエラーが発生しました"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "移行中..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' の移行中:"
@@ -201,8 +162,8 @@ msgstr "'%s' の移行中:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "このコンピュータ"
 
@@ -210,7 +171,7 @@ msgstr "このコンピュータ"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "プライベート"
@@ -272,20 +233,41 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名で LDAP サーバにアクセスします"
+#: addressbook/gui/component/addressbook-view.c:674
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "カレンダ '%s' を削除します。続行してもよろしいですか？"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "認証に失敗しました。\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "新しいアドレス帳"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s (ユーザ %s) のパスワードを入力して下さい"
+#: 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
+#: 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
+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
+#: 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 "連絡先"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -305,6 +287,61 @@ msgstr "Evolution が自動補完を行う前に入力しておく文字数"
 msgid "URI for the folder last used in the select names dialog"
 msgstr "名前選択ダイアログで使用する最後のフォルダの URI"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "自動補完"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "連絡先"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "証明書"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "ここで自動補完を設定します"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution アドレス帳"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolutoin アドレス帳アドレス・ポップアップ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution アドレス帳アドレス・ビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution アドレス帳カード・ビューア"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution アドレス帳コンポーネント"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/MIME 証明書管理コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution フォルダ設定コントロール"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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) "
@@ -326,6 +363,7 @@ msgstr " サポートしている検索ベースの表示(_H) "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -397,7 +435,7 @@ msgstr "連絡先グループ(_C):"
 msgid "Address Book Properties"
 msgstr "アドレス帳のプロパティ"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "常に"
@@ -412,106 +450,97 @@ msgid "Basic"
 msgstr "基本"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "色(_O):"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "接続"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "識別名(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "識別名(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-メール・アドレス:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-メール・アドレス:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Evolution はこの E-メール・アドレスを使ってサーバを利用した認証を行います"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "サポートする検索ベース"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "全般"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "しない"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "レベル１"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "色の選択"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "検索範囲(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "検索ベース(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "検索ベース(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "検索範囲(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "検索"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -521,7 +550,7 @@ msgstr ""
 "る場合にのみ、\n"
 "Evolution は LDAP サーバに接続します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -537,7 +566,7 @@ msgstr ""
 "ファイヤーウォールの内側にある場合、Evolution は SSL/TLS を使いません。\n"
 "その理由は、既にセキュリティ保護された接続環境にあるからです。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -551,19 +580,19 @@ msgstr ""
 "ティの恩恵を\n"
 "受けることができなくなることを意味します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "サブ・ディレクトリ"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "サポートする検索ベース"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -573,7 +602,7 @@ msgstr ""
 "検索ベースとは、検索を開始するエントリの識別名 (DN) です。\n"
 "空白のままにすると、ディレクトリ・ツリーのルートから検索を開始します。"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -588,14 +617,14 @@ msgstr ""
 "す。\n"
 "検索範囲 \"レベル１\" には検索ベースの第一レベルのエントリのみ含まれます。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -604,7 +633,7 @@ msgstr ""
 "これはダウンロードするエントリの最大数です。\n"
 "この数を大きくすると、アドレス帳を開く速度が遅くなります。"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -613,7 +642,7 @@ msgstr ""
 "これは Evolution があなたを識別する方法です。\"E-メール・アドレス\" に対する"
 "この設定には、LDAP サーバに対する匿名アクセスが必要となります。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -622,7 +651,7 @@ msgstr ""
 "これはこのサーバの名前で、Evolution フォルダ一覧の中に表示されます。\n"
 "表示目的にのみ使用されます。"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -633,128 +662,135 @@ msgstr ""
 "標準ポートの一覧が提供されています。\n"
 "特別に指定する必要がある場合は、システム管理者にお尋ね下さい。"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "時刻の書式:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS を使用する(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "使用する識別名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "使用する E-メール・アドレス"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "可能ならば"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "連絡先グループ(_C):"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "ダウンロード制限(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-メール・アドレス:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "ログイン方式(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "名前(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "ポート番号(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "優先度(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "検索ベース(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "サーバ名(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "サーバ(_E):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "タイムアウト(分)(_T):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "セキュリティ保護された接続 (SSL) の利用(_U):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "カード"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "接続タブ"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "全般タブ"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "分"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "検索タブ"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution アドレス帳の名前選択インターフェース"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全て削除"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "全て削除"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "連絡先一覧の表示"
@@ -777,22 +813,15 @@ msgstr "連絡先へ追加"
 msgid "Unnamed Contact"
 msgstr "名前なしの連絡先"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "情報ソース"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "アドレス帳から連絡先の選択"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution アドレス帳の名前選択インターフェース"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -851,125 +880,127 @@ msgid "<b>Work</b>"
 msgstr "<b>仕事</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "住所２:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "住所:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "記念日:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "アシスタント:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "誕生日:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "カレンダ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "市:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "会社:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "連絡先エディタ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "国:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "担当部署:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "予定の有無:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "氏名(_N)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "自宅"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN メッセンジャ"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "メーリング・アドレス"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "マネージャ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "あだ名(_C):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "メモ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "その他"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "私書箱(_P):"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "個人の情報"
@@ -992,9 +1023,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "仕事"
@@ -1023,23 +1054,39 @@ msgstr "item7"
 msgid "item8"
 msgstr "item8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"この連絡先を\n"
+"本当に削除してもよろしいですか？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "編集可"
 
@@ -2011,91 +2058,109 @@ msgstr "ザンビア"
 msgid "Zimbabwe"
 msgstr "ジンバブエ"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL インスタント・メッセンジャ"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo メッセンジャ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr "場所"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "ユーザ名"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "元のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "対象のアドレス帳"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "新しい連絡先です"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "書き込み可能な項目"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "変更済"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "カテゴリ・エディタが起動していません。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "この連絡先が属しているカテゴリ:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "オプションを以下から選択して下さい。"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "ニジェール"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "次のフィルタ・ルール:\n"
+
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL インスタント・メッセンジャ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo メッセンジャ"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+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
+msgid "Location"
+msgstr "場所"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "ユーザ名"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "連絡先の簡易追加"
@@ -2113,22 +2178,6 @@ msgstr "氏名(_F):"
 msgid "E-_mail:"
 msgstr "E-メール(_M):"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"この連絡先を\n"
-"本当に削除してもよろしいですか？"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "住所２(_2):"
@@ -2275,8 +2324,8 @@ msgstr "連絡先一覧エディタ"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "書籍"
 
@@ -2337,6 +2386,428 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "拡張検索"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(マップ)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "マップ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "メンバーのリスト化"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-メール"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "組織"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "役職"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "ビデオ会議"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "電話"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "FAX"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "仕事"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "ウェブ"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "携帯電話"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "プライベート"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "ノート"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "職業"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "メール"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "ホームページ"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "成功"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr "バックエンドが動作中です"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "オフライン・リポジトリ"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "アドレス帳がありません"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+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
+msgid "Permission denied"
+msgstr "権限がありません"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "連絡先が見つかりません"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "既に連絡先 ID があります"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "プロトコルがサポートされていません"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "キャンセル済み"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr "キャンセルできませんでした"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "認証に失敗しました"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "認証を必要としています"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+msgid "No such source"
+msgstr "そのようなソースはありません"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "その他のエラー"
+
+#: 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 ""
+"このアドレス帳を開けませんでした。パスの存在とアクセス権をチェックして下さ"
+"い。"
+
+#: 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 ""
+"このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
+"サーバがダウンしていることをを意味します。"
+
+#: 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 ""
+"このバージョンの Evolution は LDAP サポート無しでコンパイルされています。"
+"Evolution で LDAP を利用するには、下記のリンクから OpenLDAP を取得した後、"
+"CVS 版のソースを再ビルド・インストールする必要があります。"
+
+#: 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 ""
+"このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
+"がダウンしていることを意味します。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "アドレス帳を開けません"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"検索結果を返す側のサーバか表示する側の Evolution のどちらかを越えて、\n"
+"複数のカードがこの問い合わせに一致しました。\n"
+"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
+"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"この検索にかかった所要時間が、サーバの制限時間または\n"
+"このアドレス帳に対して設定した制限時間を越えました。\n"
+"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
+"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "一覧を追加する際にエラーが発生しました"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "連絡先を追加する際にエラーが発生しました"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "一覧を修正する際にエラーが発生しました"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "連絡先を修正する際にエラーが発生しました"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "一覧を削除する際にエラーが発生しました"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "連絡先を削除する際にエラーが発生しました"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
+"本当に全ての連絡先を表示してもよろしいですか？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"既に %s があります。\n"
+"上書きしてもよろしいですか？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "一覧"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "連絡先の移動先"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "連絡先のコピー先"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "複数の連絡先の移動先"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "複数の連絡先のコピー先"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "アドレス帳の選択"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "複数の vCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s の vCard"
+
+#.
+#. * 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 "E-メール"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "メール２"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "メール３"
+
+#: 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
+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 "E-メール・アドレスの結合"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "と他に %d 個の連絡先"
+msgstr[1] "と他に %d 個の連絡先"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "全ての vCard の表示"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+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
 msgid "No contacts"
 msgstr "連絡先なし"
@@ -2351,8 +2822,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "問い合わせ"
 
@@ -2406,9 +2877,10 @@ msgstr "アドレス帳"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "vCard 形式で保存"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2473,7 +2945,7 @@ msgid "Cut"
 msgstr "切り取り"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2484,18 +2956,8 @@ msgstr "コピー"
 msgid "Paste"
 msgstr "貼り付け"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "削除"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "現在の表示"
 
@@ -2511,7 +2973,7 @@ msgstr ""
 "再度利用する場合は Evolution を再起動して下さい。"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "任意のカテゴリ"
@@ -2552,21 +3014,6 @@ msgstr "カテゴリ"
 msgid "Company Phone"
 msgstr "会社の電話"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "メール"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "メール２"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "メール３"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "苗字"
@@ -2603,29 +3050,14 @@ msgstr "ジャーナル"
 msgid "Manager"
 msgstr "マネージャ"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "携帯電話"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "あだ名"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "ノート"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "事務所"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "組織"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "その他の FAX"
@@ -2677,21 +3109,29 @@ msgstr "単位"
 msgid "Web Site"
 msgstr "ウェブ・サイト"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "幅"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "高さ"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "項目"
@@ -2708,10 +3148,6 @@ msgstr "テキスト・モデル"
 msgid "Max field name length"
 msgstr "項目名の最大長"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "カラムの幅"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2740,402 +3176,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(マップ)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "マップ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "メンバーのリスト化"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-メール"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "役職"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "ビデオ会議"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "電話"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "FAX"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "仕事"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "ウェブ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "プライベート"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "職業"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "ホームページ"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "成功"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr "バックエンドが動作中です"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "オフライン・リポジトリ"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "アドレス帳がありません"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-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:57
-msgid "Permission denied"
-msgstr "権限がありません"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "連絡先が見つかりません"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "既に連絡先 ID があります"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "プロトコルがサポートされていません"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "キャンセル済み"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr "キャンセルできませんでした"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "認証に失敗しました"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "認証を必要としています"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS は無効です"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr "そのようなソースはありません"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "その他のエラー"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"このアドレス帳を開けませんでした。これは誤った URI を指定したか、または LDAP "
-"サーバがダウンしていることをを意味します。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"このバージョンの Evolution は LDAP サポート無しでコンパイルされています。"
-"Evolution で LDAP を利用するには、下記のリンクから OpenLDAP を取得した後、"
-"CVS 版のソースを再ビルド・インストールする必要があります。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"このアドレス帳を開けませんでした。これは誤った URI を指定したか、またはサーバ"
-"がダウンしていることを意味します。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "アドレス帳を開けません"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"検索結果を返す側のサーバか表示する側の Evolution のどちらかを越えて、\n"
-"複数のカードがこの問い合わせに一致しました。\n"
-"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
-"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"この検索にかかった所要時間が、サーバの制限時間または\n"
-"このアドレス帳に対して設定した制限時間を越えました。\n"
-"更にキーワードを指定して絞り込み検索するか、このアドレス帳の\n"
-"ディレクトリ・サーバの設定で検索結果の制限を上げて下さい。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "このアドレス帳のバックエンドは、この問い合わせを解析できませんでした。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "このアドレス帳のバックエンドは、この問い合わせの実行を拒否しました。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "この問い合わせは完全に終了しませんでした。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "変更を保存しますか？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "破棄(_D)"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "一覧を追加する際にエラーが発生しました"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "連絡先を追加する際にエラーが発生しました"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "一覧を修正する際にエラーが発生しました"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "連絡先を修正する際にエラーが発生しました"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "一覧を削除する際にエラーが発生しました"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "連絡先を削除する際にエラーが発生しました"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"%d 個の連絡先を %d 個の新しいウィンドウで開くことになります。\n"
-"本当に全ての連絡先を表示してもよろしいですか？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"既に %s があります。\n"
-"上書きしてもよろしいですか？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "上書き"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s の保存中にエラーが発生しました: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "一覧"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "連絡先の移動先"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "連絡先のコピー先"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "複数の連絡先の移動先"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "複数の連絡先のコピー先"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "アドレス帳の選択"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "複数の vCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s の vCard"
-
-#.
-#. * 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 "E-メール"
-
-#: 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
-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 "E-メール・アドレスの結合"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "と他に %d 個の連絡先"
-msgstr[1] "と他に %d 個の連絡先"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "全ての vCard の表示"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "コンパクト vCard の表示"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-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"
@@ -3179,11 +3222,6 @@ msgstr "Evolution vCard インポータ"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: 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.c:998
 msgid "Print contacts"
 msgstr "複数の連絡先の印刷"
@@ -3193,6 +3231,11 @@ msgstr "複数の連絡先の印刷"
 msgid "Print contact"
 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"
 msgstr "10 pt. Tahoma"
@@ -3377,16 +3420,6 @@ msgstr "連絡先印刷のテスト"
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "標準出力のかわりに出力するファイルの指定"
@@ -3443,6 +3476,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "デフォルトのアドレス帳の読み込み中にエラーが発生しました。"
@@ -3455,11 +3498,12 @@ msgstr "ファイルの入力"
 msgid "No filename provided."
 msgstr "ファイル名が指定されていません。"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "名前なしの一覧"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "パスワードの入力"
 
@@ -3491,117 +3535,55 @@ msgstr "デフォルトの優先度:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "パイロットの ToDo アプリケーション・ブロックを読み込めませんでした"
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "カレンダ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "ここでお使いのタイムゾーンやカレンダ、タスク一覧を設定します"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution カレンダとタスク"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution カレンダの設定コントロール"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution カレンダ設定メッセージのビューア"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution カレンダのビューア"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution カレンダ/タスクのエディタ"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution タスクのビューア"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution カレンダのコンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution タスクのコンポーネント"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "タスク"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution カレンダ・アラーム通知サービス"
-
-#: 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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution アラーム"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "閉じる(_L)"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "アラーム停止(_Z)"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "アラーム停止時間 (分)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "予定の編集(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "アラーム停止(_Z)"
+
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "却下"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "全て却下"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "無効な説明です。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3614,12 +3596,12 @@ msgstr ""
 "起動: %s\n"
 "終了: %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3631,7 +3613,7 @@ msgstr ""
 "の設定がされていました。その代わりに Evolution は\n"
 "通常のリマインダ・ダイアログを表示します。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3648,19 +3630,19 @@ msgstr ""
 "\n"
 "本当に、このプログラムを起動してもよろしいですか？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution カレンダ・アラーム通知サービス"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo を初期化できませんでした"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs を初期化できませんでした"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "アラーム通知サービスファクトリを作成できませんでした"
 
@@ -3769,56 +3751,42 @@ 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "予定を削除する際に確認するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "フォルダを完全削除する際に確認するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "完了したタスクを隠すかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "時刻を午前/午後の代わりに 24時間制で表示するかどうか"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示するかどうか"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "サマリが次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "説明が次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "コメントが次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "場所が次のものを含む"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "一致しない"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "カレンダ"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3827,68 +3795,73 @@ msgstr ""
 "この操作は選択したイベントより古いイベントを全て完全に削除します。続行する"
 "と、これらのイベントを復旧できなくなります。"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "次より古いイベントを抹消する"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "日"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 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.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 "%Y/%m/%d (%a)"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%Y年 %B %e日"
 
 #. 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:464
+#: 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 "%B%e日"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "カレンダ '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "プロパティ..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "カレンダの読み込み中..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "イベントと会議を生成するためのカレンダ '%s' を開けません"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "イベントと会議を生成するために利用可能なカレンダがありません"
 
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3896,51 +3869,56 @@ msgstr ""
 "指定したカレンダは読み込み専用なのでイベントを作成できません。読み込み/書き込"
 "みモードのカレンダを指定して下さい。"
 
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "カレンダ"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "新しい予定"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "予定(_A)"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "新しい予定を作成します"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "新規の会議"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "会議(_E)"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "新しい会議を召集します"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "新しい終日の予定"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "終日の予定(_D)"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "新しい終日の予定を作成します"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "新しいカレンダ"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "カレンダ(_A)"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "新しいカレンダを作成します"
 
@@ -3970,15 +3948,35 @@ msgstr "週間表示"
 msgid "Month View"
 msgstr "月間表示"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "サマリが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "説明が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "コメントが次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "場所が次のものを含む"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "一致しない"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "カレンダをオープンする際にエラーが発生しました"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "カレンダをオープンする際の方法がサポートされていません"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "カレンダをオープンする権限がありません"
 
@@ -3987,19 +3985,6 @@ msgstr "カレンダをオープンする権限がありません"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "'%s' にあるフォルダを開けませんでした"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "カレンダが表示する URI"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "表示するビューの種類"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "オーディオ・アラームのオプション"
@@ -4065,7 +4050,7 @@ msgstr "回 / "
 msgid "hours"
 msgstr "時間"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "アクション/トリガ"
 
@@ -4084,14 +4069,14 @@ msgstr "基本"
 msgid "Date/Time:"
 msgstr "日付/時刻:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "メッセージを表示する"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "音楽を再生する"
 
+#: 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 "リマインダ"
@@ -4106,6 +4091,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:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "サマリ:"
@@ -4144,10 +4130,96 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "予定を開始した時"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr "カレンダを取得する場所を指定して下さい。"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "ソースの格納場所 '%s' は well-formed ではありません。"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "ソースの格納場所 '%s' は webcal のソースではありません。"
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "既に '%s' というソースが指定したグループの中にあります"
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "グループ '%s' はリモートです。カレンダを取得する場所を指定して下さい。"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "カレンダの追加"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "タスク・グループの追加"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+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
+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
+msgid "_Add Calendar"
+msgstr "カレンダの追加(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+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
+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
+msgid "_Type:"
+msgstr "種類(_T):"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "有効"
 
@@ -4161,19 +4233,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "有効"
 
@@ -4198,162 +4270,176 @@ msgid "60 minutes"
 msgstr "60 分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "警告"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>その他</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>実施</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>タスク一覧のオプション</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 "<b>仕事</b>"
+
+#: 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 "一日の終了(_E):"
 
-#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "表示(_D)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "有効(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "金曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "時"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "分"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "月曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "日(_U)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "土曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "リマインダの表示(_O):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "期日ナビゲータの中に週番号を表示する(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "日曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "今日が期限のタスクの色(_A):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "木(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "タスク一覧"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "木曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "時刻"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "タイムゾーン(_Z):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "時刻の書式:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "火曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "週の開始(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "水曜日"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "平日"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "勤務日:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "12 時間制 (午前/午後)(_1)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "24 時間制(_2)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "URL の追加(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "アイテムを削除する時に確認する(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "月間ビューで週末を短縮する(_C)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "一日の開始(_D):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "表示(_D)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4363,132 +4449,46 @@ msgstr "表示(_D)"
 msgid "_Edit"
 msgstr "編集(_E)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "予定の有無の公開(_F)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "金(_F)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "全般(_G)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "完了したタスクを隠す期間(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "月(_M)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "期限を過ぎたタスクの色(_O):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "土(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "週間と月間ビューの中に予定の期日を表示する(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "時間を分割する単位(_T):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "火(_T)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "水(_W)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "前に表示する"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "カレンダを取得する場所を指定して下さい。"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "ソースの格納場所 '%s' は well-formed ではありません。"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "ソースの格納場所 '%s' は webcal のソースではありません。"
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "既に '%s' というソースが指定したグループの中にあります"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "グループ '%s' はリモートです。カレンダを取得する場所を指定して下さい。"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "カレンダの追加"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "タスク・グループの追加"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-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
-msgid "_Add Calendar"
-msgstr "カレンダの追加(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-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
-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
-msgid "_Type:"
-msgstr "種類(_T):"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "週"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4564,79 +4564,79 @@ msgstr "%s  変更しました。この変更を無視してエディタを更�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  何も変更していませんが、エディタを更新しますか？"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "整合性のエラー: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " から "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(完了 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "完了しました"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (期日 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "期日 "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "オブジェクトを更新できませんでした"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "予定の編集"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "サマリ無し"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "別名で保存..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "現在のバージョンを使用できません！"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "整合性のエラー: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " から "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(完了 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "完了しました"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (期日 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "期日 "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "送信元ソースを開けませんでした"
@@ -4757,27 +4757,27 @@ msgstr "委任先:"
 msgid "Enter Delegate"
 msgstr "委任先の入力"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "予定"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "リマインダ"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "繰り返し"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "会議"
 
@@ -4789,7 +4789,7 @@ msgstr "開始日のないイベント"
 msgid "Event with no end date"
 msgstr "終了日のないイベント"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "開始日が間違っています"
 
@@ -4875,10 +4875,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4897,15 +4897,15 @@ msgstr "主催者が必要です。"
 msgid "At least one attendee is required."
 msgstr "最低一名の出席者が必要です。"
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "委任先(_D)..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5176,23 +5176,18 @@ msgstr "変更の破棄(_D)"
 msgid "Save Event"
 msgstr "イベントの保存"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "ソースの選択"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "送信する %s の選択"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "カレンダ"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "転送先フォルダ:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
 msgstr "タスク一覧"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5221,38 +5216,44 @@ msgid "% _Complete"
 msgstr "% 完了(_C)"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "高い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "低い"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "普通"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "開始していない"
 
@@ -5287,11 +5288,11 @@ msgstr "ウェブ・ページ(_W):"
 msgid "Assignment"
 msgstr "割当て"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "期日が間違っています"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s' のタスクを開けません。"
@@ -5300,8 +5301,9 @@ msgstr "'%s' のタスクを開けません。"
 msgid "Con_fidential"
 msgstr "極秘(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "説明:"
@@ -5445,101 +5447,56 @@ msgstr "%s (%s の時点で)"
 msgid "%s for an unknown trigger type"
 msgstr "トリガーの種類が不明な %s"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "公開"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "非公開"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "極秘"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "クリックすると %s を開きます"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "終了日"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "タイトルなし"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: 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-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "サマリ"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "予定なし"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-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:629
-msgid "E"
-msgstr "東"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "西"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "期日(_D):"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理的な位置は書式に合わせて入力して下さい: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "ステータス:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "優先度(_P):"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "いいえ"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "ウェブ・ページ(_W):"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5585,17 +5542,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "オブジェクトの更新"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "開く(_O)"
 
@@ -5604,41 +5570,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "印刷(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "貼り付け(_P)"
 
@@ -5693,74 +5660,153 @@ msgstr "優先度"
 msgid "Start date"
 msgstr "開始日"
 
+#: 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:11
 msgid "Task sort"
 msgstr "タスクの並び替え"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "新しい予定(_A)..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "新しい終日のイベント(_E)"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "新しい会議"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "新しいタスク"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "今日にする(_T)"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "日付の選択(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "予定の有無の公開(_P)"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "カレンダへコピー(_Y)..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "カレンダへ移動(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "会議のスケジュール(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "iCalender 形式で転送(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "このイベントの削除(_O)"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "全てのイベントの削除(_A)"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "今日へ移動(_T)"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "指定日へ移動(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "設定(_S)..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "終了日"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -5784,36 +5830,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分分割"
+#. 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 "午前"
+
+#. 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 "午後"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 "%B%e日 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 "%B%e日"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "午前"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "午後"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分分割"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5922,10 +5968,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>なし</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "ステータス:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5955,7 +5997,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6168,59 +6210,55 @@ msgstr "添付した内容に含まれるカレンダ・メッセージは正し
 msgid "The attachment has no viewable calendar items"
 msgstr "添付した内容には表示可能なカレンダ情報がありません"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "カレンダ・ファイルを更新できません！\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "更新が完了しました\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "アイテムがまだ存在していないので出席状況を更新できませんでした"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "オブジェクトが不正なので更新できません\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "これは現在の出席者からの応答ではありません。出席者として追加しますか？"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "不正なステータスのため出席状況が更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA システムでエラーが見つかりました\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "オブジェクトが見つかりませんでした\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "カレンダを更新する権限がありません\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "出席状況が更新されました\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "出席状況を更新できませんでした！\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "削除が完了しました"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "アイテムが送信されました！\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "そのアイテムは送信できませんでした！\n"
 
@@ -6337,28 +6375,6 @@ msgstr "委任済"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%Y年 %B %e日 %A"
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 "%Y/%m/%d (%a)"
-
-#. 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 "%Y/%m/%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "外出中"
@@ -6419,7 +6435,34 @@ msgstr "会議の開始時間(_S):"
 msgid "Meeting _end time:"
 msgstr "会議の終了時間(_E):"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 "%Y年 %B %e日 %A"
+
+#. 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 "%Y/%m/%d (%a)"
+
+#. 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 "%Y/%m/%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "'%s' のパスワードを入力して下さい"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6428,24 +6471,19 @@ msgstr ""
 "%s でエラー:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"%s\n"
-"用のタスク・バックエンドが\n"
-"クラッシュしました。"
+msgid "The task backend for '%s' has crashed."
+msgstr "'%s' 用のタスク・バックエンドがクラッシュしました。"
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s のタスクを開きます"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6454,51 +6492,105 @@ msgstr ""
 "%s を開く際にエラー:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "タスクの読み込み"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "タスクの完了..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "指定したオブジェクトの削除..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "抹消"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "タスク"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s の予定の読み込み"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s のタスクの読み込み"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "%s を開く"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "'%s' 用のカレンダ・バックエンドがクラッシュしました。"
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "'%s' 用のタスク・バックエンドがクラッシュしました。"
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "抹消中"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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 "Evolution カレンダとタスク"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution カレンダの設定コントロール"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution カレンダ設定メッセージのビューア"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution カレンダ/タスクのエディタ"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution カレンダのコンポーネント"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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 "タスク(_T)"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4 月"
@@ -6642,6 +6734,23 @@ msgstr "誕生日と記念日"
 msgid "On The Web"
 msgstr "ウェブ"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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' を開けません。"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "'%s' のタスクを開けません。"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1 日"
@@ -6861,7 +6970,7 @@ msgid "Contacts: "
 msgstr "連絡先: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "印刷プレビュー"
 
@@ -6873,25 +6982,44 @@ msgstr "アイテムの印刷"
 msgid "Print Setup"
 msgstr "プリンタの設定"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "タスク一覧 '%s' を削除します。続行してもよろしいですか？"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "新しいタスク一覧"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", 選択 %d 通"
+msgstr[1] ", 選択 %d 通"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "タスクの読み込み"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "イベントと会議の作成に必要なタスク一覧 '%s' を開けません"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "タスクを作成できるカレンダがありません"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6899,40 +7027,31 @@ msgstr ""
 "指定したタスク一覧は読み込み専用なのでイベントを作成できません。読み込み/書き"
 "込みモードのカレンダを指定して下さい。"
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "新規のタスク"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "タスク(_T)"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "新しいタスクを作成します"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "新しいタスク・グループ"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "タスク・グループ(_T)"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "新しいタスク・グループを作成します"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "表示するタスク・フォルダの URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "'%s' のタスクを読み込めませんでした"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6944,11 +7063,11 @@ msgstr ""
 "\n"
 "本当にこれらのタスクを削除しますか？"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "このメッセージを二度と表示しない。"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "タスクの印刷"
 
@@ -8597,7 +8716,7 @@ msgstr "フォルダの内容をローカルへコピーする (オフライン�
 msgid "Downloading new messages for offline mode"
 msgstr "オフライン・モードでの新しいメッセージのダウンロード"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "オフライン用の準備フォルダ '%s'"
@@ -8690,33 +8809,6 @@ msgstr "(user-tag) に対する不正な引数"
 msgid "Error executing filter search: %s: %s"
 msgstr "フィルタ検索実行中にエラー: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"正規表現の構文を解析できません: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"正規表現での検索を実行中にエラー: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) は一つの論理結果を必要とします。"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "未知のヘッダでクエリを実行しています: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8748,7 +8840,52 @@ msgstr "Junk と非 Junk またはそのどちらかのメッセージの学習�
 msgid "Filtering new message(s)"
 msgstr "新しいメッセージのフィルタリング中"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"正規表現の構文を解析できません: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"正規表現での検索を実行中にエラー: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) は一つの論理結果を必要とします。"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) は一つの論理結果を必要とします。"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) は一つの論理結果を必要とします。"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "未知のヘッダでクエリを実行しています: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8759,15 +8896,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "GnuPG のユーザ ID ヒントの解析に失敗しました。"
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "GnuPG のパスワード要求の解析に失敗しました。"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8776,27 +8913,27 @@ msgstr ""
 "次のユーザのキーを解除するパスワードが必要です:\n"
 " \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "キャンセルしました"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "秘密鍵の解除に失敗しました: 指定した三つのパスワードがおかしいです。"
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG から予期しない応答がありました: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "暗号化に失敗しました: 正しい宛先が指定されていません。"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8807,85 +8944,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr " %s の GPG 化に失敗しました: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "署名データを生成できませんでした: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 の実行に失敗しました: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 の実行に失敗しました"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "このメッセージにはデジタル署名された部分があります"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "このメッセージの整合性を確認できません: 作業用ファイルを作成できませんでし"
 "た: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "暗号化したデータを生成できませんでした: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "これはデジタル署名された部分です"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "暗号化された内容"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "メッセージの内容を解析できません"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
-
-#: 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 "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s' をロックできません"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8907,6 +9024,26 @@ msgstr "fcntl(2) を使ったロックに失敗しました: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) を使ったロックに失敗しました: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "ロッキング・ヘルパー・パイプが構築できません: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "ロッキング・ヘルパーのプロセスを作成できません: %s"
+
+#: 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 "'%s' をロックできませんでした: lock-helper のプロトコル・エラーです"
+
+#: 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"
@@ -9159,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "サーバから間違った認証応答がありました。"
 
@@ -9359,7 +9496,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "暗号化する証明書(_P):"
 
 #: camel/camel-smime-context.c:360
@@ -9376,7 +9513,7 @@ msgstr "%s のフォルダ・ロックを生成できません: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "ローカルの '送信箱' フォルダへの追加に失敗しました: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "認証に失敗しました。\n"
@@ -9441,98 +9578,98 @@ msgstr "フォルダを作成できません: %s: %s"
 msgid "Cannot set message digests"
 msgstr "メッセージ %s を取得できません: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "証明書の署名に失敗しました"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "妥当な署名"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "署名者: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "DATA コマンドが失敗しました"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "フォルダ '%s' を作成できません: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "%s のフォルダ・ロックを生成できません: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "サーバへユーザ名の送信に失敗しました"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "コマンドは実装されていません"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9549,16 +9686,26 @@ msgstr "フォルダ '%s' を作成できません: フォルダが存在しま�
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "フォルダを作成できません: この格納場所で不正な操作です"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "フォルダを削除できません: %s: 不正な操作です"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "フォルダ名を変更できません: %s: 不正な操作です"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "ゴミ箱"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Junk"
@@ -9679,7 +9826,7 @@ msgstr "キーの利用方法が認証署名をサポートしていません"
 msgid "Error in application verification"
 msgstr "アプリケーションの検証でエラーが発生しました"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9692,11 +9839,11 @@ msgstr ""
 "指紋:              %s\n"
 "署名:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BAD"
 
@@ -9720,7 +9867,7 @@ msgstr ""
 "受諾してみますか？"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9735,7 +9882,7 @@ msgstr ""
 "\n"
 "受諾してみますか？"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9744,7 +9891,7 @@ msgstr ""
 "認証問題: %s\n"
 "発行者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9753,7 +9900,7 @@ msgstr ""
 "おかしな認証ドメイン: %s\n"
 "発行者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9762,7 +9909,7 @@ msgstr ""
 "証明書の有効期限切れ: %s\n"
 "発行者: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9776,17 +9923,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL '%s' を解析できませんでした"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "'%s' の格納中にエラー: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%s に %s のようなメッセージはありません"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "メッセージの仮想フォルダへのコピーまたは移動ができません"
 
@@ -9795,11 +9942,6 @@ msgstr "メッセージの仮想フォルダへのコピーまたは移動がで
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "フォルダを削除できません: %s: そのようなフォルダはありません"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "フォルダ名を変更できません: %s: 不正な操作です"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9814,10 +9956,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Junk フォルダへメッセージをコピーできません"
 
 #: 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 "全てのフォルダの新着メールをチェックする"
@@ -9848,6 +9992,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell Groupwise サーバ・アクセス用です"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9868,26 +10013,323 @@ msgstr ""
 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' を取得できません: %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 "フォルダ '%s' を取得できません: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "フォルダ '%s' を作成できません: %s"
+
+#: 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' を取得できません: %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:429
+#, 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
+#, 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: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/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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "接続をキャンセルしました"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "未知のエラー"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"POP サーバ %s へ接続できません: 要求された認証方式をサポートしていません。"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s%s@%s の SMTP パスワードを入力して下さい。"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "POP サーバ %s で認証に失敗しました: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
+
+#: 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' を作成できません: %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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' を作成できません: %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' を作成できません: %s"
+
+#: 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
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "操作はキャンセルされました"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "突然サーバが接続を切りました: %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:1089
-msgid "Unknown error"
-msgstr "未知のエラー"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9932,21 +10374,21 @@ msgstr "フォルダ %s を作成できませんでした: %s"
 msgid "Could not load summary for %s"
 msgstr "%s のサマリをロードできませんでした"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "変更メッセージの解析中"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -9962,25 +10404,25 @@ msgstr ""
 "メッセージを取得できません: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "そのようなメッセージはありません"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "現在このメッセージは有効ではありません"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 応答にメッセージ本体がありませんでした。"
 
@@ -10018,23 +10460,6 @@ msgstr "サーバへ接続する際にカスタム・コマンドを使用する
 msgid "Command:"
 msgstr "コマンド:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "フォルダ"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "購読するフォルダだけ表示する"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "サーバが提供するフォルダのネームスペースより優先する"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "ネームスペース"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "このサーバ上の INBOX 内にある新規メッセージへフィルタを適用する"
@@ -10055,86 +10480,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP サーバのメールを読んだり大切なメールを保存します"
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP サーバ %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s の %s にある IMAP サービス"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL は無効です"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "接続をキャンセルしました"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"セキュリティ保護されたモードで IMAP サーバ %s への接続に失敗しました: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 拡張がサポートされていません。"
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 接続に失敗しました"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "コマンド \"%s\" で接続できませんでした: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP サーバ %s は要求した認証タイプ %s をサポートしていません"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "パスワードを入力していません"
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10145,25 +10527,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "そのようなフォルダ %s はありません"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "フォルダ名 \"%s\" に文字 \"%c\"を含めることはできません"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "親フォルダには複数のサブフォルダを含めることはできません"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10171,7 +10546,7 @@ msgstr "親フォルダには複数のサブフォルダを含めることはで
 msgid "Cannot create folder `%s': folder exists."
 msgstr "フォルダ '%s' を作成できません: フォルダが存在します"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知の親フォルダ: %s"
@@ -10280,58 +10655,58 @@ msgstr ""
 "り格納します\n"
 "(Elm, Pine, Mutt 形式のフォルダの読み込みにも対応)"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "保存したルート %s は絶対パスではありません"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "保存したルート %s は通常のフォルダではありません"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: 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:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "ローカル・メールのファイル %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10397,7 +10772,7 @@ msgstr "フォルダ '%s' を削除できませんでした: %s"
 msgid "not a maildir directory"
 msgstr "maildir 形式のフォルダではありません"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10728,7 +11103,7 @@ msgid "Server rejected username/password"
 msgstr "サーバはユーザ名/パスワードを拒否しました"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10737,8 +11112,8 @@ msgid "User cancelled"
 msgstr "ユーザが取り消しました"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10747,51 +11122,51 @@ msgstr "ユーザが取り消しました"
 msgid "Cannot get message %s: %s"
 msgstr "メッセージ %s を取得できません: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "内部エラー: UID の書式が不正です: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "ニュース・サーバは投稿を許可していません"
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "オフライン状態の間は NNTP メッセージを投稿できません！"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP フォルダからメッセージのコピーはできません！"
 
@@ -10916,7 +11291,8 @@ msgid "Could not get group: %s"
 msgstr "グループを取得できませんでした: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "メッセージを受信できませんでした: 想定していないエラーです"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -10969,8 +11345,8 @@ msgstr "uid %s のメッセージはありません"
 msgid "Retrieving POP message %d"
 msgstr "POP メッセージ %d を取得中"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "原因不明"
 
@@ -11414,7 +11790,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "添付"
 
@@ -11458,6 +11834,104 @@ msgstr "MIME タイプ:"
 msgid "Suggest automatic display of attachment"
 msgstr "添付した内容を自動的に表示するか提示する"
 
+#: 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 "ファイルを開けません"
+
+#: 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:1479
+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] "添付ファイルが <b>%d</b> 個あります"
+msgstr[1] "添付ファイルが <b>%d</b> 個あります"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+"添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
+
+#: 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 ""
+"コンポーザ・ウィンドウを生成できませんでした:\n"
+"アドレス選択コントロールを開けません。"
+
+#: 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 ""
+"コンポーザ・ウィンドウを作成できませんでした:\n"
+"HTML エディタ・コンポーネントを開くことができません。\n"
+"正しいバージョンの gtkhtml と libgtkhml が\n"
+"インストールされているか確認して下さい。\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"コンポーザ・ウィンドウを作成できませんでした:\n"
+"HTML エディタ・コンポーネントを開けません。"
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(コンポーザに編集できないテキスト形式のメッセージが含まれています。)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "送信先を指定します"
@@ -11538,211 +12012,134 @@ msgstr "<ここをクリックして投稿するフォルダを選択して下�
 msgid "Attach file(s)"
 msgstr "ファイルの添付"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"送信メッセージに署名できません: このアカウントからの送信に対応した署名付き証"
-"明書がありません。"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"送信するメッセージを暗号化できません: 利用アカウントに対する暗号化に必要な証"
-"明書セットがありません。"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "ファイルを開けません"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "エディタからメッセージを取得できません"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "タイトルなしのメッセージ"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "ファイルを開く"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "自動生成"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "署名:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "添付ファイルが <b>%d</b> 個あります"
-msgstr[1] "添付ファイルが <b>%d</b> 個あります"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "添付ファイル・バーを隠す (ここに添付ファイルをドロップして下さい)(_A)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-"添付ファイル・バーを表示する (ここに添付ファイルをドロップして下さい)(_A)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "メッセージの作成"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "メッセージへファイルを添付します"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"コンポーザ・ウィンドウを生成できませんでした:\n"
-"アドレス選択コントロールを開けません。"
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"コンポーザ・ウィンドウを作成できませんでした:\n"
-"HTML エディタ・コンポーネントを開くことができません。\n"
-"正しいバージョンの gtkhtml と libgtkhml が\n"
-"インストールされているか確認して下さい。\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"コンポーザ・ウィンドウを作成できませんでした:\n"
-"HTML エディタ・コンポーネントを開けません。"
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(コンポーザに編集できないテキスト形式のメッセージが含まれています。)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "本当にタイトルなしの予定を削除してもよろしいですか？"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "未読のメッセージ数"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "変更を保存しますか？"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "パイプが作成できませんでした: %s"
+msgid "Don't Recover"
+msgstr "削除しない"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "署名ファイルを保存できませんでした: %s"
+msgid "Recover"
+msgstr "削除する"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "署名ファイルを保存できませんでした: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "変更の破棄(_D)"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "変更を保存しますか？"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "警告: 変更済みのメッセージ"
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Don't Recover"
-msgstr "削除しない"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "本当にタイトルなしの予定を削除してもよろしいですか？"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "削除する"
+msgid "Discard Changes"
+msgstr "変更の破棄(_D)"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "メッセージの保存..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "パイプが作成できませんでした: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "未読のメッセージ数"
+msgid "Could not read signature file \"{0}\"."
+msgstr "署名ファイルを保存できませんでした: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "警告: 変更済みのメッセージ"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "メッセージへファイルを添付します"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "メールを作成する前にアカウントを設定して下さい。"
 
@@ -11872,7 +12269,8 @@ msgstr ""
 "既にその名前のファイルがあります。\n"
 "上書きしますか？"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "ファイルを上書きしますか？"
 
@@ -12048,81 +12446,97 @@ msgstr "比較するもう一つの時間の選択"
 msgid "_Filter Rules"
 msgstr "フィルタのルール(_F)"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"正規表現 '%s' でエラーです:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "ファイル '%s' は存在しないか、または通常のファイルではありません。"
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "会議の更新"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "識別名(_N):"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "ファイル名を指定して下さい。"
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "フォルダ %s の移動中"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "ファイル '%s' は存在しないか、または通常のファイルではありません。"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "割当て"
+msgid "Missing folder."
+msgstr "フォルダ %s の移動中"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "フォルダを指定して下さい。"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "サーバが指定されていません"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"正規表現 '%s' でエラーです:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "日付を選択して下さい。"
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "割当て"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "このフィルタに名前を付けて下さい。"
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "この仮想フォルダに名前を付けて下さい。"
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "ファイル名を指定して下さい。"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "フォルダを指定して下さい。"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "サーバが指定されていません"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12134,64 +12548,11 @@ msgstr "ファイルの選択"
 msgid "<b>Then</b>"
 msgstr "<b>実施</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "フォルダの選択"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "重要"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "ToDo"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "保留"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "テスト"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "ルール名:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "タイトルなし"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>条件</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "次の条件で実行する:"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "全ての条件が合った時"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "幾つかの条件が合った時"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "入力"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "出力"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12280,6 +12641,75 @@ 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
+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
+msgid "To Do"
+msgstr "ToDo"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "保留"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "テスト"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "ルール名:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>条件</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "全ての条件が合った時"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "幾つかの条件が合った時"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "次の条件で実行する:"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "委任済"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "宛先"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "%s へ返信"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "添付:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "入力"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "出力"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12409,7 +12839,7 @@ msgstr "にフラグがない"
 msgid "Junk Test"
 msgstr "ジャンクのテスト"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "ラベル"
@@ -12446,7 +12876,7 @@ msgstr "プログラムへ引き渡す"
 msgid "Play Sound"
 msgstr "サウンドの再生"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "既読"
 
@@ -12515,9 +12945,9 @@ msgstr "が次のもので始まる"
 msgid "Stop Processing"
 msgstr "処理停止"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "件名"
@@ -12578,101 +13008,60 @@ msgstr "件名が次のものを含まない"
 msgid "Virtual _Folders"
 msgstr "仮想フォルダ(_F)"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "追加(_D)"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "仮想フォルダのソース"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "コンポーザの設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "セキュリティとメッセージ表示を含む、メール設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "スペルチェック、署名とメッセージ・コンポーザの設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "使用する E-メールアカウントをここで設定します。"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution メール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution メール・アカウント設定コントロール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution メール・コンポーネント"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution メール・コンポーザ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution メール・コンポーザ設定コントロール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution メール・フォルダ・ビューア"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution メール設定コントロール"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "メール"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "メールの設定"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[デフォルト]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "アカウント名"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "プロトコル"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "名前なし"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "言語"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "署名スクリプトの追加"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "署名"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- 転送するメッセージ --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%Y/%m/%d (%a) %H:%M %%+05d に %%s さんは書きました:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "検索結果から仮想フォルダの作成(_V)..."
 
@@ -12706,264 +13095,437 @@ msgstr "<ここをクリックしてフォルダを選択して下さい>"
 msgid "Create New Folder"
 msgstr "新規フォルダの作成"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "フォルダ名(_N):"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "仮想フォルダ"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "一致しないもの"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "受信箱"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "読み込み中..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "フォルダ %s の移動中"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "フォルダ %s のコピー中"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "フォルダ %s へメッセージの移動中"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "フォルダ %s へメッセージのコピー中"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "メッセージをトップレベルの中に移せません"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "移動(_M)"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "タスクの取り消し"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "フォルダの選択"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "コピー"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "フォルダ '%s' の作成中"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "フォルダの作成"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "フォルダ \"%s\" の変更先:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "フォルダ名の変更"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "表示(_V)"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "新しいウィンドウで開く(_N)"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "移動(_M)"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "新しいフォルダ(_N)"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "名前の変更(_R)"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "仮想フォルダ"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "メール"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "新規のメッセージとして編集(_E)..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "印刷(_P)"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "メーリング・リストへ返信(_L)"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "全員へ返信(_A)"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "転送(_F)"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "フォロー・アップ(_W)..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "完了フラグの付与(_G)"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "フラグの解除(_E)"
 
-#: mail/em-folder-view.c:787 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 "既読としてマーク(_K)"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "未読としてマーク(_U)"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "重要としてマーク(_I)"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "重要でないとしてマーク(_M)"
 
-#: mail/em-folder-view.c:791 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 "ジャンクとしてマーク(_J)"
 
-#: mail/em-folder-view.c:792 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 "ジャンクではないとしてマーク(_N)"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "削除の取り消し(_N)"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "フォルダへ移動(_V)..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "フォルダへコピー(_C)..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "差出人をアドレス帳に追加"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "フィルタの適用(_Y)"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "Junk のフィルタ(_I)"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "メッセージからルールの作成(_T)"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "件名の仮想フォルダ(_S)"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "差出人の仮想フォルダ(_N)"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "宛先の仮想フォルダ(_R)"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "メーリング・リストの仮想フォルダ(_L)"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "仮想フォルダのスレッド表示"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "件名のフィルタ(_J)"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "差出人のフィルタ(_D)"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "宛先のフィルタ(_C)"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "メーリング・リストのフィルタ(_M)"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "スレッド表示のフィルタ"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "デフォルト"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "メッセージの印刷"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "リンク先のコピー(_C)"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "クリックすると %s へのメッセージを作成します"
 
-#: mail/em-folder-view.c:2214
+#: 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: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
+msgid "Newsgroups"
+msgstr "ニュースグループ"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "クリックすると %s を開きます"
+msgid "%s attachment"
+msgstr "添付ファイル: %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "サポートしていない S/MIME の暗号化の種類"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "サポートしていない署名の書式"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "署名を検証する際にエラーが発生しました"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "署名を検証する際に不明なエラーが発生しました"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "'%s' の取得中"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "署名なし"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "妥当な署名"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "不正な署名"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "署名妥当ですが、差出人を検証できません"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "暗号化なし"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "暗号化済み (レベルは不十分)"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "暗号化済み"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "暗号化済み (レベルは強力)"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "おかしな external-body 部分です。"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP サイト (%s) を指しています"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "ローカル・ファイル (%s) にリンクしています"
+
+#: 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\" タイプ) にリンクしています"
+
+#: mail/em-format-html.c:1137
+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 "<I> (%R %a %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -12971,22 +13533,14 @@ msgstr "クリックすると %s を開きます"
 msgid "Matches: %d"
 msgstr "一致するもの: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "署名なし"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "このメッセージは署名されていません。このメッセージの信頼性を保証できません。"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "妥当な署名"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -12994,21 +13548,17 @@ msgstr ""
 "このメッセージには署名が付与されています。このメッセージは非常に信頼できるも"
 "のであることを意味します。"
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "不正な署名"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr "転送中に改鼠されているので、このメッセージの署名を検証できません。"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "署名妥当ですが、差出人を検証できません"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13016,11 +13566,7 @@ msgstr ""
 "このメッセージには妥当な署名が付与されていますが、メッセージの差出人を検証で"
 "きません。"
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "暗号化なし"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13028,11 +13574,7 @@ msgstr ""
 "このメッセージは暗号化されていません。インターネットを介して閲覧される可能性"
 "があります。"
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "暗号化済み (レベルは不十分)"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13042,11 +13584,7 @@ msgstr ""
 "です。(現実的には困難ですが)、このメッセージの内容を外部の者に閲覧される可能"
 "性があります。"
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "暗号化済み"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13054,11 +13592,7 @@ msgstr ""
 "このメッセージは暗号化されています。外部の者がこのメッセージの内容を閲覧する"
 "ことは困難と思われます。"
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "暗号化済み (レベルは強力)"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13067,178 +13601,60 @@ msgstr ""
 "このメッセージは強力なアルゴリズムで暗号化されています。現実的に、外部の者が"
 "このメッセージの内容を閲覧することは非常に困難と思われます。"
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "証明書の表示(_V)"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "この証明書は表示可能な形式ではありません"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M に完了"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "期限切れ:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%Y年%B%e日 %p %l:%M まで"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "インライン表示(_V)"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "隠す(_H)"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d / %d ページ"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "'%s' の取得中"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "おかしな external-body 部分です。"
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP サイト (%s) を指しています"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "ローカル・ファイル (%s) はサイト \"%s\" に正しくリンクしています"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "ローカル・ファイル (%s) にリンクしています"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "リモート・データ (%s) にリンクしています"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "不明な外部データ (\"%s\" タイプ) にリンクしています"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "メッセージの整形"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "差出人"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "返信先"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "宛先"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "メール・クライアント"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%R %a %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日付"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "ニュースグループ"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "添付ファイル: %s"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "S/MIME メッセージを解析できませんでした: 不明なエラーです"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "サポートしていない S/MIME の暗号化の種類"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME メッセージを解析できませんでした。ソースを表示します。"
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "サポートしていない署名の書式"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "署名を検証する際にエラーが発生しました"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "署名を検証する際に不明なエラーが発生しました"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (内蔵)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "いつでも"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "日に一度"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "週に一度"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "月に一度"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13250,25 +13666,55 @@ msgstr ""
 "\n"
 "Evolution がお使いのフォルダを移行している間、少々お待ち下さい..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "POP3 UID キャッシュの移行に失敗しました: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "フォルダ '%s' を作成できません: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "フォルダ展開ステータスの移行に失敗しました: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"ファイル・デスクリプタをコピーできません: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "%s のグループ一覧ファイルを保存できません: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "POP サーバ %s で認証に失敗しました: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "フォルダ '%s' の作成に失敗しました: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "'%s' の格納場所を開けませんでした: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "フォルダ '%s' の作成に失敗しました: %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"出力ファイルを生成できません: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13279,88 +13725,74 @@ msgstr "別名で保存..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "壁紙にセットする(_B)"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "差出人へ返信(_R)"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "リンクをブラウザで開く(_O)"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "メッセージの送信(_N)..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "アドレス帳に追加(_A)"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "%s で開く..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "この格納場所は購読をサポートしていないか、有効になっていません。"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "購読済み"
 
-#: mail/em-subscribe-editor.c:637 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 "フォルダ"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "サーバを一つ選択して下さい。"
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "サーバが指定されていません"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "このメッセージを二度と表示しない"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "フィルタ"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- 転送するメッセージ --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y/%m/%d (%a) %H:%M %%+05d に %%s さんは書きました:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "メッセージ"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "メッセージの保存..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "住所の追加"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "%s からのメッセージ"
@@ -13378,11 +13810,13 @@ msgid "Check incoming mail being junk"
 msgstr "受信メールがジャンクかどうかチェックする"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "引用を強調表示する際の色"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "引用を強調表示する際の色です。"
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13485,14 +13919,20 @@ msgid "Last time empty trash was run"
 msgstr "最後にゴミ箱を空にした時間"
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "ラベルと対応する色のリスト"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "アカウントのリスト"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "アカウントのリスト"
+
+#: 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."
@@ -13501,27 +13941,32 @@ msgstr ""
 "は /apps/evolution/mail/accounts からの相対的な名前つきサブ・フォルダが含まれ"
 "ます。"
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "カスタムのヘッダとそれらが有効かどうかのリストです。"
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Evolution メール・コンポーザで利用するラベルのリストです。このリストには "
 "name:color という形式で HTML で使用する色 (16形式) が含まれています。"
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "bonobo コンポーネント・ビューアでチェックする MIME 型のリスト"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "http を介して受信する HTML メッセージの画像読み込み"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13531,123 +13976,115 @@ msgstr ""
 "可能な値: 0: 画像を読み込まない、1: 差出人がアドレス帳に登録されている場合は"
 "読み込む、2: 画像を常に読み込む"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "ログのフィルタリング"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "指定したログ・ファイルに対してログのフィルタリング処理を行います。"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "フィルタリングするログ・ファイル"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "フィルタリング処理の対象となるログファイルです。"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "既読マークを付与するまでの時間"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "メールを指定してから既読マークを付与するまでの時間です。"
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "メッセージの \"プレビュー\" で使用する引用記号"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "メッセージの \"プレビュー\" で使用する引用記号です。"
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr "メッセージ・ウィンドウの高さ (デフォルト)"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "メッセージ・ウィンドウの幅 (デフォルト)"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "メッセージの表示スタイル (標準、全てのヘッダ、ソース)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "終了時にゴミ箱を空にするまでの最小日数"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "終了時にゴミ箱を空にするまでの最短の日数です。"
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "新着メールの通知で使用するサウンド・ファイル"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "新着メール通知の種類"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "件名が空の場合に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "フォルダを完全に抹消する前にユーザに警告します。"
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "ユーザが完全削除する際に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "ユーザが Bcc のみ入力したら警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "HTML 形式を希望しない連絡先へ HTML メールを送信する前に確認します。"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "ユーザが To/Cc 先を付けずに送信しようとする時に確認します。"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "希望しない HTML をユーザが送信する前に警告する"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr ""
 "テキストの中に混入されているリンク情報を識別して、URI タグで置き換えます。"
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 "テキストの中に混入されているスマイリーの情報を識別して、画像に置き換えます。"
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "メールを受信したらスパムテストを実行する"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n です。"
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "デフォルトで HTML メールを送信する"
@@ -13694,7 +14131,8 @@ msgid "Spell check inline"
 msgstr "インラインでスペルをチェックする"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+#, fuzzy
+msgid "Subscribe dialog default height"
 msgstr "購読ダイアログの高さ (デフォルト)"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13839,33 +14277,63 @@ msgstr "ユーザが起動した spamd のポート番号です。"
 msgid "spamd port"
 msgstr "spamd のポート番号"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape メール・インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "コンポーザの設定"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "セキュリティとメッセージ表示を含む、メール設定"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "スペルチェック、署名とメッセージ・コンポーザの設定"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox インポータ"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "使用する E-メールアカウントをここで設定します。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution メール"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution メール・アカウント設定コントロール"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution メール・コンポーネント"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution メール・コンポーザ"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution メール・コンポーザ設定コントロール"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution メール設定コントロール"
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "メールの設定"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "メール"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13873,15 +14341,15 @@ msgstr "Evolution は古い Elm 形式メールをインポート中です"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "少々お待ち下さい"
 
@@ -13910,18 +14378,46 @@ msgid "Select folder to import into"
 msgstr "インポート先フォルダの選択"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "'%s' のインポート"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "mailbox のインポート"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape メール・インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox インポータ"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s の解析"
@@ -13931,7 +14427,7 @@ msgstr "%s の解析"
 msgid "Priority Filter \"%s\""
 msgstr "優先度フィルタ \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13956,7 +14452,7 @@ msgstr ""
 "スコアに変換し、優先度の代わりにスコアを利用するフィルタになります。\n"
 "意図したように動作するか、インポートしたフィルタをチェックして下さい。"
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13968,7 +14464,7 @@ msgstr ""
 "Evolution ではこのフィルタリングをサポートしていません。\n"
 "これらのフィルタは将来的に利用できなくなります。"
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13982,23 +14478,23 @@ msgstr ""
 "これらのフィルタは文字列がメールの中に含まれているか否かを\n"
 "テストするように変更されました。"
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution は古い Netscape データのインポート中です"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Netscape データのインポート"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "設定"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "メールのフィルタ"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14031,124 +14527,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution アカウント・エディタ"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "鍵の約款"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "ホスト(_H):"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "ユーザ名:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "パス(_P):"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "%s へメール"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "件名は %s です"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "%s からメール"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s メーリング・リスト"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "%s へ返信"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "フィルタ・ルールの追加"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "削除済 %d 通"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "Junk %d 通"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "草案 %d 通"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "送信済 %d 通"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "未送信 %d 通"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "合計 %d 通"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", 未読 %d 通"
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ", 選択 %d 通"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "新しいメッセージ"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "メッセージ(_M)"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "新しいメッセージを作成します"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "新しいメール・フォルダ"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "メールのフォルダ(_F)"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "新しいメール・フォルダを作成します"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "表示するメール・ソースの URI"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "身元情報"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14158,12 +14666,12 @@ msgstr ""
 "ではありませんが、送信する E-メールの中にこの情報を挿入する場合は入力して下さ"
 "い。"
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "メールの受信"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14171,15 +14679,15 @@ msgstr ""
 "メールを受信するサーバの情報を入力して下さい。不明な場合は、システム管理者ま"
 "たはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "オプションを以下から選択して下さい。"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "メールの送信"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14187,11 +14695,11 @@ msgstr ""
 "メールを送信する方法について情報を入力して下さい。不明な場合は、システム管理"
 "者またはインターネット・サービス・プロバイダ (ISP) にお尋ね下さい。"
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "アカウント管理"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14203,14 +14711,6 @@ msgstr ""
 "の送信方法は Evolution メールアカウントと一緒にまとめられます。このアカウント"
 "の名前を下の空欄に入力して下さい。この名前は表示目的のみに使用されます。"
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "サービスの確認"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "サーバへ接続中..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " サポートしているかチェックする(_E) "
@@ -14501,7 +15001,8 @@ msgid "Execute Command..."
 msgstr "コマンドの実行..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "固定幅(_X):"
 
 #: mail/mail-config.glade.h:82
@@ -14806,345 +15307,450 @@ msgstr "色"
 msgid "description"
 msgstr "説明"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "既にフォルダ名 \"%s\" があります。別の名前を使用して下さい。"
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "本当にこのアカウントを削除してもよろしいですか？"
+msgid "Invalid authentication"
+msgstr "SMTP 認証"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "このフォルダで削除マークが付いたメッセージを永久に削除します"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP サーバ %s は要求した認証方式 %s をサポートしていません"
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "全てのフォルダで削除マークが付いたメッセージを永久に削除します"
+"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-errors.xml.in.h:6
+#. 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 "本当にこの URL を削除してもよろしいですか？"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "ユーザが To/Cc 先を付けずに送信しようとする時に確認します。"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"HTML 形式のメッセージを送信しようとしています。\n"
+"次の宛先の中で HTML 形式のメールを受信できるかどうかを確認して下さい:\n"
+"とにかく %s送信しますか？"
+
+#: 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-errors.xml.in.h:8
+#. 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 "送信するメールの件名が空の場合、送信する前に警告します。"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "ユーザが To/Cc 先を付けずに送信しようとする時に確認します。"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "フォルダを作成できません: %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "作業フォルダを作成できませんでした: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "フォルダ '%s' を作成できません: %s"
+msgid "Use default drafts folder?"
+msgstr "デフォルトの連絡先フォルダへのパス"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "ローカルのフォルダ '%s' を削除できません"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"このアカウントの草案フォルダを開けません。\n"
+"デフォルトの草案フォルダを使ってもよろしいですか？"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "ローカルのフォルダ '%s' を削除できません"
+msgid "Use _Default"
+msgstr "デフォルト"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "フォルダ '%s' を取得できません: フォルダが存在しません"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "このフォルダで削除マークが付いたメッセージを永久に削除します"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "送信元ソースを開けませんでした"
+msgid "_Expunge"
+msgstr "抹消(_X)"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "送信元ソースを開けませんでした"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "全てのフォルダで削除マークが付いたメッセージを永久に削除します"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "メッセージを開けません"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgid "_Empty Trash"
+msgstr "ゴミ箱を空にする(_T)"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "ローカルのフォルダ %s の名前を変更できません"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "送信していないメッセージがあります。それでも終了しますか？"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "フォルダ '%s' を作成できません: %s"
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"'%s' へ保存できません。\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "署名スクリプトの追加"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "署名ファイルを保存できませんでした: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "\"%s\" の削除"
+msgid "Error while {0}."
+msgstr ""
+"'%s' する際にエラーが発生しました:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "指定した連絡先を削除します"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "変更の破棄(_D)"
+msgid "Error while performing operation."
+msgstr ""
+"次の操作を実行する際にエラーが発生しました:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "変更を保存しますか？"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "削除しない"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "パスワードの入力"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "フィルタ情報の読み込み中にエラー:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "フォルダ '%s' を作成できません: %s"
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
-"次の操作を実行する際にエラーが発生しました:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"'%s' へ保存できません。\n"
+" %s"
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "フォルダ '%s' を作成できません: %s"
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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 ""
-"'%s' する際にエラーが発生しました:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
 msgid "File exists but cannot overwrite it."
 msgstr "ファイルがあります。上書きしてもよろしいですか？"
 
-#: mail/mail-errors.xml.in.h:42
+#. 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-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "ローカルのフォルダ '%s' を削除できません"
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "ローカルのフォルダ '%s' を削除できません"
+
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. 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 "本当にフォルダ \"%s\" とそのサブフォルダの全てを削除しますか？"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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-errors.xml.in.h:47
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "SMTP 認証"
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "既にフォルダ名 \"%s\" があります。別の名前を使用して下さい。"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot open target \"{2}\"."
+msgstr "メッセージを開けません"
+
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
-"HTML 形式のメッセージを送信しようとしています。\n"
-"次の宛先の中で HTML 形式のメールを受信できるかどうかを確認して下さい:\n"
-"とにかく %s送信しますか？"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "本当にフォルダ \"%s\" とそのサブフォルダの全てを削除しますか？"
+msgid "Cannot create folder \"{0}\"."
+msgstr "フォルダを作成できません: %s: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "送信元ソースを開けませんでした"
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
+#. 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 ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"以下の仮想フォルダ:\n"
-"%s が削除済みフォルダに使用されています:\n"
-"     '%s'\n"
-"更に更新されています。"
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "削除しない"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"以下の仮想フォルダ:\n"
-"%s が削除済みフォルダに使用されています:\n"
-"     '%s'\n"
-"更に更新されています。"
+msgid "Could not save signature file."
+msgstr "署名ファイルを保存できませんでした: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "署名スクリプトの追加"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "変更の破棄(_D)"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP サーバ %s は要求した認証方式 %s をサポートしていません"
+msgid "Do you wish to save your changes?"
+msgstr "変更を保存しますか？"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15152,85 +15758,97 @@ msgstr ""
 "\n"
 "その変更を保存しますか？"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"このアカウントの草案フォルダを開けません。\n"
-"デフォルトの草案フォルダを使ってもよろしいですか？"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "デフォルト"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "変更の破棄(_D)"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "デフォルトの連絡先フォルダへのパス"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "必要な情報の全てを埋めていません。"
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "送信していないメッセージがあります。それでも終了しますか？"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "同じ名前のアカウントを二つ作れません。"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "フォルダ '%s' を取得できません: フォルダが存在しません"
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "変更の破棄(_D)"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "ゴミ箱を空にする(_T)"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"以下の仮想フォルダ:\n"
+"%s が削除済みフォルダに使用されています:\n"
+"     '%s'\n"
+"更に更新されています。"
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "抹消(_X)"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "送信"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"以下の仮想フォルダ:\n"
+"%s が削除済みフォルダに使用されています:\n"
+"     '%s'\n"
+"更に更新されています。"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-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:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s へ ping"
@@ -15239,20 +15857,20 @@ msgstr "%s へ ping"
 msgid "Working"
 msgstr "作業"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "フォルダのフィルタリング中"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "メールの同期中"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "出力フィルタの適用に失敗しました: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15261,115 +15879,115 @@ msgstr ""
 "%s への追加に失敗しました: %s\n"
 "かわりにローカルの '送信箱' へ追加します。"
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "ローカルの '送信箱' フォルダへの追加に失敗しました: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "メッセージ %d / %d 通を送信中"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "メッセージ %d / %d の送信に失敗しました"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "完了しました"
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "フォルダへメッセージを保存中"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "%s へメッセージを移動中"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "%s へメッセージをコピー中"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" の中のフォルダを走査中"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "転送メッセージ"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "フォルダ %s をオープンする"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "保存された %s をオープンする"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "フォルダ %s を削除"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "フォルダ '%s' の格納"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "アカウント '%s' の削除と保存"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "アカウント '%s' の格納"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "フォルダを更新中"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "フォルダを抹消中"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' の中にあるゴミ箱を空にする"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "ローカル・フォルダ"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "メッセージ %s を取得中"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "メッセージ %d 通の受信中"
 msgstr[1] "メッセージ %d 通の受信中"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "メッセージ %d 通の保存中"
 msgstr[1] "メッセージ %d 通の保存中"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15378,7 +15996,7 @@ msgstr ""
 "出力ファイルを生成できません: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15387,11 +16005,11 @@ msgstr ""
 "ファイルの保存中にエラー: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "添付した内容の保存中"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15400,17 +16018,17 @@ msgstr ""
 "出力ファイルを生成できません: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "データを書き出せませんでした: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s からの接続はありません"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s へ再接続"
@@ -15474,24 +16092,24 @@ msgstr "更新中..."
 msgid "Waiting..."
 msgstr "待機中..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "ユーザによって操作がキャンセルされました"
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s のパスワードを入力して下さい"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "パスワードの入力"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "このパスワードを記憶する(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "このパスワードをこのセッション用に保存する(_R)"
 
@@ -15531,89 +16149,94 @@ msgstr "転送されたメッセージ"
 msgid "Invalid folder: `%s'"
 msgstr "不正なフォルダ: '%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "仮想フォルダの設定: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "URI 用の仮想フォルダの更新: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "URI 用の仮想フォルダの更新: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "仮想フォルダ"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "仮想フォルダの編集"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "新しい仮想フォルダ"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "未読"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "既読"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "返答済み"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "複数の未読メッセージ"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "複数のメッセージ"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "最も低い"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "低い"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "高い"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "最も高い"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "今日の %p %l時%M分"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "昨日の %p %l時%M分"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%p %l時%M分 (%a)"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%B %e日 %p %l時%M分"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%Y年 %B %e日"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "メッセージ一覧の作成中"
 
@@ -15645,43 +16268,43 @@ 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 "F.Y.I"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "フォローアップするフラグ"
 
@@ -15725,51 +16348,31 @@ msgstr "購読(_S)"
 msgid "_Unsubscribe"
 msgstr "購読の停止(_U)"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution シェル"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution のテスト"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution のテスト・コンポーネント"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "デフォルトのショートカット・グループ"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "フォルダ・バーのデフォルトの幅"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "ショートカット・バーのデフォルトの幅"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "ウィンドウのデフォルトの高さ"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "ウィンドウのデフォルトの幅"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Evolution 設定バージョン"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "起動時にデフォルトで表示するコンポーネントの ID/エイリアスです。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -15777,7 +16380,7 @@ msgstr ""
 "TRUE にすると、オンライン・モードではなく、オフライン・モードで Evolution を"
 "起動します。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -15785,60 +16388,20 @@ msgstr ""
 "TRUE にすると、Evolution の開発バージョンである旨を警告するダイアログを表示し"
 "ません。"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 "オフライン時にローカル・ディスクと同期するフォルダへのパスのリスト"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "デフォルトのカレンダ・フォルダへのパス"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "デフォルトの連絡先フォルダへのパス"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "デフォルトのメール・フォルダへのパス"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "デフォルトのタスク・フォルダへのパス"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "デフォルトのカレンダ・フォルダへの実際の URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "デフォルトの連絡先フォルダへの実際の URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "デフォルトのメール・フォルダへの実際の URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "デフォルトのタスク・フォルダへの実際の URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution をオフライン・モードで起動するかどうか"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "フォルダ・バーを表示するかどうか"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "ショートカット・バーを表示するかどうか"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "開発版を警告するダイアログをスキップするかどうか"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "メール"
 
@@ -15846,6 +16409,32 @@ msgstr "メール"
 msgid "Brought to you by"
 msgstr "開発に携わった方々"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B%e日"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "未知のエラー"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "不正な引数"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "OAF に登録できません"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "データベースの設定がありません"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "一般的なエラー"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(タイトルなし)"
@@ -15982,11 +16571,11 @@ msgstr "インポータを実行できません"
 msgid "_Import"
 msgstr "インポート(_I)"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "接続を閉じています..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution の設定"
 
@@ -16028,12 +16617,36 @@ msgstr "フォルダ名には文字 \"#\" を含めることはできません�
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' と '..' はフォルダ名として予約済みです。"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"現在 Ximian Evolution はオンラインです (オフラインにする場合はこのボタンをク"
+"リックして下さい)"
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution はオフラインで処理します。"
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"現在 Ximian Evolution はオフラインです (オンラインにする場合はこのボタンをク"
+"リックして下さい)"
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "%s へメール"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 "このシステム上に GNOME パイロット・ツールがインストールされていないようです。"
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "%s 実行中にエラーが発生しました。"
@@ -16047,14 +16660,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy は実行できませんでした"
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Ximian Evolution について"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "オンライン作業(_W)"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "オフライン作業(_W)"
 
@@ -16062,51 +16676,6 @@ msgstr "オフライン作業(_W)"
 msgid "Work Offline"
 msgstr "オフライン作業"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"現在 Ximian Evolution はオンラインです (オフラインにする場合はこのボタンをク"
-"リックして下さい)"
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution はオフラインで処理します。"
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"現在 Ximian Evolution はオフラインです (オンラインにする場合はこのボタンをク"
-"リックして下さい)"
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"警告: Evolution はバージョン %d.%d.%d から全てのデータを更新できませんでし"
-"た。\n"
-"データは削除されませんが、このバージョンの Evolution では表示されません。\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "不正な引数"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "OAF に登録できません"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "データベースの設定がありません"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "一般的なエラー"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "チェックボックス"
@@ -16176,6 +16745,51 @@ msgstr "接続を有効にする"
 msgid "Click OK to close these connections and go offline"
 msgstr "[OK] ボタンをクリックすると接続を閉じてオフラインになります"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "カレンダ(_A)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "連絡先: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "メール"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "タスク(_T)"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "ファイルの種類(_T):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "送信済フォルダ(_M):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "アカウント名(_A):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "フォルダ名"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "ユーザ名:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 設定アシスタント"
@@ -16218,6 +16832,18 @@ msgstr ""
 "\n"
 "設定を保存する場合は、[適用] ボタンをクリックして下さい。"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution シェル"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution のテスト"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution のテスト・コンポーネント"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"インポート\" をクリックしてファイルの収集を開始して下さい。"
@@ -16277,13 +16903,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution は以下のファイルからデータ取込みが可能です:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16313,56 +16939,48 @@ msgstr ""
 "私たちの激務の結果に満足してくれることを願い、\n"
 "そしてあなたの貢献を熱心に待っています！\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "感謝します。\n"
 "Ximian Evolution チーム\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "このメッセージを二度と表示しない"
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ximian Evolution シェルに登録できません。"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolution シェルを初期化できません: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "指定したコンポーネントを有効にして Evolution を起動する"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "オフライン・モードで起動する"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "オンライン・モードで起動する"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "全ての Evolution コンポーネントを強制終了する"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Evolution 1.4系から関連ファイルを強制的に移行する"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "全てのコンポーネントのデバッグ出力をファイルへ送る"
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16371,13 +16989,79 @@ msgstr ""
 "%s: --online と --offline は同時には使用できません。\n"
 "  詳細は %s --help をご覧下さい。\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "接続"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ximian Evolution シェルに登録できません。"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution アカウント・アシスタント"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "インポートする証明書の選択..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "証明書の名前"
 
@@ -16606,11 +17290,6 @@ msgstr "次の人達の身元を確認できる証明書 (ファイル) があ�
 msgid "Your Certificates"
 msgstr "ユーザの証明書"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "既に証明書があります"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
@@ -16801,6 +17480,11 @@ msgstr "件名の重複しない ID"
 msgid "Certificate Signature Value"
 msgstr "証明書の署名の値"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "既に証明書があります"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 ファイルのパスワード"
@@ -16840,12 +17524,12 @@ msgstr "メッセージのデフォルトの件名です"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s' を実行できませんでした: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) のシャットダウン中\n"
@@ -16909,7 +17593,8 @@ msgid "Select all contacts"
 msgstr "全ての連絡先を選択します"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "指定した連絡先へメールを送信します"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16940,8 +17625,8 @@ msgstr "現在の連絡先の表示"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "アクション(_A)"
@@ -16959,7 +17644,8 @@ msgid "_Preview Pane"
 msgstr "プレビュー・ウィンドウ(_P)"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "vCard 形式で保存(_S)"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17083,10 +17769,20 @@ msgstr "現在の予定の表示"
 msgid "Week"
 msgstr "週"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "平日"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "予定を開く(_O)"
 
+#: 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 "閉じる(_L)"
+
 #: 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
@@ -17404,6 +18100,16 @@ msgstr "選択の反転(_I)"
 msgid "_Threaded Message List"
 msgstr "メッセージ一覧のスレッド化(_T)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "閉じる(_C)"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "差出人をアドレス帳へ追加(_D)"
@@ -17641,7 +18347,8 @@ msgid "Open the selected message in a new window"
 msgstr "選択したメッセージを新しいウィンドウの中で開きます"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "選択したメッセージをコンポーザで開き再送します"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17756,58 +18463,46 @@ msgstr "件名の仮想フォルダ(_S)..."
 msgid "_Attached"
 msgstr "添付する(_A)"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "フォルダへコピー(_C)"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "メッセージからフィルタの作成(_C)"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "ジャンプ(_G)"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "インライン(_I)"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "大きく(_L)"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "メッセージの表示方法(_M)"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "フォルダへ移動(_M)"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "次のメッセージへ(_N)"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "通常表示(_N)"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "メッセージを開く(_O)"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "前のメッセージへ(_P)"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "引用する(_Q)"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "再送(_R)..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "ツール(_T)"
@@ -17816,16 +18511,6 @@ msgstr "ツール(_T)"
 msgid "_Undelete"
 msgstr "削除の取り消し(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "閉じる(_C)"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "添付"
@@ -18214,6 +18899,11 @@ msgstr "クィック・リファレンス(_Q)"
 msgid "_Send / Receive"
 msgstr "送受信(_S)"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "新しいウィンドウ(_W)"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "企業順(_C)"
@@ -18278,10 +18968,6 @@ msgstr "期日(_D)"
 msgid "With _Status"
 msgstr "ステータス(_S)"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "タスク(_T)"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18437,6 +19123,35 @@ msgstr "その他..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution メール"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "会議の情報"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution のテスト"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">印刷用フォント</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "有効期限切れ"
@@ -18550,6 +19265,35 @@ msgstr "テキスト"
 msgid "Find _Now"
 msgstr "今すぐ見つける(_N)"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"上書きしてもよろしいですか？"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"'%s' へ保存できません。\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"'%s' へ保存できません。\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18560,6 +19304,152 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完了)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution アドレス帳フォルダ・ビューア"
+
+#~ msgid "Address 2:"
+#~ msgstr "住所２:"
+
+#~ msgid "Blog:"
+#~ msgstr "Blog:"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution カレンダのビューア"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution タスクのビューア"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "gnome-vfs を初期化できませんでした"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "'%s' にあるフォルダを開けませんでした"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "カレンダが表示する URI"
+
+#~ msgid "The type of view to show"
+#~ msgstr "表示するビューの種類"
+
+#~ msgid "Display a message"
+#~ msgstr "メッセージを表示する"
+
+#~ msgid "Alerts"
+#~ msgstr "警告"
+
+#~ msgid "Time"
+#~ msgstr "時刻"
+
+#~ msgid "_General"
+#~ msgstr "全般(_G)"
+
+#~ msgid "Select source"
+#~ msgstr "ソースの選択"
+
+#~ msgid "calendar"
+#~ msgstr "カレンダ"
+
+#~ msgid "task list"
+#~ msgstr "タスク一覧"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "カレンダ・ファイルを更新できません！\n"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "%s\n"
+#~ "用のタスク・バックエンドが\n"
+#~ "クラッシュしました。"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "表示するタスク・フォルダの URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "'%s' のタスクを読み込めませんでした"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution メール・フォルダ・ビューア"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "仮想フォルダのスレッド表示"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "スレッド表示のフィルタ"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "POP3 UID キャッシュの移行に失敗しました: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "フォルダ展開ステータスの移行に失敗しました: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "'%s' の格納場所を開けませんでした: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n です。"
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "表示するメール・ソースの URI"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "デフォルトのショートカット・グループ"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "ショートカット・バーのデフォルトの幅"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "デフォルトのカレンダ・フォルダへのパス"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "デフォルトの連絡先フォルダへのパス"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "デフォルトのメール・フォルダへのパス"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "デフォルトのタスク・フォルダへのパス"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "デフォルトのカレンダ・フォルダへの実際の URI"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "デフォルトの連絡先フォルダへの実際の URI"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "デフォルトのメール・フォルダへの実際の URI"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "デフォルトのタスク・フォルダへの実際の URI"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "フォルダ・バーを表示するかどうか"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "ショートカット・バーを表示するかどうか"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "警告: Evolution はバージョン %d.%d.%d から全てのデータを更新できませんでし"
+#~ "た。\n"
+#~ "データは削除されませんが、このバージョンの Evolution では表示されませ"
+#~ "ん。\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ximian Evolution シェルを初期化できません: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "再送(_R)..."
+
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "アドレス帳の作成アシスタント"
 
@@ -18581,9 +19471,6 @@ msgstr "%s (%d%% 完了)"
 #~ msgid "Group:"
 #~ msgstr "グループ:"
 
-#~ msgid "New Address Book"
-#~ msgstr "新しいアドレス帳"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -18707,13 +19594,6 @@ msgstr "%s (%d%% 完了)"
 #~ " %s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "ファイル・デスクリプタをコピーできません: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -18817,9 +19697,6 @@ msgstr "%s (%d%% 完了)"
 #~ "\n"
 #~ "本当にこれらのメッセージを削除しますか？"
 
-#~ msgid "The following filter rule(s):\n"
-#~ msgstr "次のフィルタ・ルール:\n"
-
 #~ msgid ""
 #~ "Used the removed folder:\n"
 #~ "    '%s'\n"
diff --git a/po/ko.po b/po/ko.po
index fd43662fa8..0d76aaf7e5 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,17 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution 주소록"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "연락처:"
+
+# Alarm -> 알림, Microsoft Office XP 참고
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "evolution 알림"
+
 # command line help
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
@@ -46,17 +57,6 @@ msgstr "카드"
 msgid " card"
 msgstr "카드"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "연락처:"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "evolution 알림"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "기본 동기화 주소:"
@@ -71,63 +71,20 @@ msgstr "주소록을 읽어들일 수 없습니다"
 msgid "Could not read pilot's Address application block"
 msgstr "파일롯의 Address 프로그램 블록을 읽을 수 없습니다"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "자동 완성"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "인증서"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "연락처"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution 주소록"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 주소록 주소 팝업"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 주소록 주소 뷰"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 주소록 카드 뷰"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution 주소록 컴포넌트"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 주소록 폴더 뷰"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution s/Mime 인증서 관리 컨트롤"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "익명으로 LDAP 서버 사용"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 폴더 설정 컨트롤"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "인증하는 데 실패했습니다.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "여기서 s/MIME 인증서를 관리합니다"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s(사용자 %s)의 열쇠글을 입력하십시오"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,41 +125,45 @@ msgstr "연락처(_C):"
 msgid "Create a new contacts group"
 msgstr "새로운 연락처를 만듭니다"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 서버에서 인증 실패"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "루트 DSE에 질의를 수행할 수 없습니다"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "서버가 지원하는 찾기 기준으로 응답하지 않았습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "이 서버는 LDAPv3 스키마 정보를 지원하지 않습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "스키마 정보를 가져오는 데 오류가 발생했습니다"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "옮기는 중..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' 옮기는 중:"
@@ -210,8 +171,8 @@ msgstr "`%s' 옮기는 중:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "이 컴퓨터"
 
@@ -219,7 +180,7 @@ msgstr "이 컴퓨터"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "개인"
@@ -281,20 +242,41 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "익명으로 LDAP 서버 사용"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "'%s' 주소록을 지우게 됩니다. 정말로 계속 하시겠습니까?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "인증하는 데 실패했습니다.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "새 주소록"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s(사용자 %s)의 열쇠글을 입력하십시오"
+#: 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
+#: 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
+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
+#: 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 "연락처"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -314,6 +296,61 @@ msgstr "자동 완성하기 전에 최소한 입력해야 하는 문자 개수"
 msgid "URI for the folder last used in the select names dialog"
 msgstr "이름 선택 대화 상자에 마지막으로 사용되었던 폴더의 URI"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "자동 완성"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "연락처"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "인증서"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "여기서 자동 완성을 설정합니다"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution 주소록"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 주소록 주소 팝업"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 주소록 주소 뷰"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 주소록 카드 뷰"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution 주소록 컴포넌트"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution s/Mime 인증서 관리 컨트롤"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 폴더 설정 컨트롤"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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) "
@@ -335,6 +372,7 @@ msgstr " 지원하는 기준 보기(_H) "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -406,7 +444,7 @@ msgstr "연락처(_C):"
 msgid "Address Book Properties"
 msgstr "주소록 등록 정보"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "항상"
@@ -421,105 +459,96 @@ msgid "Basic"
 msgstr "기본"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "색(_O):"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "연결중"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "구별되는 이름(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "구별되는 이름(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "전자메일 주소:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "전자메일 주소:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution은 이 메일 주소로 서버에 인증할 때 사용합니다"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "지원하는 찾기 기준"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "일반"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "항상 사용 않음"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "한 단계"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "색을 고르십시오"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "찾기 범위(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "찾기 범위(_E): "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "찾는 중"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -528,7 +557,7 @@ msgstr ""
 "이 옵션을 선택하면 LDAP 서버가 SSL이나 TLS를 지원하는 경우에만 Evolution에서 "
 "연결합니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -544,7 +573,7 @@ msgstr ""
 "전하므로\n"
 "Evolution에서 SSL/TLS를 사용할 필요가 없습니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -555,19 +584,19 @@ msgstr ""
 "이 옵션을 선택하면 서버에서 SSL이나 TLS를 지원하지 않는다는 의미입니다.\n"
 "연결이 안전하지 않을 수도 있고, 보안상의 침투에 취약할 수 있습니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "아래"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "지원하는 찾기 기준"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -577,7 +606,7 @@ msgstr ""
 "찾기 기준은 찾기를 시작할 엔트리의 고유 이름(distinguished name, DN)입니다.\n"
 "찾기 기준을 비워두면, 디렉토리 트리의 맨 위 폴더부터 찾기 시작합니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -591,13 +620,13 @@ msgstr ""
 "찾기 범위가 \"한 단계\"이면 찾기 기준에서 한 단계 아래의 엔트리만 포함합니"
 "다.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -606,7 +635,7 @@ msgstr ""
 "내려 받을 항목의 최대 개수입니다. 이 숫자를 너무 크게 하면\n"
 "주소록의 속도가 느려집니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -615,7 +644,7 @@ msgstr ""
 "인증하는 방법입니다. \"전자메일 주소\"로 설정하면 반드시 LDAP 서버에 익명 접"
 "근이 가능해야 합니다."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -624,7 +653,7 @@ msgstr ""
 "Evolution 폴더 목록에 나타날 이 서버의 이름입니다.\n"
 "표시하는 목적으로만 쓰입니다. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -634,128 +663,135 @@ msgstr ""
 "Evolution에서 연결할 LDAP 서버의 포트 번호입니다. 표준 포트 번호 목록이 제공"
 "됩니다. 어떤 포트를 지정해야 할 지는 시스템 관리자에게 물어보십시오."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "시간 형식:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS 사용(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "구별되는 이름 (Distinguished Name, DN) 사용해서"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "전자메일 주소 사용해서"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "가능하면 언제나"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "연락처(_C):"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "다운로드 제한(_D):"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "전자메일 주소:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "로그인 방법(_L):"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "이름(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "포트 번호(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "우선순위(_P):"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "찾기 기준(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "서버 이름(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "서버(_E):"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "제한 시간(분)(_T):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "보안 연결(SSL) 사용(_U):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "카드"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "연결-탭"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "일반-탭"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "분"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "찾기-탭"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 주소록 이름 선택 인터페이스"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "전부 지우기"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "전부 지우기"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "연락처 목록 보기"
@@ -778,12 +814,6 @@ msgstr "연락처에 더하기"
 msgid "Unnamed Contact"
 msgstr "이름 없는 연락처"
 
-#: 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
-msgid "Name"
-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
@@ -791,10 +821,9 @@ msgstr "이름"
 msgid "Source"
 msgstr "원본"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "주소록에서 연락처를 선택하십시오"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 주소록 이름 선택 인터페이스"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -860,135 +889,135 @@ msgid "<b>Work</b>"
 msgstr "<b>기한:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "주소 _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "주소(_A):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "기념일(_V):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "비서"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "생일(_Y):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "블로그"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "달력:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "도시(_T):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "명령:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "연락처 편집기"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "국가:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "부서:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "약속 있음/없음:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "전체 이름(_N)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "집"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN 메신저"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "전자메일 주소"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "관리자"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "별명(_C):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "메모:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "기타"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "사서함(_P):"
+
 # journal -> 일지, Microsoft Office XP 참고
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
@@ -1017,9 +1046,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "업무"
@@ -1054,23 +1083,39 @@ msgstr "제목"
 msgid "item8"
 msgstr "제목"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"정말로 이 계정을\n"
+"지우시겠습니까?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "편집 가능"
 
@@ -2042,92 +2087,110 @@ msgstr "잠비아"
 msgid "Zimbabwe"
 msgstr "짐바브웨"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL 인스턴스 메신저"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo 메신저"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr "위치"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "사용자이름"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "야후"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "원본 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "대상 주소록"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "새 연락처"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "쓰기 가능한 필드"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "바뀜"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "분류 편집기를 사용할 수 없습니다."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "이 연락처는 다음 분류에 속합니다:"
 
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "다음 옵션 중에 하나를 선택하십시오"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "니제르"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "다음 거르게 규칙:\n"
+
 # 일어나지 않을 것 같은 오류 메세지
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL 인스턴스 메신저"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo 메신저"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+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
+msgid "Location"
+msgstr "위치"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "사용자이름"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "연락처 빨리 더하기"
@@ -2145,22 +2208,6 @@ msgstr "전체 이름(_F):"
 msgid "E-_mail:"
 msgstr "전자메일(_M):"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"정말로 이 계정을\n"
-"지우시겠습니까?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"정말로 이 연락처를\n"
-"지우시겠습니까?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "주소 _2:"
@@ -2307,8 +2354,8 @@ msgstr "연락처 목록 편집기"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "북"
 
@@ -2369,6 +2416,432 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "고급 찾기"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(지도)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "지도"
+
+# List는 여기서 Mailing List를 말한다
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "리스트 구성원"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "전자메일"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "조직"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "직위"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "화상 회의"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "전화"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "팩스"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "업무"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "블로그"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "휴대 전화"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "개인"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "메모"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "직함"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "전자메일"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "홈페이지"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "성공했습니다"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "저장고가 연결되지 않았습니다"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "주소록이 없습니다"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "권한이 거부되었습니다"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "연락처를 찾을 수 없습니다"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "연락처 ID가 이미 있습니다"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "프로토콜이 지원되지 않습니다"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "취소됨"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "소스를 열 수 없습니다"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "인증이 실패했습니다"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "인증이 필요합니다"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "그런 메세지 없음"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "다른 오류"
+
+#: 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 ""
+"이 주소록을 열 수 없습니다.  해당 경로가 있고 그 경로에 접근할 권한이 있는 "
+"지 확인하십시오."
+
+#: 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 ""
+"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
+"할 수 없습니다."
+
+#: 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 ""
+"이 Evolution 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하"
+"려면 아래의 바로가기에서 OpenLDAP를 받아 온 다음에 CVS 소스에서 프로그램을 컴"
+"파일해야 합니다."
+
+#: 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 ""
+"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
+"없습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "주소록을 열 수 없습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"이 쿼리에, 서버에서 리턴하기로 설정된 것보다 많은 카드가 일치하거나,\n"
+"Evolution에서 표시하도록 설정된 것보다 많은 카드가 일치하였습니다.\n"
+"좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
+"결과의 한계치를 지정해 주십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"쿼리에 걸린 시간이 서버의 한계값 혹은 이 주소록에서 설정한 한계값을\n"
+"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
+"결과의 한계치를 지정해 주십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "목록을 더하는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "연락처를 더하는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "목록을 고치는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "연락처를 고치는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "목록을 지우는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "연락처를 지우는 중 오류가 발생했습니다"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
+"정말로 이 연락처를 전부 여시겠습니까?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s이(가) 이미 존재합니다\n"
+"이 파일을 덮어 쓰시겠습니까?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "카드.vcf"
+
+# 파일 이름
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "목록"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "연락처 이동"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "연락처 복사"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "연락처 이동"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "연락처 복사"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "어디로 갈지 주소록을 선택하십시오."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "여러 개 VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s에 대한 VCard"
+
+#.
+#. * 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
+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
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "그리고 기타 연락처 %d개."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "VCard 자세히 보기"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+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
 msgid "No contacts"
 msgstr "연락처 없음"
@@ -2382,8 +2855,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "쿼리"
 
@@ -2437,9 +2910,10 @@ msgstr "주소록"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "VCard로 저장"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2504,7 +2978,7 @@ msgid "Cut"
 msgstr "잘라내기"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2515,18 +2989,8 @@ msgstr "복사"
 msgid "Paste"
 msgstr "붙여 넣기"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "지우기"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "현재 보기"
 
@@ -2542,7 +3006,7 @@ msgstr ""
 "다시 사용하려면 Evolution을 다시 시작해야 합니다."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "모든 분류"
@@ -2583,21 +3047,6 @@ msgstr "분류"
 msgid "Company Phone"
 msgstr "회사 전화"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "전자메일"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "전자메일 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "전자메일 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "성"
@@ -2635,29 +3084,14 @@ msgstr "일지"
 msgid "Manager"
 msgstr "관리자"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "휴대 전화"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "별명"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "메모"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "사무실"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "조직"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "기타 팩스"
@@ -2710,21 +3144,29 @@ msgstr "구성 단위"
 msgid "Web Site"
 msgstr "웹 사이트"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "너비"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "높이"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "항목"
@@ -2741,10 +3183,6 @@ msgstr "텍스트 모델"
 msgid "Max field name length"
 msgstr "최대 필드 이름 길이"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "열 너비"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2774,406 +3212,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(지도)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "지도"
-
-# List는 여기서 Mailing List를 말한다
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "리스트 구성원"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "전자메일"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "직위"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "화상 회의"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "전화"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "팩스"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "업무"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "블로그"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "개인"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "직함"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "홈페이지"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "성공했습니다"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "저장고가 연결되지 않았습니다"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "주소록이 없습니다"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "권한이 거부되었습니다"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "연락처를 찾을 수 없습니다"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "연락처 ID가 이미 있습니다"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "프로토콜이 지원되지 않습니다"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "취소됨"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "소스를 열 수 없습니다"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "인증이 실패했습니다"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "인증이 필요합니다"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS를 사용할 수 없습니다"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "그런 메세지 없음"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "다른 오류"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 LDAP 서버에 연결"
-"할 수 없습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"이 Evolution 버전에는 LDAP 지원 기능을 컴파일하지 않았습니다.  LDAP를 사용하"
-"려면 아래의 바로가기에서 OpenLDAP를 받아 온 다음에 CVS 소스에서 프로그램을 컴"
-"파일해야 합니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"이 주소록을 열 수 없습니다.  잘못된 URI를 입력했거나, 해당 서버에 연결할 수 "
-"없습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "주소록을 열 수 없습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"이 쿼리에, 서버에서 리턴하기로 설정된 것보다 많은 카드가 일치하거나,\n"
-"Evolution에서 표시하도록 설정된 것보다 많은 카드가 일치하였습니다.\n"
-"좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서 \n"
-"결과의 한계치를 지정해 주십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"쿼리에 걸린 시간이 서버의 한계값 혹은 이 주소록에서 설정한 한계값을\n"
-"넘었습니다.  좀 더 구체적으로 찾거나 주소록의 디렉토리 서버 기본 설정에서\n"
-"결과의 한계치를 지정해 주십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "이 주소록의 벡엔드에서 이 질의를 파싱할 수 없습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "이 주소록의 벡엔드에서 이 질의를 수행하길 거부했습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "이 질의가 성공적으로 끝나지 않았습니다."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "바뀐 부분을 저장하시겠습니까?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "버리기(_D)"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "목록을 더하는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "연락처를 더하는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "목록을 고치는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "연락처를 고치는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "목록을 지우는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "연락처를 지우는 중 오류가 발생했습니다"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"연락처 %d개를 열면 %d개의 새 창을 열게 됩니다.\n"
-"정말로 이 연락처를 전부 여시겠습니까?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s이(가) 이미 존재합니다\n"
-"이 파일을 덮어 쓰시겠습니까?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "덮어 쓰기"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "%s을(를) 저장하는 데 오류가 발생했습니다: %s"
-
-# 파일 이름
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "카드.vcf"
-
-# 파일 이름
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "목록"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "연락처 이동"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "연락처 복사"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "연락처 이동"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "연락처 복사"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "어디로 갈지 주소록을 선택하십시오."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "여러 개 VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s에 대한 VCard"
-
-#.
-#. * 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: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
-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
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "그리고 기타 연락처 %d개."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "VCard 자세히 보기"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "VCard 간단히 보기"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-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"
@@ -3220,11 +3261,6 @@ msgstr "Evolution VCard 가져오기"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "vcard (.vcf, .gcrd)"
 
-#: 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.c:998
 msgid "Print contacts"
 msgstr "연락처 인쇄"
@@ -3234,6 +3270,11 @@ msgstr "연락처 인쇄"
 msgid "Print contact"
 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"
 msgstr "10 포인트 Tahoma"
@@ -3418,16 +3459,6 @@ msgstr "연락처 인쇄 테스트"
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "표준 출력 대신에 출력할 파일을 지정합니다"
@@ -3485,6 +3516,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "기본 주소록 읽는 중 오류."
@@ -3497,11 +3538,12 @@ msgstr "입력 파일"
 msgid "No filename provided."
 msgstr "파일이름이 주어지지 않았습니다."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "이름 없는 목록"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "열쇠글을 입력하십시오"
 
@@ -3534,121 +3576,58 @@ msgstr "기본 우선순위:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "파일롯의 ToDo 프로그램 블록을 읽을 수 없습니다"
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "달력"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "여기서 시간대, 달력 및 작업 목록을 설정합니다"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 달력 및 작업"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 달력 설정 컨트롤"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 달력 계획 메세지 보기"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 달력 보기"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 달력/작업 편집"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 작업 보기"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution 달력 컴포넌트"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution 작업 컴포넌트"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "작업"
-
-# Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution 달력 알림 서비스"
-
-#: 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 "끝:"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution 알림"
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "닫기(_L)"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "연기 모드(_Z)"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "연기할 시간 (분)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "약속 편집(_E)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "연기 모드(_Z)"
+
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "없애기"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "모두 없애기"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "설명이 없습니다."
 
 # Alarm -> 알림, Microsoft Office XP 참고
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3661,13 +3640,13 @@ msgstr ""
 "시작: %s\n"
 "끝: %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "경고"
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3680,7 +3659,7 @@ msgstr ""
 "보내는 대신 일반적인 미리 알림 대화 상자를 표시합니다."
 
 # Reminder -> 미리 알림, Microsoft Office XP
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3697,19 +3676,20 @@ msgstr ""
 "\n"
 "정말로 이 프로그램을 실행하시겠습니까?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+# Alarm -> 알림, Microsoft Office XP 참고
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution 달력 알림 서비스"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "보노보를 초기화 할 수 없습니다"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "gnome-vfs를 초기화 할 수 없습니다"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "알림 기능 서비스 팩토리를 만들 수가 없습니다"
 
@@ -3821,59 +3801,45 @@ 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "약속을 지울 때 확인 질문을 할 지 여부"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "폴더의 지운 메세지를 비울 때 확인 질문을 할 지 여부"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "끝마친 작업을 감출 지 여부"
 
 # Reminder -> 미리 알림, Microsoft Office XP
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "시간을 오전/오후가 아닌 24시간 모드로 표시할 것인지 여부"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시할 지 여부"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "요약에 포함"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "설명에 포함"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "주석에 포함"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "위치에 포함"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "맞지 않음"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "달력"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3884,121 +3850,131 @@ msgstr ""
 
 # FIXME - hard to translate UI + string based on English grammar
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "다음보다 오래된 행사 지우기:"
 
 # FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "일"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 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.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%b %e일 (%a)"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 "%Y년 %b %e일 (%a)"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%Y년 %b %e일"
 
 #. 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:464
+#: 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 "%b %e일"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "'%s' 달력을 지우게 됩니다. 정말로 계속 하시겠습니까?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "새 달력"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "등록 정보..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "달력 불러오기..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "행사와 회의를 만드는 데 달력 '%s'을(를) 열 수 없습니다"
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "행사와 회의를 만드는 데 쓸 수 있는 달력이 없습니다"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "달력"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "새 약속"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "약속(_A)"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "새 약속을 만듭니다"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "새 모임"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "모임(_E)"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "새 모임 요청을 만듭니다"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "새 하루 종일 약속"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "하루 종일 약속(_D)"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "새 하루 종일 약속을 만듭니다"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "새 달력"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "달력(_A)"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "새 달력을 만듭니다"
 
@@ -4028,15 +4004,35 @@ msgstr "주별 보기"
 msgid "Month View"
 msgstr "월별 보기"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "요약에 포함"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "설명에 포함"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "주석에 포함"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "위치에 포함"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "맞지 않음"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "달력을 여는 중에 오류가 발생했습니다"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "달력을 여는 메소드를 지원하지 않습니다"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "달력을 열 허가가 거부되었습니다"
 
@@ -4045,19 +4041,6 @@ msgstr "달력을 열 허가가 거부되었습니다"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "`%s'에 있는 폴더를 열 수가 없습니다"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "달력에 보여줄 URI"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "보여줄 뷰의 종류"
-
 # Alarm -> 알림, Microsoft Office XP 참고
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
@@ -4130,7 +4113,7 @@ msgid "hours"
 msgstr "시간"
 
 # Trigger -> 시작 옵션, Microsoft Office XP 참고
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "동작/시작 옵션"
 
@@ -4149,14 +4132,14 @@ msgstr "기본"
 msgid "Date/Time:"
 msgstr "날짜/시각:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "메세지 표시"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "소리 연주"
 
+#: 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 "미리 알림"
@@ -4171,6 +4154,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
 msgid "Summary:"
 msgstr "요약:"
@@ -4209,10 +4193,102 @@ msgstr "분"
 msgid "start of appointment"
 msgstr "약속의 시작"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr "달력을 가져올 위치를 지정해야 합니다."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "원본 위치 '%s'이(가) 잘 구성된 형식이 아닙니다."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "원본 위치 '%s'이(가) webcal 원본이 아닙니다."
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "이름이 '%s'인 원본이 이미 선택한 그룹에 있습니다"
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "'%s' 그룹이 원격 그룹입니다. 달력을 어디서 가져올 지 지정해야 합니다"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+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
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "새 달력 더하기"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "형태:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "사용"
 
@@ -4226,19 +4302,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "사용"
 
@@ -4263,59 +4339,91 @@ msgid "60 minutes"
 msgstr "60분"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "알림"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>기타</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>기한:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>작업 목록 옵션</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 "<b>기한:</b> "
+
+#: 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 "하루의 끝(_E):"
 
-#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "표시(_D)"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "사용(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "금요일"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "시간"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "분"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "월요일"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "일(_U)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
@@ -4323,104 +4431,87 @@ msgstr "토요일"
 
 # "Sh_ow a reminder NN minute(s)/hour(s)/day(s) before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "약속(_O)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "날짜 선택할 때 몇 번째 주인지 표시(_N)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "일요일"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "오늘 마감인 작업(_A):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "목(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "작업 목록"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "목요일"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "시간"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "시간대(_Z):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "시간 형식:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "화요일"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "시작 요일(_E):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "수요일"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "근무 주"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "근무 요일:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12시간 (오전/오후)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24시간"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "URL 더하기(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "항목을 지울 때 확인하기(_A)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "한달씩 볼 때 토요일/일요일은 한 칸에 표시(_C)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "하루의 시작(_D):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "표시(_D)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4430,141 +4521,48 @@ msgstr "표시(_D)"
 msgid "_Edit"
 msgstr "편집(_E)"
 
-# free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "약속 있음/없음 게시(_F)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "금(_F)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "일반(_G)"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "작업을 마친후 숨김(_H)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "월(_M)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "마감이 지난 작업:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "토(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "한주씩 볼 때 및 한달씩 볼 때 약속 끝나는 시간 표시(_S)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "시간 간격(_T):"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "화(_T)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "수(_W)"
 
 # "Sh_ow a reminder" <NN> <minute(s)/hour(s)/day(s)> "before every appointment"
 # Reminder -> 미리 알림, Microsoft Office XP
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "전에 미리 알려주기"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "달력을 가져올 위치를 지정해야 합니다."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "원본 위치 '%s'이(가) 잘 구성된 형식이 아닙니다."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "원본 위치 '%s'이(가) webcal 원본이 아닙니다."
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "이름이 '%s'인 원본이 이미 선택한 그룹에 있습니다"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "'%s' 그룹이 원격 그룹입니다. 달력을 어디서 가져올 지 지정해야 합니다"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-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:5
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "새 달력 더하기"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "형태:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "주"
-
 # event -> 행사, Microsoft Office XP 참고
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
@@ -4649,85 +4647,85 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  바뀐 사항이 없습니다. 편집기를 업데이트하시겠습니까?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "유효성 검사 오류: %s"
-
-# FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "부터 "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (완료됨 "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "완료됨 "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (기한 "
-
-# FIXME - hard to translate UI + string based on English grammar
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "기한 "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "오브젝트를 업데이트할 수 없습니다"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "약속 편집"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "작업 - %s"
 
 # journal -> 일지, Microsoft Office XP 참고
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "요약 없음"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "다른 이름으로 저장..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "현재 버전을 사용할 수 없습니다!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "유효성 검사 오류: %s"
+
+# FIXME - hard to translate UI + string based on English grammar
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "부터 "
+
+# FIXME - hard to translate UI + string based on English grammar
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (완료됨 "
+
+# FIXME - hard to translate UI + string based on English grammar
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "완료됨 "
+
+# FIXME - hard to translate UI + string based on English grammar
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (기한 "
+
+# FIXME - hard to translate UI + string based on English grammar
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "기한 "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "소스를 열 수 없습니다"
@@ -4855,27 +4853,27 @@ msgstr "대리인:"
 msgid "Enter Delegate"
 msgstr "대리인을 입력하십오"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "약속"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "미리 알림"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "반복"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "모임"
 
@@ -4887,7 +4885,7 @@ msgstr "행사에 시작 날짜가 없습니다"
 msgid "Event with no end date"
 msgstr "행사에 끝 날짜가 없습니다"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "시작 날짜가 틀렸습니다"
 
@@ -4974,10 +4972,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4996,15 +4994,15 @@ msgstr "주최자가 필요합니다."
 msgid "At least one attendee is required."
 msgstr "최소한 참석자가 한 사람은 필요합니다."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "대리인(_D)..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5283,24 +5281,18 @@ msgstr "바뀐 내용 버리기(_D)"
 msgid "Save Event"
 msgstr "행사 저장"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "가져오기 선택"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "받을 %s을 선택하십시오"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "달력"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "대상 폴더:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
 msgstr "작업 목록"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5329,38 +5321,44 @@ msgid "% _Complete"
 msgstr "% 완료(_C)"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "높음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "낮음"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "보통"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "시작 안함"
 
@@ -5396,11 +5394,11 @@ msgstr "웹 페이지(_W):"
 msgid "Assignment"
 msgstr "할당"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "마감 날짜가 잘못되었습니다"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "'%s'의 작업을 열 수 없습니다."
@@ -5409,8 +5407,9 @@ msgstr "'%s'의 작업을 열 수 없습니다."
 msgid "Con_fidential"
 msgstr "비밀(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "설명:"
@@ -5552,102 +5551,53 @@ msgstr "%s (%s)"
 msgid "%s for an unknown trigger type"
 msgstr "알 수 없는 시작 옵션에 대한 %s"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "공개"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "개인"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "비밀"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "날짜"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "시작 날짜"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "요약"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "약속 없음"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "약속 있음"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "북"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "URL %s을(를) 열려면 누르십시오"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "남"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "제목 없음"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "동"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "시작 날짜:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "서"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "마감 날짜:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"지리적인 위치는 다음과 같은 형식으로 입력합니다:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "상태:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "우선 순위:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "아니오"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "웹 페이지(_W):"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5693,17 +5643,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "오브젝트를 업데이트하는 중입니다"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "열기(_O)"
 
@@ -5712,41 +5671,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "인쇄(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "붙여 넣기(_P)"
 
@@ -5801,79 +5761,159 @@ msgstr "우선순위"
 msgid "Start date"
 msgstr "시작 날짜"
 
+#: 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:11
 msgid "Task sort"
 msgstr "작업 정렬"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "새 약속(_A)..."
 
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "새 하루 종일 행사(_E)"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "새 모임"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "새 작업"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "글타래 선택(_T)"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "날짜 선택(_S)..."
 
 # free/busy -> 약속 있음/없음, Microsoft Office XP 참고
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "약속 있음/없음 정보 게시(_P)"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "폴더로 복사..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "폴더로 옮기기(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "모임 일정(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "iCalendar로 전달(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "이 경우를 지웁니다(_O)"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "모든 경우를 지웁니다(_A)"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "오늘로 이동(_T)"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "날짜로 이동(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "설정(_S)..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "날짜"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -5897,36 +5937,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i분 단위"
+#. 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 "오전"
+
+#. 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 "오후"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 "%b %e일 %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 "%m %d"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "오전"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "오후"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i분 단위"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6036,10 +6076,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>없음</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "상태:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6069,7 +6105,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "확인"
 
@@ -6290,59 +6326,55 @@ msgstr "첨부에 올바른 달력 메세지가 없습니다"
 msgid "The attachment has no viewable calendar items"
 msgstr "이 첨부를 볼 수 있는 달력 아이템이 없습니다"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "달력 파일을 업데이트할 수 없습니다!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "업데이트 마침\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "이 항목이 더 이상 없기 때문에 참석자 상태를 업데이트할 수 없습니다"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "오브젝트가 잘못되었고 업데이트할 수 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "현재 참석자가 아닌 사람이 이 회신을 했습니다. 참석자로 더하시겠습니까?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "잘못된 상태때문에 참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 시스템에 오류가 있습니다\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "오브젝트를 찾을 수 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "달력을 업데이트할 올바른 권한이 없습니다\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "참석자의 상태 업데이트되었습니다\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "참석자 상태를 업데이트할 수 없습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "지우기를 끝마쳤습니다"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "항목을 보냈습니다!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "항목을 보낼 수 없습니다!\n"
 
@@ -6461,28 +6493,6 @@ msgstr "대리"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%Y년 %b %e일 %A"
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 "%Y/%m/%d (%a)"
-
-#. 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 "%Y/%m/%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "부재 중"
@@ -6545,7 +6555,34 @@ msgstr "모임 시작 시각(_S):"
 msgid "Meeting _end time:"
 msgstr "모임 종료 시각(_E):"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 "%Y년 %b %e일 %A"
+
+#. 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 "%Y/%m/%d (%a)"
+
+#. 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 "%Y/%m/%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "%s의 열쇠글을 입력하십시오"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6554,23 +6591,21 @@ msgstr ""
 "%s에서 오류 발생:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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"
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s에 있는 작업을 여는 중입니다"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6579,55 +6614,107 @@ msgstr ""
 "%s 여는 데 오류가 밝생했습니다:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "작업을 읽어들이는 중입니다"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "작업을 완료하는 중입니다..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "선택한 오브젝트를 지웁니다..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "지운 메세지 비우는 중"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "작업"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "%s의 약속을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "%s의 작업을 읽어들이는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "%s 여는 중입니다"
 
-#: calendar/gui/gnome-cal.c:1941
+#: 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:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"다음에 대한 작업 벡엔드가 비정상적으로 죽었습니다:\n"
-"%s"
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "비우는 중"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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 "Evolution 달력 및 작업"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 달력 설정 컨트롤"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 달력 계획 메세지 보기"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 달력/작업 편집"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution 달력 컴포넌트"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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 "작업(_T)"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "4월"
@@ -6776,6 +6863,23 @@ msgstr "생일 및 기념일"
 msgid "On The Web"
 msgstr "웹"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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'을(를) 열 수 없습니다."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "'%s'의 작업을 열 수 없습니다."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1일"
@@ -6995,7 +7099,7 @@ msgid "Contacts: "
 msgstr "연락처:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "인쇄 미리 보기"
 
@@ -7007,68 +7111,76 @@ msgstr "항목 인쇄"
 msgid "Print Setup"
 msgstr "인쇄 설정"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "작업 목록 '%s'을(를) 지웁니다. 정말로 계속하시겠습니까?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "새 작업 목록"
 
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "연락처 %d개"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "지워짐"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "작업을 읽어들이는 중입니다"
+
 # event -> 행사, Microsoft Office XP 참고
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "행사와 회의를 만드는 데 쓸 작업 목록 '%s'을(를) 열 수 없습니다"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "작업을 만들 때 쓸 수 있는 달력이 없습니다"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "새 작업"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "작업(_T)"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "새 작업을 만듭니다"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "뉴스그룹"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "작업 목록 그룹"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "새 작업을 만듭니다"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "보여줄 작업 폴더의 URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "`%s'의 작업을 읽어들일 수 없습니다"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7080,11 +7192,11 @@ msgstr ""
 "\n"
 "정말로 이 작업들을 지우시겠습니까?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "다시 묻지 않습니다."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "작업 인쇄"
 
@@ -8736,7 +8848,7 @@ msgstr "오프라인 작업을 위해 폴더 내용을 로컬에서 복사합니
 msgid "Downloading new messages for offline mode"
 msgstr "오프라인 모드를 위한 새 메세지를 다운로드하는 중입니다"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "오프라인 모드를 위한 '%s' 폴더를 준비하는 중입니다"
@@ -8829,33 +8941,6 @@ msgstr "(user-flag)에 잘못된 인자"
 msgid "Error executing filter search: %s: %s"
 msgstr "거르게 찾기 실행 중 오류: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"찾기 표현식을 해석할 수 없음: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"찾기를 수행도중 오류: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "알 수 없는 헤더에 대해 질의를 수행하는 중입니다: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8887,7 +8972,52 @@ msgstr "정크메일과 정크메일이 아닌 메세지를 학습합니다"
 msgid "Filtering new message(s)"
 msgstr "새 메세지 거르는 중입니다"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"찾기 표현식을 해석할 수 없음: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"찾기를 수행도중 오류: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all)은 한 개의 불리언 결과가 필요합니다"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "알 수 없는 헤더에 대해 질의를 수행하는 중입니다: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8898,15 +9028,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "gpg userid 힌트를 파싱하는 데 실패했습니다."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "gpg 암호 요청을 파싱하는 데 실패했습니다."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8915,27 +9045,27 @@ msgstr ""
 "다음 사용자에 대한 키를 열려면 열쇠글이 필요합니다:\n"
 "\"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "취소됨."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "비밀 키를 여는 데 실패했습니다: 열쇠글이 3번 틀렸습니다."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "GnuPG로부터 예상치못한 답변: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "암호화하는 데 실패했습니다: 받는 사람이 올바르게 지정되지 않았습니다."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8946,81 +9076,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s에 실패했습니다: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "서명 데이터를 만들 수 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 실행에 실패했습니다: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 실행에 실패했습니다."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "디지탈 서명된 메세지 부분입니다"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "메세지 서명을 확인할 수 없습니다; 임시 파일을 만들 수 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "암호화 데이터를 만들 수 없습니다: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "디지탈 암호화된 메세지 부분입니다"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "암호화된 내용"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "메세지 내용을 파싱할 수 없습니다"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "잠금 도우미 프로그램의 파이프를 만들 수 없습니다: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "잠금 도우미 프로그램을 실행할 수 없습니다: %s"
-
-#: 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 "'%s을(를) 잠글 수 없습니다: lock-helper에 프로토콜 오류가 발생했습니다"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "'%s'을(를) 잠글 수 없습니다"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9042,6 +9152,26 @@ msgstr "fcntl(2)로 파일 잠금을 얻어오는 데 실패했습니다: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2)으로 파일 잠금을 얻어오는 데 실패했습니다: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "잠금 도우미 프로그램의 파이프를 만들 수 없습니다: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "잠금 도우미 프로그램을 실행할 수 없습니다: %s"
+
+#: 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 "'%s을(를) 잠글 수 없습니다: lock-helper에 프로토콜 오류가 발생했습니다"
+
+#: 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"
@@ -9294,7 +9424,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "서버에서 보낸 인증 응답이 틀렸습니다."
 
@@ -9493,7 +9623,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "암호화 인증서(_P):"
 
 #: camel/camel-smime-context.c:360
@@ -9510,7 +9640,7 @@ msgstr "%s의 폴더 잠금을 만들 수 없습니다: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "로컬의 '보낸 편지함' 폴더에 추가하는 데 실패했습니다: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "인증하는 데 실패했습니다.\n"
@@ -9575,98 +9705,98 @@ msgstr "폴더를 만들 수 없습니다: %s: %s"
 msgid "Cannot set message digests"
 msgstr "%s 메세지를 얻을 수 없습니다: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "인증서 서명이 실패했습니다"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "올바른 서명"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "서명자: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "DATA 명령이 실패했습니다"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "`%s' 폴더를 만들 수 없습니다: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "메시지로부터 거르게 만들기(_T)"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "%s의 폴더 잠금을 만들 수 없습니다: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "사용자 이름을 서버에 보내는 데 실패했습니다"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "명령이 구현되지 않았습니다"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9683,16 +9813,26 @@ msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "폴더를 만들 수 없습니다: 이 저장고에 잘못된 동작입니다"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "폴더를 지울 수 없습니다: %s: 잘못된 동작"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "휴지통"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "정크메일"
@@ -9813,7 +9953,7 @@ msgstr "키 용도에서 인증서 서명을 지원하지 않습니다"
 msgid "Error in application verification"
 msgstr "애플리케이션 확인에 오류가 발생했습니다"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9826,11 +9966,11 @@ msgstr ""
 "핑거프린트:        %s\n"
 "서명:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "맞음"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "틀림"
 
@@ -9854,7 +9994,7 @@ msgstr ""
 "그래도 받아들이시겠습니까?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9869,7 +10009,7 @@ msgstr ""
 "\n"
 "받아들이시겠습니까?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9878,7 +10018,7 @@ msgstr ""
 "인증서 문제: %s\n"
 "발급자: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9887,7 +10027,7 @@ msgstr ""
 "잘못된 인증서 도메인: %s\n"
 "발급자: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9896,7 +10036,7 @@ msgstr ""
 "인증서 만료: %s\n"
 "발급자: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9910,17 +10050,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "`%s' URL을 파싱할 수 없습니다"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "%s을(를) 저장하는 데 오류가 발생했습니다: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "%2$s에 %1$s(이)라는 메세지는 없습니다"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "메세지를 가상 폴더에 복사할/옮길 수 없습니다"
 
@@ -9929,11 +10069,6 @@ msgstr "메세지를 가상 폴더에 복사할/옮길 수 없습니다"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "폴더를 지울 수 없습니다: %s: 그런 폴더가 없습니다"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "폴더 이름을 바꿀 수 없습니다: %s: 잘못된 동작"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9948,10 +10083,12 @@ 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 "모든 폴더에서 새 메세지 확인"
@@ -9983,6 +10120,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Novell GroupWise 서버에 접근하는 용도"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10001,26 +10139,322 @@ msgstr "이 옵션을 켜면 일반 텍스트 열쇠글을 이용해 IMAP 서버
 msgid "Checklist"
 msgstr "확인목록"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP server로부터 예상치못한 답변: %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' 폴더를 얻을 수 없습니다: %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 "`%s' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
+
+#: 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' 폴더를 얻을 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$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 ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$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 ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$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 ""
+"메세지를 얻을 수 없음: %2$s 폴더에서 %1$s\n"
+"  %3$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 "구독하는 폴더만 보이기"
+
+# namespace -> 이름 공간, Microsoft Office XP 참고
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "서버에서 알려 주는 폴더의 이름 공간을 무시합니다"
+
+# namespace -> 이름 공간, Microsoft Office XP 참고
+#: 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:429
+#, 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
+#, c-format
+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:140
+#: 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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "연결이 취소됨"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "알 수 없는 오류가 발생했습니다"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"POP 서버 %s에 연결할 수 없습니다: 요청한 인증 방법을 지원하지 않습니다."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s사용자이름 %s, 호스트 %s의 SMTP 열쇠글을 입력하십시오"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+"폴더 \"%s\"의 이름이 올바르지 않습니다; \"%c\" 문자가 들어 있어 있습니다"
+
+#: 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' 폴더를 만들 수 없습니다: %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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' 폴더를 만들 수 없습니다: %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' 폴더를 만들 수 없습니다: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "IMAP server로부터 예상치못한 답변: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "작업이 취소되었습니다"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "예기치 않게 서버의 연결이 끊겼습니다: %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:1089
-msgid "Unknown error"
-msgstr "알 수 없는 오류가 발생했습니다"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10065,21 +10499,21 @@ msgstr "%s 디렉토리를 만들 수 없습니다: %s"
 msgid "Could not load summary for %s"
 msgstr "%s에 대한 요약을 읽어들일 수 없습니다"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "바뀐 메세지를 검사합니다"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -10095,25 +10529,25 @@ msgstr ""
 "메세지를 얻을 수 없습니다: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "그런 메세지 없음"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "이 메시지는 현재 보여줄 수가 없습니다"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH 응답에서 메세지 본문을 찾을 수 없습니다."
 
@@ -10152,25 +10586,6 @@ msgstr "서버에 연결하는 데 사용자 설정 명령을 사용합니다"
 msgid "Command:"
 msgstr "명령:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "폴더"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "구독하는 폴더만 보이기"
-
-# namespace -> 이름 공간, Microsoft Office XP 참고
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "서버에서 알려 주는 폴더의 이름 공간을 무시합니다"
-
-# namespace -> 이름 공간, Microsoft Office XP 참고
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "이름 공간"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "이 서버의 받은 편지함에 있는 새 메세지에 거르게를 적용합니다"
@@ -10191,85 +10606,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP서버에 메일을 읽고 저장."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 서버 %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP 서비스 (사용자: %s, 위치: %s)"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL을 사용할 수 없습니다"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "연결이 취소됨"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "보안 모드로 IMAP 서버 %s에 연결하는 데 실패했습니다: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS 확장 기능을 지원하지 않습니다."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 협상이 실패했습니다"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "\"%s\" 명령으로 연결할 수 없습니다: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 서버 %s은(는) 요청한 인증형식 %s을(를) 지원하지 않습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "열쇠글을 입력하지 않았습니다."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10280,26 +10653,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "%s(이)라는 폴더가 없습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-"폴더 \"%s\"의 이름이 올바르지 않습니다; \"%c\" 문자가 들어 있어 있습니다"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10307,7 +10672,7 @@ msgstr "해당 상위 폴더에는 하위 폴더를 포함할 수 없습니다"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "`%s' 폴더를 만들 수 없습니다: 폴더가 이미 있습니다."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "상위 폴더를 알 수 없습니다: %s"
@@ -10414,58 +10779,58 @@ msgstr ""
 "외부 표준 mbox 스풀 파일에서 로컬 메일로 읽거나 저장할 때 사용됩니다.\n"
 "또한 Elm, Pine 또는 Mutt방식의 폴더를 읽을 때도 쓰입니다."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "저장고 최상위 폴더 %s은(는) 절대 경로가 아닙니다"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "저장고 최상위 폴더 %s은(는) 일반 디렉토리가 아닙니다"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "로컬 저장고에 받은 편지함이 없습니다"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "로컬 메일 파일 %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10531,7 +10896,7 @@ msgstr "폴더 `%s'을(를) 지울 수 없습니다: %s"
 msgid "not a maildir directory"
 msgstr "메일폴더 디렉토리가 아닙니다"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10862,7 +11227,7 @@ msgid "Server rejected username/password"
 msgstr "서버에서 사용자 이름과 열쇠글을 거부했습니다"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10871,8 +11236,8 @@ msgid "User cancelled"
 msgstr "사용자 취소되었습니다"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: 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,49 +11246,49 @@ msgstr "사용자 취소되었습니다"
 msgid "Cannot get message %s: %s"
 msgstr "%s 메세지를 얻을 수 없습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "내부 오류: uid 형식이 잘못되었습니다: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "뉴스 서버에서 게시를 허용하지 않습니다"
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "오프라인으로 작업하는 중에는 NNTP 메세지를 올릴 수 없습니다!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "NNTP 폴더에서 메세지를 복사할 수 없습니다!"
 
@@ -11044,7 +11409,8 @@ msgid "Could not get group: %s"
 msgstr "그룹을 받아 올 수 없습니다: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "메세지를 가져올 수 없습니다: 지정하지 않은 오류"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11097,8 +11463,8 @@ msgstr "uid %s의 메세지가 없습니다"
 msgid "Retrieving POP message %d"
 msgstr "POP 메세지 %d개를 가져옴"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "알 수 없는 이유"
 
@@ -11540,7 +11906,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "첨부"
 
@@ -11584,6 +11950,103 @@ msgstr "MIME 형식:"
 msgid "Suggest automatic display of attachment"
 msgstr "첨부 파일의 자동 표시를 권합니다"
 
+#: 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 "파일을 열 수 없습니다"
+
+#: 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:1479
+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] "<b>%d</b>개의 파일이 첨부되었습니다"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "첨부 모음 보이기 (여기에 첨부를 끌어옵니다)(_A)"
+
+#: 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 ""
+"메일 작성 창을 만들 수 없습니다:\n"
+"주소 선택 컨트롤을 활성화할 수 없습니다."
+
+#: 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 ""
+"편집 작성 창을 만들 수 없습니다:\n"
+"HTML 편집기 컴포넌트를 활성화할 수 없습니다.\n"
+"올바른 버전의 gtkhtml과 libgtkhtml이\n"
+"설치되었는 지 확인하십시오.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"메일 작성 창을 만들 수 없습니다:\n"
+"HTML 편집기 컴포넌트를 활성화할 수 없습니다."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(메일 작성기에 텍스트가 아닌 메세지 본문이 들어 있습니다. 이 메세지 본문"
+"은 편집할 수 없습니다.)<b>"
+
 # post -> 게시, Microsoft Office XP 참고
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
@@ -11666,210 +12129,134 @@ msgstr "게시할 폴더를 고를려면 여기를 누르십시오"
 msgid "Attach file(s)"
 msgstr "파일 첨부"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"나가는 메세지에 서명할 수 없습니다: 계정에 사인할 때 쓸 인증서를 설정하지 않"
-"았습니다"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"보내는 메세지를 암호화할 수 없습니다: 계정에서 암호화 인증서를 설정하지 않았"
-"습니다"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "파일을 열 수 없습니다"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "편집기에서 메세지를 가져올 수 없습니다"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "제목 없는 메세지"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "파일 열기"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "자동으로 만들기"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "서명:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b>개의 파일이 첨부되었습니다"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "첨부 모음 숨기기 (여기에 첨부를 끌어옵니다)(_A)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "첨부 모음 보이기 (여기에 첨부를 끌어옵니다)(_A)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "메일 메세지를 작성합니다"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "메세지에 파일을 첨부합니다"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"메일 작성 창을 만들 수 없습니다:\n"
-"주소 선택 컨트롤을 활성화할 수 없습니다."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"편집 작성 창을 만들 수 없습니다:\n"
-"HTML 편집기 컴포넌트를 활성화할 수 없습니다.\n"
-"올바른 버전의 gtkhtml과 libgtkhtml이\n"
-"설치되었는 지 확인하십시오.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"메일 작성 창을 만들 수 없습니다:\n"
-"HTML 편집기 컴포넌트를 활성화할 수 없습니다."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(메일 작성기에 텍스트가 아닌 메세지 본문이 들어 있습니다. 이 메세지 본문"
-"은 편집할 수 없습니다.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "정말로 이 제목없는 약속을 지우시겠습니까?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "읽지 않은 메세지"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "바뀐 부분을 저장하시겠습니까?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "파이프를 만들 수 없습니다: %s"
+msgid "Don't Recover"
+msgstr "지우지 않기"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "서명 파일을 저장할 수 없습니다: %s"
+msgid "Recover"
+msgstr "지우기"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "서명 파일을 저장할 수 없습니다: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "바뀐 내용 버리기(_D)"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "바뀐 부분을 저장하시겠습니까?"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "경고: 바뀐 메세지"
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Don't Recover"
-msgstr "지우지 않기"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "정말로 이 제목없는 약속을 지우시겠습니까?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "지우기"
+msgid "Discard Changes"
+msgstr "바뀐 내용 버리기(_D)"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "메세지 저장..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "파이프를 만들 수 없습니다: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "읽지 않은 메세지"
+msgid "Could not read signature file \"{0}\"."
+msgstr "서명 파일을 저장할 수 없습니다: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "경고: 바뀐 메세지"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "메세지에 파일을 첨부합니다"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "메일을 작성하기 전에 계정을 설정해야 합니다."
 
@@ -12006,7 +12393,8 @@ msgstr ""
 "그 이름의 파일이 이미 있습니다.\n"
 "파일을 덮어쓰시겠습니까?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "파일을 덮어쓰시겠습니까?"
 
@@ -12175,81 +12563,97 @@ msgstr "비교할 시각을 선택하십시오"
 msgid "_Filter Rules"
 msgstr "거르게 규칙(_F)"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"정규식 '%s'에서 오류가 발생했습니다:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "파일 `%s'이(가) 없거나 일반 파일이 아닙니다."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "모임 업데이트"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "구별되는 이름(_N):"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "파일 이름을 지정해야 합니다."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "%s 폴더를 옮기는 중"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "파일 `%s'이(가) 없거나 일반 파일이 아닙니다."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "할당"
+msgid "Missing folder."
+msgstr "%s 폴더를 옮기는 중"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "폴더를 지정해야 합니다."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "서버를 선택하지 않았습니다"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"정규식 '%s'에서 오류가 발생했습니다:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "날짜를 선택해야 합니다."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "할당"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "이 거르게에 이름을 주어야 합니다."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "이 가상폴더의 이름을 지정해야 합니다."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "파일 이름을 지정해야 합니다."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "폴더를 지정해야 합니다."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "서버를 선택하지 않았습니다"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12262,65 +12666,11 @@ msgstr "파일을 선택하십시오"
 msgid "<b>Then</b>"
 msgstr "<b>기한:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "폴더 선택"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "중요"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "할 일"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "나중에"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "테스트"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "규칙 이름:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "제목 없음"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>기한:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "동작 선택"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "모든 조건이 다 충족될 때"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "어떤 조건이라도 충족될 때"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "받는 메일"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "보내는 메일"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12410,6 +12760,76 @@ 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
+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
+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
+msgid "Later"
+msgstr "나중에"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "테스트"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "규칙 이름:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>기한:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "모든 조건이 다 충족될 때"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "어떤 조건이라도 충족될 때"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "동작 선택"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "대리"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "받는 사람"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "%s에 회신"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "포함:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "받는 메일"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "보내는 메일"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12556,7 +12976,7 @@ msgstr "플래그 지정 아님"
 msgid "Junk Test"
 msgstr "정크메일 테스트"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "꼬리표"
@@ -12594,7 +13014,7 @@ msgstr "프로그램을 끝냅니다"
 msgid "Play Sound"
 msgstr "소리 연주"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "읽음"
 
@@ -12668,9 +13088,9 @@ msgstr "시작함"
 msgid "Stop Processing"
 msgstr "처리 중지"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "제목"
@@ -12735,102 +13155,60 @@ msgstr "제목에 포함하지 않음"
 msgid "Virtual _Folders"
 msgstr "가상 폴더(_F)"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "더하기(_A)"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "가상 폴더 원본"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "메일 작성기 기본 설정"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "여기서 보안과 메세지 표시를 포함한, 메일 설정을 합니다"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을 합니다"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "여기서 전자메일 게정을 설정합니다"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution 메일"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 메일 계정 설정 컨트롤"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution 메일 컴포넌트"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution 메일 작성기"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 메일 작성기 설정 컨트롤"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 메일 폴더 보기"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 메일 기본 설정 컨트롤"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "메일"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "메일 기본 설정"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[기본값]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "계정 이름"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "프로토콜"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "이름없음"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "언어"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "서명 더하기(_A)"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "서명"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- 전달된 메시지 --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%Y-%m-%d (%a) %H:%M %%+05d에, %%s 쓰기를:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "찾은 것에서 가상 폴더 만들기(_V)..."
 
@@ -12864,266 +13242,439 @@ msgstr "<폴더를 고를려면 여기를 누르십시오>"
 msgid "Create New Folder"
 msgstr "새 폴더 만들기"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "폴더 이름(_N):"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "가상 폴더"
-
-# VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "해당 없음"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "받은 편지함"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "읽어들이는 중..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "%s 폴더를 옮기는 중"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "%s 폴더를 복사하는 중"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "메시지를 %s 폴더로 옮기는 중"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "메시지를 %s 폴더로 복사하는 중"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "메세지를 맨 위의 저장고에 넣을 수 없습니다"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "이동(_N)"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "작업 취소"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "폴더 선택"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "복사"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "`%s' 폴더를 만드는 중입니다"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "폴더를 만듭니다"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" 폴더 이름 바꾸기:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "폴더 이름 바꾸기"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "보기(_V)"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "새 창에서 열기(_N)"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "이동(_N)"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "새 폴더(_N)..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "이름 바꾸기(_R)"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "가상 폴더"
+
+# VFolder에서 맞는 게 아무것도 없을 경우 마지막 fallback
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "메일"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "새 메세지로 고침(_E)..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "인쇄(_P)"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "보낸 사람에게 회신(_R)"
 
 # List는 메일링 리스트를 말함.
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "리스트에 회신(_L)"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "전체에 회신(_A)"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "전달(_F)"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "추가 작업(_W)..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "표시 완료(_G)"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "표시 비우기(_E)"
 
-#: mail/em-folder-view.c:787 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 "읽은 것으로 표시(_K)"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "읽지 않은 것으로 표시(_U)"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "중요한 것으로 표시(_I)"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "중요하지 않은 것으로 표시(_M)"
 
-#: mail/em-folder-view.c:791 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 "정크메일로 표시(_J)"
 
-#: mail/em-folder-view.c:792 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 "정크메일이 아닌 것으로 표시(_N)"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "되살리기(_N)"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "폴더로 옮기기(_V)..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "폴더로 복사(_C)..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "보낸 사람을 주소록에 더하기"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "거르게 적용(_Y)"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "정크메일 거르게(_I)"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "메시지로부터 거르게 만들기(_T)"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "제목에따른 가상폴더(_S)"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "보낸 사람에 따른 가상폴더(_N)"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "받은 사람에 따른 가상폴더(_R)"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "메일링 리스트에 대한 가상폴더(_L)"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "쓰레드에 가상폴더"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "제목에 대한 거르게(_J)"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "보낸 사람에 대한 거르게(_D)"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "받은이에 대한 거르게(_C)"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "메일링 리스트에 대한 거르게(_M)"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "쓰레드에 거르게"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "기본값"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "메세지 인쇄"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "링크 위치 복사(_C)"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "메일을 %s(으)로 보내려면 누르십시오"
 
-#: mail/em-folder-view.c:2214
+#: 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 "참조"
+
+#: 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 "숨은 참조"
+
+#: 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
+msgid "Newsgroups"
+msgstr "뉴스그룹"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "URL %s을(를) 열려면 누르십시오"
+msgid "%s attachment"
+msgstr "%s 첨부"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "지원하지 않는 서명 형식입니다"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "서명을 확인하는 중 오류가 발생했습니다"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "`%s' 가져오는 중"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "서명 없음"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "올바른 서명"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "잘못된 서명"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "올바른 서명, 보낸 사람을 확인할 수 없음"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "암호화 안 됨"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "암호화됨, 약함"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "암호화됨"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "암호화됨, 강력"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "외부 본문 부분의 형식이 잘못되었습니다."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP 사이트(%s)를 가리킵니다"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "로컬 파일(%s)을 가리킵니다"
+
+#: 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\" 타입)을 가리킵니다"
+
+#: mail/em-format-html.c:1137
+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 "<I> ((%a) %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13131,11 +13682,7 @@ msgstr "URL %s을(를) 열려면 누르십시오"
 msgid "Matches: %d"
 msgstr "일치: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "서명 없음"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13143,11 +13690,7 @@ msgstr ""
 "이 메세지에는 서명이 없습니다.  메세지를 보낸 사람이 확실한 지 보장할 수 없습"
 "니다."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "올바른 서명"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13155,11 +13698,7 @@ msgstr ""
 "이 메세지는 서명되었고 서명이 올바릅니다.  메세지를 보낸 사람은 그 사람이 거"
 "의 확실합니다."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "잘못된 서명"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13167,11 +13706,11 @@ msgstr ""
 "이 메세지의 서명을 확인할 수 없습니다. 메일이 전송중에 변경되었을 수 있습니"
 "다."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "올바른 서명, 보낸 사람을 확인할 수 없음"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13179,11 +13718,7 @@ msgstr ""
 "이 메세지는 올바른 서명으로 사인되었습니다. 하지만 메세지를 보낸 사람을 확인"
 "할 수 없습니다."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "암호화 안 됨"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13192,11 +13727,7 @@ msgstr ""
 "메세지를 암호화하지 않았습니다.  이 메세지가 인터넷을 통해 전달되는 동안, 다"
 "른 사람이 메세지 내용을 볼 수도 있습니다."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "암호화됨, 약함"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13206,11 +13737,7 @@ msgstr ""
 "사람이 이 메세지의 내용을 알아 내는 게 어렵긴 하지만, 현실적인 시간 내에 불가"
 "능하지는 않습니다."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "암호화됨"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13218,11 +13745,7 @@ msgstr ""
 "메세지가 암호화되어 있습니다.  다른 사람이 이 메세지의 내용을 알아 내기는 어"
 "렵습니다."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "암호화됨, 강력"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13231,179 +13754,61 @@ msgstr ""
 "메세지가 암호화되어 있지만, 약한 암호화 알고리즘으로 암호화되었습니다.  현실"
 "적인 시간 내에 다른 사람이 이 메세지의 내용을 알아 내는 건 매우 어렵습니다."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "인증서 보기(_V)"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "이 인증서는 볼 수 없습니다"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "마침: %Y년 %b %e일, %p %l:%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "마감 지남:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %e일, %p %l:%M까지"
 
 # FIXME - inline의 나은 번역을 찾아보자
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "인라인으로 보기"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "숨기기(_H)"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "%2$d페이지 중 %1$d페이지"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "`%s' 가져오는 중"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "외부 본문 부분의 형식이 잘못되었습니다."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP 사이트(%s)를 가리킵니다"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "사이트 \"%2$s\"의 로컬 파일(%1$s)을 가리킵니다"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "로컬 파일(%s)을 가리킵니다"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "원격 데이터(%s)을 가리킵니다"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "알 수 없는 외부 데이터(\"%s\" 타입)을 가리킵니다"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "메세지를 포맷하는 중입니다"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "보낸 사람"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "회신 주소"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "받는이"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "참조"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "숨은 참조"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "메일 프로그램"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> ((%a) %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "날짜"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "뉴스그룹"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s 첨부"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "s/MIME 메세지를 분석할 수 없습니다: 알 수 없는 오류가 발생했습니다"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "multipart/encrypted에 지원하지 않는 암호화 방식을 사용했습니다"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME 메세지를 분석할 수 없습니다. 소스로 보여줍니다."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "지원하지 않는 서명 형식입니다"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "서명을 확인하는 중 오류가 발생했습니다"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "서명을 확인하는 중 알 수 없는 오류가 발생했습니다"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (내부에 포함)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13414,26 +13819,55 @@ msgstr ""
 "\n"
 "폴더를 옮기는 동안 잠시 기다리십시오..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "POP3 UID 캐시를 옮기는 데 실패했습니다: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "`%s' 폴더를 만들 수 없습니다: %s"
 
-# folder expand state?
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "폴더 상태를 옮기는 데 실패했습니다: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"파일 디스크립터를 복사할 수가 없습니다: %s\n"
+" %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "%s에 대한 그룹 목록 파일을 저장할 수 없습니다: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "POP 서버 %s에 인증하는 데 실패했습니다: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "`%s' 디렉토리를 만들 수 없습니다: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "`%s'에 쓸 저장고를 여는 데 실패했습니다: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "`%s' 디렉토리를 만들 수 없습니다: %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"출력파일을 만들 수가 없습니다: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13444,89 +13878,75 @@ msgstr "다른 이름으로 저장..."
 msgid "untitled_image.%s"
 msgstr "이름없는_그림.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "바탕 화면으로 설정(_B)"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "보낸 이에게 회신(_R)"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "브라우저에서 링크 열기(_O)"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "메세지 보내기(_N)..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "주소록에 더하기(_A)"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "%s에서 열기..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "이 저장고는 가입을 지원하지 않거나, 가입할 수 있도록 설정하지 않았습니다."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "구독"
 
-#: mail/em-subscribe-editor.c:637 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 "폴더"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "서버를 선택하십시오."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "서버를 선택하지 않았습니다"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "이 메세지를 다시 보지 않습니다."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "거르게"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- 전달된 메시지 --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y-%m-%d (%a) %H:%M %%+05d에, %%s 쓰기를:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "메세지"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "메세지 저장..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "주소 더하기"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "%s에서 온 메일"
@@ -13544,11 +13964,13 @@ msgid "Check incoming mail being junk"
 msgstr "쓰레기 메일 검사"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "인용문 강조 색"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "인용문 강조 색."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13652,14 +14074,20 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "꼬리표와 거기에 해당되는 색의 목록"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "계정 목록"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "계정 목록"
+
+#: 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."
@@ -13667,27 +14095,32 @@ msgstr ""
 "Evolution의 메일 컴포넌트에 사용할 계정 목록입니다. 이 목록에는 /apps/"
 "evolution/mail/accounts에 상대적인 서브디렉토리의 이름이 들어 있습니다."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "사용자 지정 헤더와 그 헤더를 사용할 지 여부의 목록."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Evolution의 메일 컴포넌트에 사용할 꼬리표 목록입니다. 이 목록에는 <이름>:<색"
 "> 형식의 문자열이 들어 있습니다. 색은 HTML 16진수 인코딩을 사용합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "보노보 컴포넌트 뷰어가 있는 지 검사할 MIME 타입 목록"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "http로 HTML 메세지의 그림을 읽어들입니다"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13697,125 +14130,115 @@ msgstr ""
 "읽어들이지 않습니다 2 - 보낸 사람이 주소록에 들어 있으면 그림을 읽어들입니다 "
 "2 - 항상 네트워크에서 그림을 읽어들입니다"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "거르게 동작 기록"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "지정한 로그 파일에 대한 거르게 동작을 기록합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "거르게 동작을 기록할 로그 파일"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "거르게 동작을 기록할 로그 파일입니다."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "일정 시간이 지나면 읽은 것으로 표시하기"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "일정 시간이 지나면 읽은 것으로 표시합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시하기"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "메세지 \"미리 보기\"에서 인용한 부분을 표시합니다."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "메세지 창 기본 높이"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "메세지 창 기본 너비"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "메세지-표시 모양새 (보통, 헤더 전부, 소스)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "새 메일 알림 사운드 파일"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "새 메일 알림 종류"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "제목이 없으면 물어보기"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "사용자가 폴더의 지운 메세지를 비우려 할 때 물어봅니다."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "사용자가 지운 메세지를 비우려 할 때 물어봅니다"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Bcc만 사용했을 때 물어봅니다"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 ""
 "HTML 메세지를 원하지 않는 사람한테 HTML 메일을 보내려 할 때 물어봅니다."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "원하지 않는 HTML을 보내려 할 때 물어봅니다"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "텍스트의 URL을 인식하고 바로가기로 바꿉니다."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "텍스트의 스마일리를 인식하고 그림으로 바꿉니다."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "받은 메일에 대해 쓰레기 메일 검사를 실행합니다"
 
-# Secret Option
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "ㅂ1ㅁ12 0ㅗㅂ^ㅕL"
-
-# Secret Option
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "ㅂ1ㅁ12 0ㅗㅂ^ㅕL."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "기본으로 HTML 메일 보내기"
@@ -13862,7 +14285,7 @@ msgstr "인라인 맞춤법 검사"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "메세지 창 기본 높이"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -14005,33 +14428,63 @@ msgstr "spamd를 시작할 포트"
 msgid "spamd port"
 msgstr "spamd 포트"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution ELM 가져오기"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution 넷스케이프 메일 가져오기"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "메일 작성기 기본 설정"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 가져오기"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "여기서 보안과 메세지 표시를 포함한, 메일 설정을 합니다"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 가져오기"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "여기서 맞춤법 검사, 서명, 그리고 메세지 작성 설정을 합니다"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 가져오기"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "여기서 전자메일 게정을 설정합니다"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution 메일"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 메일 계정 설정 컨트롤"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution 메일 컴포넌트"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution 메일 작성기"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 메일 작성기 설정 컨트롤"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 메일 기본 설정 컨트롤"
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "메일 기본 설정"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "메일(_M):"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14039,15 +14492,15 @@ msgstr "Elm 메일을 Evolution에 가져오는 중입니다"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "잠시 기다리십시오"
 
@@ -14076,18 +14529,46 @@ msgid "Select folder to import into"
 msgstr "어느 폴더로 가져올 지 선택하십시오"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "%s 가져오는 중입니다"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "메일함 가져오기"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution ELM 가져오기"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution 넷스케이프 메일 가져오기"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 가져오기"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 가져오기"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 가져오기"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s 검색하는 중입니다"
@@ -14097,7 +14578,7 @@ msgstr "%s 검색하는 중입니다"
 msgid "Priority Filter \"%s\""
 msgstr "우선순위 거르게 \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14121,7 +14602,7 @@ msgstr ""
 "그리고 우선순위를 쓰는 필터들은 점수를 사용하게 됩니다.  이렇게\n"
 "가져온 필터들이 의도한 대로 제대로 동작하는 지 확인하십시오."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14133,7 +14614,7 @@ msgstr ""
 "이 기능은 Evolution에서 지원하지 않습니다.\n"
 "해당 거르게를 무시합니다."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14147,23 +14628,23 @@ msgstr ""
 "않습니다. 이 거르게는 해당 문자열이 메세지 본문에 들어\n"
 "있는 지 여부에 대한 검사로 대체합니다."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "넷스케이프 데이터를 Evolution에 가져오는 중입니다"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "넷스케이프 데이터 가져오기"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "설정"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "메일 거르게"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14196,124 +14677,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 계정 편집기"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "키 계약"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "호스트(_H):"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "사용자이름(_N):"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "경로(_P):"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "%s에 보내는 메일"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "제목이 %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "%s에서 온 메일"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 메일링 리스트"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "%s에 회신"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "거르게 규칙을 더하기"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "지워짐"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d일"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d초"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d초"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "연락처 %d개"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "전체 %d개, %d개 안 읽음"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "지워짐"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "새 메일 메세지"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "메일 만들기(_M)"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "메일 메세지를 새로 작성합니다"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "새 메일 폴더"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "메일 폴더(_F)"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "새 메일 폴더를 만듭니다"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "뷰가 표시할 메일 소스의 URI"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "신원"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14322,12 +14815,12 @@ msgstr ""
 "아래에 이름과 메일 주소를 입력하십시오. 그 아래에 있는 \"선택\" 필드는 메일"
 "을 보낼 때 정보를 더하지 않고 싶으면 채우지 않아도 됩니다."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "메일 받기"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14335,15 +14828,15 @@ msgstr ""
 "아래에 들어오는 메일 서버에 대한 정보를 입력하십시오. 확실히 모른다면, 시스"
 "템 관리자나 인터넷 서비스 제공자에게 물어보십시오."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "다음 옵션 중에 하나를 선택하십시오"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "메일 보내기"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14351,11 +14844,11 @@ msgstr ""
 "메일을 보낼 방법에 대해 정보를 입력하십시오. 잘 모르겠으면, 시스템 관리자나 "
 "인터넷 서비스 제공자에게 물어 보십시오."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "계정 관리"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14368,14 +14861,6 @@ msgstr ""
 "니다. 이 계정의 이름을 아래의 빈 칸에 입력하십시오. 이 이름은 표시할 목적으로"
 "만 사용됩니다."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "서비스 확인중"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "서버에 연결중..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14691,7 +15176,8 @@ msgid "Execute Command..."
 msgstr "명령 실행..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "고정폭(_X):"
 
 #: mail/mail-config.glade.h:82
@@ -15017,345 +15503,450 @@ msgstr "색상"
 msgid "description"
 msgstr "설명"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "\"%s\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "정말로 이 계정을 지우시겠습니까?"
+msgid "Invalid authentication"
+msgstr "SMTP 인증"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "이 폴더의 지워진 모든 메세지를 완전히 지웁니다"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP 서버 %s에서 요청한 인증 타입 %s을(를) 지원하지 않습니다."
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "모든 폴더의 지워진 메세지를 완전히 지웁니다"
+"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-errors.xml.in.h:6
+#. 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 "정말로 이 URL을 지우시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"HTML 형식의 메세지를 보내려고 합니다. 받는 사람이 HTML 메일을\n"
+"받고 싶어하고, 받을 수 있는 지 확인하십시오.\n"
+"%s어쨌든 메세지를 보내시겠습니까?"
+
+#: 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-errors.xml.in.h:8
+#. 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 "제목 없는 메세지를 보내려 할 때 물어봅니다."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "To나 Cc로 받는 사람이 없는 상태로 메세지를 보내려 할 때 물어봅니다."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "폴더를 만들 수 없습니다: %s: %s"
-
-#: mail/mail-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "임시 디렉토리를 만들 수가 없습니다: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
+msgid "Use default drafts folder?"
+msgstr "기본 연락처 폴더에 대한 경로"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "로컬 %s 폴더를 지울 수 없습니다."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"이 계정의 임시 보관함 폴더를 열 수 없습니다.\n"
+"기본적인 임시 보관함 폴더를 사용하시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "로컬 %s 폴더를 지울 수 없습니다."
+msgid "Use _Default"
+msgstr "기본값"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "`%s' 폴더를 얻을 수 없습니다: 폴더가 없습니다."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "이 폴더의 지워진 모든 메세지를 완전히 지웁니다"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "소스를 열 수 없습니다"
+msgid "_Expunge"
+msgstr "지운 메세지 비우기(_X)"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "소스를 열 수 없습니다"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "모든 폴더의 지워진 메세지를 완전히 지웁니다"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "메세지를 열 수 없음"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgid "_Empty Trash"
+msgstr "휴지통 비우기(_T)"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "로컬 %s 폴더 이름을 바꿀 수 없습니다."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "보내지 않은 메세지가 있습니다, 그래도 끝내시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"`%s'에 저장할 수 없습니다\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "서명 더하기(_A)"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "서명 파일을 저장할 수 없습니다: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "\"%s\" 지우기"
+msgid "Error while {0}."
+msgstr ""
+"'%s' 중 오류:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "선택한 연락처를 지웁니다"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "바뀐 내용 버리기(_D)"
+msgid "Error while performing operation."
+msgstr ""
+"작업을 수행하는 중에 오류가 발생했습니다:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "바뀐 부분을 저장하시겠습니까?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "지우지 않음"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "열쇠글을 입력하십시오"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "거르게 정보를 읽어들이는 데 오류가 발생했습니다:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
-"작업을 수행하는 중에 오류가 발생했습니다:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"`%s'에 저장할 수 없습니다\n"
+" %s"
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "'%s' 디렉토리를 만들 수 없습니다: %s."
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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 ""
-"'%s' 중 오류:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
 msgid "File exists but cannot overwrite it."
 msgstr "파일이 있습니다, 덮어쓰시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:42
+#. 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-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "로컬 %s 폴더를 지울 수 없습니다."
+
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "로컬 %s 폴더를 지울 수 없습니다."
+
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. 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 "정말로 \"%s\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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-errors.xml.in.h:47
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "SMTP 인증"
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "\"%s\"(이)라는 이름의 폴더가 이미 있습니다. 다른 이름을 사용하십시오."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Cannot open target \"{2}\"."
+msgstr "메세지를 열 수 없음"
+
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
-"HTML 형식의 메세지를 보내려고 합니다. 받는 사람이 HTML 메일을\n"
-"받고 싶어하고, 받을 수 있는 지 확인하십시오.\n"
-"%s어쨌든 메세지를 보내시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "정말로 \"%s\" 폴더와 그 아래 폴더를 모두 지우시겠습니까?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "폴더를 만들 수 없습니다: %s: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "소스를 열 수 없습니다"
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
+#. 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 ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"다음 가상폴더:\n"
-"%s지워진 폴더를 사용:\n"
-"    '%s'\n"
-"가 새로 고쳐졌습니다."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "지우지 않음"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"다음 가상폴더:\n"
-"%s지워진 폴더를 사용:\n"
-"    '%s'\n"
-"가 새로 고쳐졌습니다."
+msgid "Could not save signature file."
+msgstr "서명 파일을 저장할 수 없습니다: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "서명 더하기(_A)"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "바뀐 내용 버리기(_D)"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP 서버 %s에서 요청한 인증 타입 %s을(를) 지원하지 않습니다."
+msgid "Do you wish to save your changes?"
+msgstr "바뀐 부분을 저장하시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15363,85 +15954,97 @@ msgstr ""
 "\n"
 "바뀐 내용을 저장하시겠습니까?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"이 계정의 임시 보관함 폴더를 열 수 없습니다.\n"
-"기본적인 임시 보관함 폴더를 사용하시겠습니까?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "기본값"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "바뀐 내용 버리기(_D)"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "기본 연락처 폴더에 대한 경로"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "필요한 정보중에 입력하지 않은 정보가 있습니다."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "보내지 않은 메세지가 있습니다, 그래도 끝내시겠습니까?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "같은 이름으로 두 개의 계정을 만들 수 없습니다."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "`%s' 폴더를 얻을 수 없습니다: 폴더가 없습니다."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "바뀐 내용 버리기(_D)"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "휴지통 비우기(_T)"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"다음 가상폴더:\n"
+"%s지워진 폴더를 사용:\n"
+"    '%s'\n"
+"가 새로 고쳐졌습니다."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "지운 메세지 비우기(_X)"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "보내기"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"다음 가상폴더:\n"
+"%s지워진 폴더를 사용:\n"
+"    '%s'\n"
+"가 새로 고쳐졌습니다."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "덮어 쓰기"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "보내기"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "\"%s\" 연결을 확인하는 중입니다"
@@ -15450,20 +16053,20 @@ msgstr "\"%s\" 연결을 확인하는 중입니다"
 msgid "Working"
 msgstr "작업 중"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "폴더 거르는 중"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "메일 가져오는 중"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "나가는 거르게를 적용하는 데 실패했습니다: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15472,113 +16075,113 @@ msgstr ""
 "%s에 추가하는 데 실패했습니다: %s\n"
 "대신에 로컬의 `보낸 편지함'에 추가합니다."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "로컬의 '보낸 편지함' 폴더에 추가하는 데 실패했습니다: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%2$d개 중에서 %1$d번째 메세지를 보내는 중입니다"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "%2$d개 메세지 중에서 %1$d번째를 보내는 데 실패했습니다"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "완료."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "메세지를 폴더로 저장하는 중"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "메시지들을 %s(으)로 옮기는 중"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "메시지들을 %s(으)로 복사하는 중"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\"의 폴더를 찾는 중"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "전달된 메시지"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s 폴더를 열기"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "저장고 %s을(를) 여는 중입니다"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s 폴더를 지우는 중입니다"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "%s 폴더를 저장하는 중입니다"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "계정 '%s'의 지운 메세지를 비우고 내용을 저장하는 중입니다"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "%s 계정을 저장하는 중입니다"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "폴더 다시 읽는 중입니다"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "지운 메세지를 비우는 중입니다"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "'%s' 안의 휴지통을 비우는 중입니다"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "로컬 폴더"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "메세지 %s을(를) 가져오기"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "메세지 %d개 가져오는중"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "메시지 %d개 저장중"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15587,7 +16190,7 @@ msgstr ""
 "출력파일을 만들 수가 없습니다: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15596,11 +16199,11 @@ msgstr ""
 "%s(으)로 메시지 저장 중 오류 발생:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "첨부 저장"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15609,17 +16212,17 @@ msgstr ""
 "출력 파일을 만들 수 없음: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "데이터를 쓸 수가 없습니다: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s에서 연결 끊는 중"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s(으)로 다시 연결중"
@@ -15683,24 +16286,24 @@ msgstr "업데이트 중..."
 msgid "Waiting..."
 msgstr "기다리는 중..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "사용자가 취소한 동작."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s의 열쇠글을 입력하십시오"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "열쇠글 입력"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "이 열쇠글 기억(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "이 세션에서 이 열쇠글을 기억합니다(_R)"
 
@@ -15740,90 +16343,95 @@ msgstr "전달된 메시지"
 msgid "Invalid folder: `%s'"
 msgstr "잘못된 폴더: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "가상 폴더 설정: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "가상폴더의 uri 새로 고침: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "가상폴더의 uri 새로 고침: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "가상 폴더"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "가상폴더 편집"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "새 가상폴더"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "보지않았음"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "봤음"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "응답함"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "여러개의 보지않은 메세지"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "여러 메세지"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "가장 낮음"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "낮음"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "높음"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "가장 높음"
 
 # ???
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "오늘 %p %l:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "어제 %p %l:%M "
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "(%a) %p %l:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %e일 %p %l:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%Y년 %b %e일"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "메세지 목록 작성중"
 
@@ -15855,43 +16463,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "추가 작업 메세지 플래그"
 
@@ -15936,116 +16544,56 @@ msgstr "구독(_S)"
 msgid "_Unsubscribe"
 msgstr "구독 중지(_U)"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 쉘"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 테스트"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 테스트 컴포넌트"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "기본 바로가기 그룹"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "폴더 모음의 기본 너비"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "바로가기 모음 창의 기본 너비"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "기본 창 높이"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "기본 창 너비"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Evolution 설정 버전"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "맨 처음 시작할 때 기본으로 보여줄 컴포넌트 ID 혹은 별명."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 "참이면, Evolution이 처음에 온라인이 아니라 오프라인 모드로 시작합니다."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 "참이면, Evolution 개발 버전의 경고 대화 상자를 표시하지 않습니다."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 "오프라인에서 사용할 때 동기화할 폴더의 경로 목록"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "기본 달력 폴더에 대한 경로"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "기본 연락처 폴더에 대한 경로"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "기본 메일 폴더에 대한 경로"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "기본 작업 폴더에 대한 경로"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "기본 달력 폴더의 물리적인 URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "기본 연락처 폴더의 URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "기본 메일 폴더의 URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "기본 작업 폴더의 물리적인 URI"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution을 오프라인 모드로 시작할 지 여부"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "폴더 모음을 보여줄 것인지 여부"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "바로가기 모음을 보여줄 것인지 여부"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "개발 버전 경고를 건너 뛸지 여부"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "메일"
 
@@ -16053,6 +16601,32 @@ msgstr "메일"
 msgid "Brought to you by"
 msgstr "다음 사람들 덕분에 여기까지 왔습니다"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%b %e일"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "알 수 없는 오류가 발생했습니다"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "인자가 잘못되었습니다"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "OAF에 등록할 수 없습니다"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "설정 데이터베이스를 찾을 수 없습니다"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "일반 오류"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(제목없음)"
@@ -16189,11 +16763,11 @@ msgstr "가져오기 기능을 실행할 수 없습니다"
 msgid "_Import"
 msgstr "가져오기(_I)"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "연결 닫는중..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution 설정"
 
@@ -16234,11 +16808,35 @@ msgstr "폴더 이름에 \"#\" 문자가 들어갈 수 없습니다."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' 과 '..'는 쓸 수 없는 폴더 이름입니다."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution은 온라인 상태입니다.  오프라인 상태로 작업하려면 이 단추를 "
+"누르십시오."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution은 오프라인 상태로 가는 중입니다."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution은 오프라인 상태입니다.  온라인 상태로 작업하려면 이 단추를 "
+"누르십시오."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "%s에 보내는 메일"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "이 시스템에 그놈 파일럿 툴이 설치되지 않았습니다."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "%s 실행 중 오류가 발생했습니다."
@@ -16252,14 +16850,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy를 실행할 수 없습니다."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Ximian Evolution 정보"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "온라인 작업(_W)"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "오프라인 작업(_W)"
 
@@ -16267,50 +16866,6 @@ msgstr "오프라인 작업(_W)"
 msgid "Work Offline"
 msgstr "오프라인에서 작업"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution은 온라인 상태입니다.  오프라인 상태로 작업하려면 이 단추를 "
-"누르십시오."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution은 오프라인 상태로 가는 중입니다."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution은 오프라인 상태입니다.  온라인 상태로 작업하려면 이 단추를 "
-"누르십시오."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"경고: 버전 %d.%d.%d에서 모든 데이터를 업그레이드하지 못했습니다.\n"
-"데이터는 지워지지 않았지만, 이 버전의 Evolution에서는 안 보일 것입니다.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "인자가 잘못되었습니다"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "OAF에 등록할 수 없습니다"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "설정 데이터베이스를 찾을 수 없습니다"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "일반 오류"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "확인란"
@@ -16382,6 +16937,43 @@ msgstr "사용중인 연결"
 msgid "Click OK to close these connections and go offline"
 msgstr "연결을 끊고 오프라인으로 가려면 확인을 누르십시오"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "달력(_A):"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "연락처:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "메일(_M):"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "작업(_T):"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "폴더 종류(_T):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "다른 사용자의 폴더 열기"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "계정(_A):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "폴더 이름(_F):"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "사용자(_U):"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 설정 도우미"
@@ -16423,6 +17015,18 @@ msgstr ""
 "\n"
 "이 설정을 저장하려면 \"적용\" 단추를 누르십시오."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution 쉘"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution 테스트"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution 테스트 컴포넌트"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Evolution으로 파일을 가져오실려면 \"가져오기\"를 누르십시오."
@@ -16482,13 +17086,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "다음 파일들을 Evolution으로 가져올 수 있습니다:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16516,57 +17120,48 @@ msgstr ""
 "우리가 열심히 일한 결과물을 잘 써 주시길 바랍니다. 그리고 개발에 기여해\n"
 "주시기를 목이 빠지게 기다리겠습니다!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "고맙습니다\n"
 "Ximian Evolution 팀\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "다시 물어보지 않습니다"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ximian Evolution 쉘에 접근할 수 없습니다."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolution 쉘을 초기화 할 수 없습니다: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution 시작할 때 특정 컴포넌트를 활성화합니다"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "오프라인 모드에서 시작"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "온라인 모드에서 시작"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "강제로 모든 Evolution 컴포넌트를 끝냅니다"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "강제로 Evolution 1.4에서 다시 옮겨 옵니다"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "모든 컴포넌트의 디버깅 출력을 파일로 보냅니다."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16575,13 +17170,79 @@ msgstr ""
 "%s: --online과 --offline은 같이 쓸 수 없습니다\n"
 "  자세한 정보를 %s --help를 실행하십시오.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "연결중"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ximian Evolution 쉘에 접근할 수 없습니다."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution 계정 도우미"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "가져올 인증서를 선택하십시오..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "인증서 이름"
 
@@ -16813,11 +17474,6 @@ msgstr "다음 사람들은 확인할 수 있는 인증서가 있습니다:"
 msgid "Your Certificates"
 msgstr "내 인증서"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "인증서가 이미 있습니다"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y/%m/%d"
@@ -17008,6 +17664,11 @@ msgstr "소유자 고유 ID"
 msgid "Certificate Signature Value"
 msgstr "인증서 서명 값"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "인증서가 이미 있습니다"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 파일 열쇠글"
@@ -17047,12 +17708,12 @@ msgstr "메세지의 제목 기본값."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s'을(를) 실행할 수 없습니다: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) 프로그램을 강제로 종료하는 중입니다\n"
@@ -17116,7 +17777,8 @@ msgid "Select all contacts"
 msgstr "모든 연락처 선택"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "선택한 연락처로 메세지를 보냅니다."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17147,8 +17809,8 @@ msgstr "현재 연락처를 봅니다"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "실행(_A)"
@@ -17166,7 +17828,8 @@ msgid "_Preview Pane"
 msgstr "미리 보기 창(_P)"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "VCard로 저장(_S)"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17294,10 +17957,20 @@ msgstr "현재 약속을 봅니다"
 msgid "Week"
 msgstr "한주씩"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "근무 주"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "약속 열기(_O)"
 
+#: 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 "닫기(_L)"
+
 #: 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
@@ -17618,6 +18291,16 @@ msgstr "선택 반전(_I)"
 msgid "_Threaded Message List"
 msgstr "연관된 메세지 목록(_T)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "닫기(_C)"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "보낸 사람을 주소록에 더하기(_D)"
@@ -17855,7 +18538,8 @@ msgid "Open the selected message in a new window"
 msgstr "선택한 메세지를 새 창에서 엽니다"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "선택한 메세지를 다시 보내기 위해 메일 작성기에서 엽니다"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17973,58 +18657,46 @@ msgstr "제목에 대한 가상폴더(_S)..."
 msgid "_Attached"
 msgstr "첨부(_A)"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "폴더로 복사(_C)"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "메시지로부터 거르게 만들기(_C)"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "이동(_G)"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "포함(_I)"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "크게(_L)"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "메세지 표시(_M)"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "폴더로 이동(_M)"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "다음 메세지(_N)"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "보통으로 표시(_N)"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "메세지 열기(_O)"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "이전 메세지(_P)"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "인용(_Q)"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "다시 보냄(_R)..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "도구(_T)"
@@ -18033,16 +18705,6 @@ msgstr "도구(_T)"
 msgid "_Undelete"
 msgstr "되살리기(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "닫기(_C)"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "첨부"
@@ -18433,6 +19095,11 @@ msgstr "간단한 참조 문서(_Q)"
 msgid "_Send / Receive"
 msgstr "보내고 받기(_S)"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "창(_W)"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "회사순(_C)"
@@ -18500,10 +19167,6 @@ msgstr "마감 날짜(_D):"
 msgid "With _Status"
 msgstr "상태 설정"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "작업(_T)"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18661,6 +19324,35 @@ msgstr "그 외..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution 메일"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "모임 정보"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution 테스트"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "임시 보관함의 메세지를 보냅니다"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "확장됨"
@@ -18774,6 +19466,35 @@ msgstr "텍스트"
 msgid "Find _Now"
 msgstr "지금 찾기(_N)"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"이 파일을 덮어 쓰시겠습니까?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"`%s'에 저장할 수 없습니다\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"`%s'에 저장할 수 없습니다\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18784,6 +19505,155 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 완료)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution 주소록 폴더 뷰"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "주소 _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "블로그"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution 달력 보기"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution 작업 보기"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "gnome-vfs를 초기화 할 수 없습니다"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "`%s'에 있는 폴더를 열 수가 없습니다"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "달력에 보여줄 URI"
+
+#~ msgid "The type of view to show"
+#~ msgstr "보여줄 뷰의 종류"
+
+#~ msgid "Display a message"
+#~ msgstr "메세지 표시"
+
+#~ msgid "Alerts"
+#~ msgstr "알림"
+
+#~ msgid "Time"
+#~ msgstr "시간"
+
+#~ msgid "_General"
+#~ msgstr "일반(_G)"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "가져오기 선택"
+
+#~ msgid "calendar"
+#~ msgstr "달력"
+
+#~ msgid "task list"
+#~ msgstr "작업 목록"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "달력 파일을 업데이트할 수 없습니다!\n"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "다음에 대한 작업 벡엔드가 비정상적으로 죽었습니다:\n"
+#~ "%s"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "보여줄 작업 폴더의 URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "`%s'의 작업을 읽어들일 수 없습니다"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution 메일 폴더 보기"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "쓰레드에 가상폴더"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "쓰레드에 거르게"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "POP3 UID 캐시를 옮기는 데 실패했습니다: %s"
+
+# folder expand state?
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "폴더 상태를 옮기는 데 실패했습니다: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "`%s'에 쓸 저장고를 여는 데 실패했습니다: %s"
+
+# Secret Option
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "ㅂ1ㅁ12 0ㅗㅂ^ㅕL"
+
+# Secret Option
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "ㅂ1ㅁ12 0ㅗㅂ^ㅕL."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "뷰가 표시할 메일 소스의 URI"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "기본 바로가기 그룹"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "바로가기 모음 창의 기본 너비"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "기본 달력 폴더에 대한 경로"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "기본 연락처 폴더에 대한 경로"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "기본 메일 폴더에 대한 경로"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "기본 작업 폴더에 대한 경로"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "기본 달력 폴더의 물리적인 URI"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "기본 연락처 폴더의 URI"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "기본 메일 폴더의 URI"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "기본 작업 폴더의 물리적인 URI"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "폴더 모음을 보여줄 것인지 여부"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "바로가기 모음을 보여줄 것인지 여부"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "경고: 버전 %d.%d.%d에서 모든 데이터를 업그레이드하지 못했습니다.\n"
+#~ "데이터는 지워지지 않았지만, 이 버전의 Evolution에서는 안 보일 것입니다.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ximian Evolution 쉘을 초기화 할 수 없습니다: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "다시 보냄(_R)..."
+
 #~ msgid "Address Book Creation Assistant"
 #~ msgstr "주소록 만들기 도우미"
 
@@ -18805,9 +19675,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Group:"
 #~ msgstr "그룹:"
 
-#~ msgid "New Address Book"
-#~ msgstr "새 주소록"
-
 #~ msgid ""
 #~ "Now, you must specify how you want to connect to the LDAP server. The SSL "
 #~ "(Secure Sockets Layer)\n"
@@ -18940,13 +19807,6 @@ msgstr "%s (%d%% 완료)"
 #~ " %s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "파일 디스크립터를 복사할 수가 없습니다: %s\n"
-#~ " %s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19050,9 +19910,6 @@ msgstr "%s (%d%% 완료)"
 #~ "\n"
 #~ "정말로 이 메세지들을 지우시겠습니까?"
 
-#~ msgid "The following filter rule(s):\n"
-#~ msgstr "다음 거르게 규칙:\n"
-
 #~ msgid ""
 #~ "Used the removed folder:\n"
 #~ "    '%s'\n"
@@ -19068,10 +19925,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Trying to edit a vfolder '%s' which doesn't exist."
 #~ msgstr "없는 가상 폴더 '%s'을(를) 편집하려 합니다."
 
-#~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr "'%s' 주소록을 지우게 됩니다. 정말로 계속 하시겠습니까?"
-
 #, fuzzy
 #~ msgid "New Addressbook Book"
 #~ msgstr "새 주소록"
@@ -19139,9 +19992,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "S_pouse:"
 #~ msgstr "배우자(_P):"
 
-#~ msgid "_Add"
-#~ msgstr "더하기(_A)"
-
 #~ msgid "_Categories..."
 #~ msgstr "분류(_C)..."
 
@@ -19245,18 +20095,6 @@ msgstr "%s (%d%% 완료)"
 #~ "원격 위치에 저장된 그룹에 폴더를 만듭니다. 이렇게 하려면 몇 가지\n"
 #~ "조건을 더 지정해야 합니다."
 
-#~ msgid "Start Date:"
-#~ msgstr "시작 날짜:"
-
-#~ msgid "Due Date:"
-#~ msgstr "마감 날짜:"
-
-#~ msgid "Priority:"
-#~ msgstr "우선 순위:"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "%s의 열쇠글을 입력하십시오"
-
 #~ msgid "New task list"
 #~ msgstr "새 작업 목록"
 
@@ -19317,30 +20155,6 @@ msgstr "%s (%d%% 완료)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "명시된 공유 폴더를 찾을 수 없습니다."
 
-#~ msgid "C_alendar:"
-#~ msgstr "달력(_A):"
-
-#~ msgid "_Mail:"
-#~ msgstr "메일(_M):"
-
-#~ msgid "_Tasks:"
-#~ msgstr "작업(_T):"
-
-#~ msgid "Folder _type:"
-#~ msgstr "폴더 종류(_T):"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "다른 사용자의 폴더 열기"
-
-#~ msgid "_Account:"
-#~ msgstr "계정(_A):"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "폴더 이름(_F):"
-
-#~ msgid "_User:"
-#~ msgstr "사용자(_U):"
-
 #~ msgid "Create a new window"
 #~ msgstr "새 창을 만듭니다"
 
diff --git a/po/lt.po b/po/lt.po
index d101341ec7..2ca66a2cc6 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -25,6 +25,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Adresų Knyga"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktai: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution Aliarmas"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -49,16 +59,6 @@ msgstr "kortelės"
 msgid " card"
 msgstr "kortelės"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontaktai: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution Aliarmas"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Įprastas Sinchronizavimo Adresas:"
@@ -73,63 +73,20 @@ msgstr "Nepavyko įkelti adresų knygos"
 msgid "Could not read pilot's Address application block"
 msgstr "Nepavyko perskaityti piloto Address programos bloko"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Savaiminis pabaigimas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikatai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Nustatykite automatinį užbaigimą čia"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontaktai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Adresų Knyga"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Adresų Knygos iššokantis langas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Adresų knygos adresų vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Adresų Knygos kortelių vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Adresų Knygos komponentas"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Adresų Knygos aplankų vaizduoklė"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Sertifikatų Valdymo Nuostatos"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Susisiekiama su LDAP serveriu anonimiškai"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution aplankų nustatymų valdymas"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Autorizacija nepavyko.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Valdykite Jūsų S/Mime sertifikatus čia"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -170,41 +127,45 @@ msgstr "_Kontaktai:"
 msgid "Create a new contacts group"
 msgstr "Sukurti naują trumpių grupę"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Klaida gaunant schemų informaciją"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Perkeliama..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Perkeliamas „%s“:"
@@ -212,8 +173,8 @@ msgstr "Perkeliamas „%s“:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Šiame Kompiuteryje"
 
@@ -221,7 +182,7 @@ msgstr "Šiame Kompiuteryje"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Asmeninis"
@@ -288,20 +249,43 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Susisiekiama su LDAP serveriu anonimiškai"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Autorizacija nepavyko.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Nauja Adresų Knyga"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sĮveskite %s slaptažodį (vartotojo vardas %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -324,6 +308,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Aplanko adresas paskutinį kartą panaudotas vardų pasirinkimo dialoge"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Savaiminis pabaigimas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontaktai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikatai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Nustatykite automatinį užbaigimą čia"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Adresų Knyga"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Adresų Knygos iššokantis langas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Adresų knygos adresų vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Adresų Knygos kortelių vaizduoklė"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Adresų Knygos komponentas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Sertifikatų Valdymo Nuostatos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution aplankų nustatymų valdymas"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -345,6 +384,7 @@ msgstr "  _Rodyti Palaikomas Bazes "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -417,7 +457,7 @@ msgstr "_Kontaktai:"
 msgid "Address Book Properties"
 msgstr "Adresų knygelės savybės"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Visada"
@@ -432,107 +472,97 @@ msgid "Basic"
 msgstr "Esmė"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Spalv_os"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Jungiamasi"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Skirtinis _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Skirtinis _vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Palaikomos Paieškos Bazės"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Esmė"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Niekada"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "One"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Pasirink spalvą"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Pai_eškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Pai_eškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Ieškoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -542,7 +572,7 @@ msgstr ""
 "serverio tik tuo atveju,\n"
 "jei LDAP serveris palaikys SSL arba TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -560,7 +590,7 @@ msgstr ""
 "nes Jūsų jungtis\n"
 "yra apsaugota nuo išorinių įsilaužėlių."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -573,19 +603,19 @@ msgstr ""
 "kad Jūsų jungtis nebus apsaugota ir Jums gresia duomenų ar jungties "
 "perėmimas. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Palaikomos Paieškos Bazės"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -597,7 +627,7 @@ msgstr ""
 "paieškos. Neužpildžius šios reikšmės paieška bus vykdoma nuo katalogo "
 "pradžios."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -612,7 +642,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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -620,7 +650,7 @@ msgstr ""
 "Čia nurodomas pilnas Jūsų LDAP serverio vardas. Pavyzdžiui „ldap.example."
 "com“."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -630,7 +660,7 @@ 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:63
+#: 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 "
@@ -640,7 +670,7 @@ msgstr ""
 "pasinaudoti „El. pašto adreso“ metodu būtinas anoniminis prisijungimas prie "
 "Jūsų LDAP serverio."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -649,7 +679,7 @@ msgstr ""
 "Šis vardas bus priskirtas serveriui Evolution aplankų sąraše.\n"
 "Jis skirtas tiktai vaizdavimui."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -660,128 +690,135 @@ msgstr ""
 "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:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Laiko formatas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "Naudoti _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Naudojamas skirtinis vardas (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Naudojamas el. pašto adresas"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kai tik imanoma"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktai:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Leistinas atsiuntimo greitis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "El. pašto adresas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Prisijungimo metodas"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Prievadas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Svarbumas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Paieškos sritis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Serverio vardas:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erveris:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Pauzės riba (minutėmis):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Na_udoti saugią jungtį (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kortelės"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "jungties-kortelė"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "bendrinė-kortelė"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minučių"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "paieškos-kortelė"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Adresų Knygos vardų pasirinkimo sąsaja"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Pašalinti visus"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Pašalinti"
 
+#: 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 "Vardas"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Pašalinti visus"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Peržiūrėti kontaktų sąrašą"
@@ -804,22 +841,15 @@ msgstr "Pridėti prie kontaktų"
 msgid "Unnamed Contact"
 msgstr "Bevardis kontaktas"
 
-#: 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
-msgid "Name"
-msgstr "Vardas"
-
 #: 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
 msgid "Source"
 msgstr "Šaltinis"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Adresų Knygos vardų pasirinkimo sąsaja"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -887,143 +917,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresas _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Jubiliejus:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistento"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Gimtadienis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Žurnalas"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendorius:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Miestas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Komanda:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktų redaktorius"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Valst_ybė:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Padalinys:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Laisvas-užsiėmęs URL"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Pil_nas vardas..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Namų"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "El. pašto adresas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Vadybininkas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Slapyvardis:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Pas_tabos:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: 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:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Kitas"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_PO Box:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1051,9 +1081,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Darbinis"
@@ -1086,23 +1116,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ar Jūs tikrai norite\n"
+"ištrinti šiuos kontaktus?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ar tu tikrai nori\n"
+"ištrinti šį kontaktą?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Taisomas"
 
@@ -2074,95 +2120,113 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabvė"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Skubios žinutės"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Paslauga"
-
-#: 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 "Vieta:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Vartotojo _vardas:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Pradinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Tikslinė Knyga"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Tai Naujas Kontaktas"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Keičiami Laukai"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Pakeista"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontaktas priklauso šioms kategorijoms:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nigeris"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Žemiau nurodytos jungtys šiuo metu yra aktyvios:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Skubios žinutės"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Paslauga"
+
+#: 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 "Vieta:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Vartotojo _vardas:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakto greitas pridėjimas"
@@ -2180,22 +2244,6 @@ msgstr "_Pilnas vardas:"
 msgid "E-_mail:"
 msgstr "El. paštas"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ar Jūs tikrai norite\n"
-"ištrinti šiuos kontaktus?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ar tu tikrai nori\n"
-"ištrinti šį kontaktą?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresas _2:"
@@ -2346,8 +2394,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knyga"
 
@@ -2408,6 +2456,442 @@ 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
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Parodyti Sąrašą"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "El. paštas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizacija"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Aprašymas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupė"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+#, fuzzy
+msgid "Video Conferencing"
+msgstr "_Vaizdo Konferencijų Adresas:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Automobilio telefonas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Darbinis"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Žurnalas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobilus telefonas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Asmeninis"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Pastaba"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Pareigos"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "El. paštas"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Namų puslapis"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Sėkmė"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Saugykla atsijungta"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Priėjimas uždraustas"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kontaktas nerastas"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+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
+msgid "Protocol not supported"
+msgstr "Protokolas nepalaikomas"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Nutraukta"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nepavyko atidaryti „%s“: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Autentikacija Nepavyko"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Būtina Autentifikacija"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Nėra tokio laiško"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Kita klaida"
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+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 ""
+"Š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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Užklausa pateikė daugiau atsakymų nei serveriui ar Evolution\n"
+"yra leista pateikti. Sukonkretinkite vykdomą paiešką arba \n"
+"padidinkite išvedamų atsakymų kiekio apribojimus tarp šios\n"
+"adresų knygos katalogo serverio nustatymų."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Užklausa užtruko ilgiau nei nustatyta serverio ar adresų knygos \n"
+"apribojimuose. Sukonkretinkite vykdomos paieškos kriterijus arba\n"
+"padidinkite laiko ribas nustatytas šios adresų knygos katalogo\n"
+"serverio nustatymuose."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Klaida įtraukiant kontaktą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Klaida modifikuojant sąrašą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Klaida keičiant kontaktą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Klaida šalinant kontaktą"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s jau egzistuoja.\n"
+"Ar nori įrašyti vietoj jo?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "kortele.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "sąrašas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Perkelti kontaktą į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Nukopijuoti kontaktą į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Perkelti kontaktus į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Nukopijuoti kontaktus į"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Keletas VCard kortelių"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VCard"
+
+#.
+#. * 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 "(jokio)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Pagrindinis el. paštas"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "El. paštas 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "El. paštas 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Pasirink veiksmą"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Sukurti naują kontaktą „%s“"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Pridėti adresą prie esančio kontakto „%s“"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Užklausiama adresų knygelė..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Keisti kontakto informaciją"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Įlieti el. pašto adresą"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "ir likusį kontaktą."
+msgstr[1] "ir likusį kontaktą."
+msgstr[2] "ir likusį kontaktą."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Rodyti Visą VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Rodyti Paprastą VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Išsaugoti adresų knygelėje"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nėra kontaktų"
@@ -2423,8 +2907,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Užklausa"
 
@@ -2479,9 +2963,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Išsaugoti kaip VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2549,7 +3034,7 @@ msgid "Cut"
 msgstr "Iškirpti"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2560,18 +3045,8 @@ msgstr "Kopijuoti"
 msgid "Paste"
 msgstr "Įdėti"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Ištrinti"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Esamas vaizdas"
 
@@ -2587,7 +3062,7 @@ msgstr ""
 "darbas. Jums teks paleisti Evolution iš naujo tam, kad pasinaudoti ja vėl"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Bet kuri kategorija"
@@ -2628,21 +3103,6 @@ msgstr "Kategorijos"
 msgid "Company Phone"
 msgstr "Kompanijos telefonas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "El. paštas"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "El. paštas 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "El. paštas 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Pavardė"
@@ -2679,29 +3139,14 @@ msgstr "Žurnalas"
 msgid "Manager"
 msgstr "Vadybininkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobilus telefonas"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Pravardė"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Pastaba"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofisas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizacija"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Kitas faksas"
@@ -2753,21 +3198,29 @@ msgstr "Vienetas"
 msgid "Web Site"
 msgstr "Tinklapis"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Plotis"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Aukštis"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Turi Fokusavimą"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Parinkta"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Turi Žymeklį"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Laukas"
@@ -2784,10 +3237,6 @@ msgstr "Text Modelis"
 msgid "Max field name length"
 msgstr "Didžiausias lauko vardo ilgis"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Stulpelio plotis"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2816,416 +3265,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapteris"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Parinkta"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Turi Žymeklį"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Parodyti Sąrašą"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "El. paštas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Aprašymas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupė"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-#, fuzzy
-msgid "Video Conferencing"
-msgstr "_Vaizdo Konferencijų Adresas:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Automobilio telefonas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Darbinis"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Žurnalas"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Asmeninis"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Pareigos"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Namų puslapis"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Sėkmė"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Saugykla atsijungta"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adresų Knyga neegzistuoja"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Priėjimas uždraustas"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kontaktas nerastas"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Toks kontakto ID jau naudojamas"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokolas nepalaikomas"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Nutraukta"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nepavyko atidaryti „%s“: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Autentikacija Nepavyko"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Būtina Autentifikacija"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nėra tokio laiško"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Kita klaida"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-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 ""
-"Š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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Negaliu atidaryti adresų knygelės"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Užklausa pateikė daugiau atsakymų nei serveriui ar Evolution\n"
-"yra leista pateikti. Sukonkretinkite vykdomą paiešką arba \n"
-"padidinkite išvedamų atsakymų kiekio apribojimus tarp šios\n"
-"adresų knygos katalogo serverio nustatymų."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Užklausa užtruko ilgiau nei nustatyta serverio ar adresų knygos \n"
-"apribojimuose. Sukonkretinkite vykdomos paieškos kriterijus arba\n"
-"padidinkite laiko ribas nustatytas šios adresų knygos katalogo\n"
-"serverio nustatymuose."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Ši užklausa nesibaigė sėkmingai."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Ar nori išsaugoti pakeitimus?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Atsikratyti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Klaida pridedant sąrašą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Klaida įtraukiant kontaktą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Klaida modifikuojant sąrašą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Klaida keičiant kontaktą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Klaida pašalinant sąrašą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Klaida šalinant kontaktą"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s jau egzistuoja.\n"
-"Ar nori įrašyti vietoj jo?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Perrašyti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "kortele.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "sąrašas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Perkelti kontaktą į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Nukopijuoti kontaktą į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Perkelti kontaktus į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Nukopijuoti kontaktus į"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Pasirinkti Kontaktus iš Adresų Knygos"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Keletas VCard kortelių"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VCard"
-
-#.
-#. * 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 "(jokio)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Pagrindinis el. paštas"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Pasirink veiksmą"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Sukurti naują kontaktą „%s“"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Pridėti adresą prie esančio kontakto „%s“"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Užklausiama adresų knygelė..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Keisti kontakto informaciją"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Įlieti el. pašto adresą"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "ir likusį kontaktą."
-msgstr[1] "ir likusį kontaktą."
-msgstr[2] "ir likusį kontaktą."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Rodyti Visą VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Rodyti Paprastą VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Išsaugoti adresų knygelėje"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Stulpelio plotis"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3272,11 +3314,6 @@ msgstr "Evolution vCalendar importas"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Spausdinti voką"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Spausdinti kontaktus"
@@ -3286,6 +3323,11 @@ msgstr "Spausdinti kontaktus"
 msgid "Print contact"
 msgstr "Spausdinti kontaktą"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Spausdinti voką"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3471,16 +3513,6 @@ msgstr "Kontaktų Spausdinimo Testas"
 msgid "This should test the contact print code"
 msgstr "Čia turi būti patikrintas kontaktų spausdinimo kodas"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Nurodykite išvedimo bylą naudojamą vietoj standartinio išvedimo"
@@ -3539,6 +3571,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Klaida įkeliant standartinę adresų knygą."
@@ -3551,11 +3593,12 @@ msgstr "Įvedimo byla"
 msgid "No filename provided."
 msgstr "Nenurodytas bylos vardas."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Bevardis Sąrašas"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
 
@@ -3587,120 +3630,57 @@ msgstr "Įprastas prioritetas:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Negalėjau perskaityti piloto ToDo programos bloko"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendorius ir Užduotys"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendoriai"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Čia galima nustatyti savo laiko juostą, Kalendorių bei Užduočių Sąrašą "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Kalendorius ir Užduotys"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Kalendoriaus konfigūravimo priemonė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Kalendoriaus žinučių grafiko vaizduoklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Kalendoriaus vaizduoklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Kalendoriaus/Užduočių redaktorius"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Užduočių vaizduoklė"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution Kalendoriaus komponentas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution Užduočių komponentas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Užduotys"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Kalendoriaus Aliarmo pranešimo tarnyba"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pradžia:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Pabaiga:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution Aliarmas"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Perspėti %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Uždaryti"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Už_tildyti"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Užtildymo laikas (minutėmis)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "K_eisti įvykį"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Už_tildyti"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Atidaryti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 #, fuzzy
 msgid "Dismiss"
 msgstr "A_tšaukti"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 #, fuzzy
 msgid "Dismiss All"
 msgstr "_Atšaukti Visus"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nėra jokios aprašymo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3713,12 +3693,12 @@ msgstr ""
 "Prasideda %s\n"
 "Baigiasi %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Įspėjimas"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3730,7 +3710,7 @@ msgstr ""
 "siųstų laišką.  Evolution vietoj to parodys normalų\n"
 "užuominos dialogą."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3747,19 +3727,19 @@ msgstr ""
 "\n"
 "Ar Jūs esate tikras, kad ši komanda turi būti paleista?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Kitą kartą nebeklausti apie šią programą."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Kalendoriaus Aliarmo pranešimo tarnyba"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Negalėjau inicializuoti Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Negalėjau inicializuoti gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nepavyko sukurti aliarmo pranešimų tarnybos gamyklos"
 
@@ -3868,59 +3848,44 @@ msgid "Weekday the week starts on"
 msgstr "Savaitės pradžios diena yra"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Ar rašyti patvirtinimo trinant paskyrimus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Ar prašyti patvirtinimo trinant aplankus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Ar nerodyti baigtų užduočių"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Ar nustatyti įprastą įvykių priminimą"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 "Ar laikas turi būti rodomas 24 valandų formate vietoj 12 valandų am/pm "
 "formato"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Ar rodyti savaičių numerius datos navigatoriuje"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Santrauka turi savyje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Aprašymas turi savyje"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentaras turi savyje"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Aprašymas turi savyje"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Netinkantys"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendorius"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3929,118 +3894,128 @@ msgstr ""
 "Šis veiksmas galutinai sunaikins visus įvykius, senesnius nei nurodytas "
 "laiko terminas. Jei Jūs tęsite toliau, Jūs nebegalėsite atkurti tų įvykių."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Ištrinti įvykius senesnius nei"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dienų"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A, %Y m. %B %d d."
 
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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, %b %d"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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, %Y %b %d"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%Y m. %B %d d."
 
 #. 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:464
+#: 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 "%B %d"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Bus pašalintas kalendorius „%s“. Ar Jūs tikrai norite taip pasielgti?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Naujas Kalendorius"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Savybės..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Įkeliamas kalendorius..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Nepavyko atverti kalendoriaus „%s“ įvykių bei susitikimų įrašymui"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nėra sukurta kalendoriaus naudojamo įvykių bei susitikimų saugojimui"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalendoriai"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Naujas paskyrimas"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "P_askyrimas"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Sukurti naują įvykį"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Naujas susitikimas"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Susitikimas"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Sukurti naują susitikimo užklausimą"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Nauji visos dienos paskyrimai"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Visos dienos praskyrimai"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Sukurti naują visos dienos paskyrimą"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Naujas kalendorius"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alendorius"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Sukurti naują kalendorių"
 
@@ -4070,15 +4045,36 @@ msgstr "Savaitės rodinys"
 msgid "Month View"
 msgstr "Mėnesio rodinys"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Santrauka turi savyje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Aprašymas turi savyje"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentaras turi savyje"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Aprašymas turi savyje"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Netinkantys"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Klaida atidarant kalendorių"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Atidarant kalendorių naudojamas nepalaikomas metodas"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Turimos priėjimo teisės neleidžia atidaryti kalendoriaus"
 
@@ -4087,19 +4083,6 @@ msgstr "Turimos priėjimo teisės neleidžia atidaryti kalendoriaus"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nepavyko atidaryti aplanko tarp „%s“"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, kurį rodys kalendorius"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Naudojamas rodynio tipas"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Perspėjimų garsu parinktys"
@@ -4165,7 +4148,7 @@ msgstr "papildomai kiekvieną"
 msgid "hours"
 msgstr "valandų"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Veiksmas/Jungiklis"
 
@@ -4184,14 +4167,14 @@ msgstr "Pagrindai"
 msgid "Date/Time:"
 msgstr "Data/Laikas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Rodyti pranešimą"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Groti garsą"
 
+#: 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 "Priminėjai"
@@ -4206,6 +4189,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
 msgid "Summary:"
 msgstr "Apžvalga:"
@@ -4244,10 +4228,106 @@ msgstr "minutę(es)"
 msgid "start of appointment"
 msgstr "įvykio pradžią"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupė „%s“ yra nutolusi. Jūs turi nurodyti vietą, iš kurios reikia paimti "
+"kalendorių"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Sukurti Naują Kalendorių"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Užduočių Sąrašo Grupė"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Sukurti Naują Kalendorių"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tipas:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "savaičių"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Įjungta"
 
@@ -4263,19 +4343,19 @@ msgstr "Neimportuoti"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Išjungti"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Įjungti"
 
@@ -4300,162 +4380,174 @@ msgid "60 minutes"
 msgstr "60 minučių"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Perspėjimai"
+msgid "<b>Alerts</b>"
+msgstr "<b>Perspėjimai</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Priminimai</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Užduočių Sąrašas</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Laikas</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Darbo Savaitė</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendoriaus ir užduočių nuostatos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Spalva šiandienos užduotims"
 
-#: 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 "Spalva vėluojamoms užduotims"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Diena baigiasi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dienų"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Vaiz_davimas"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Įju_ngti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Penktadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Valandų"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minučių"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Pirmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "S_ek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Šeštadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "R_odyti priminimą"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Rodyti savaičių _numerius datos navigatoriuje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Sekmadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Ši_andienos užduotis:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Ket"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Užduočių sąrašas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Ketvirtadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Laikas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Laiko _juosta:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Laiko formatas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Antradienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Savaitė prasideda:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Trečiadienis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Darbo savaitė"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Darbo dienos:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 valandų (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 valandų"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Pridėti URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "P_aprašyti patvirtinimo trinant elementus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Suspausti savaitgalius mėnesio rodinyje"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Diena prasideda:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "Vaiz_davimas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4465,141 +4557,46 @@ msgstr "Vaiz_davimas"
 msgid "_Edit"
 msgstr "K_eisti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "Pe_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Esmė"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Paslėpti užbaigtas užduotis po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Praleistos užduotys:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "Š_eš"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Rodyti pa_skyrimų pabaigos laikus savaitės ir mėnesio rodiniuose"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Laiko a_tkarpos:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Ant"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "prieš kiekvieną paskyrimą"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Šaltinio adreso „%s“ formatas yra nepriimtinas."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupė „%s“ yra nutolusi. Jūs turi nurodyti vietą, iš kurios reikia paimti "
-"kalendorių"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Sukurti Naują Kalendorių"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Užduočių Sąrašo Grupė"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendoriaus Savybės"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Sukurti Naują Kalendorių"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tipas:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "savaičių"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4680,80 +4677,80 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Tu nieko nepakeitei, atnaujinti redaktorių?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Tikrinimo klaida: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " iki "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Užbaigta "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Užbaigta "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Iki "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Iki"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nepavyko atnaujinti objekto"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Keisti įvykį"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Užduotis -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnalo įrašas -- %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nėra apžvalgos"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Išsaugoti kaip..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Pakeitimai padaryti šiame punkte bus prarasti, jei atsiras atnaujinimai"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Nepavyko paleisti turimos versijos!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Tikrinimo klaida: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " iki "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Užbaigta "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Užbaigta "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Iki "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Iki"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4879,27 +4876,27 @@ msgstr "Pavesti kam:"
 msgid "Enter Delegate"
 msgstr "Įvesti, kam pavedama"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Įvykis"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Užuomina"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Pasikartojimas"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Dienotvarkė"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Susitikimas"
 
@@ -4912,7 +4909,7 @@ msgstr "Galutinis terminas yra anksčiau už pradžią!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Klaidinga pradžios data"
 
@@ -4998,10 +4995,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5020,15 +5017,15 @@ msgstr "Organizatorius yra būtinas."
 msgid "At least one attendee is required."
 msgstr "Būtinas bent vienas dalyvis."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Pavesti kam..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5299,27 +5296,19 @@ msgstr "_Atsikratyti Pakeitimų"
 msgid "Save Event"
 msgstr "Išsaugoti Įvykį"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Pasirink importavimo komponentą"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Nurodykite galutinį dokumentą"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalendorius"
+msgid "_Destination"
+msgstr "Juodraščių _aplankas:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Naujas užduočių sąrašas"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+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?"
@@ -5347,38 +5336,44 @@ msgid "% _Complete"
 msgstr "% _Baigta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Užbaigta"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Aukštas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Vykdoma"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Žemas"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normalus"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nepradėta"
 
@@ -5414,11 +5409,11 @@ msgstr "_Tinklalapis:"
 msgid "Assignment"
 msgstr "Priskyrimas"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Galutinio termino data klaidinga"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nepavyko atverti „%s“ užduočių."
@@ -5427,8 +5422,9 @@ msgstr "Nepavyko atverti „%s“ užduočių."
 msgid "Con_fidential"
 msgstr "S_laptas"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Aprašymas:"
@@ -5588,102 +5584,53 @@ msgstr "%s tarp %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s yra skirtas nežinomam daviklio tipui"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Viešas"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Asmeniškas"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Slaptas"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Data"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Pradžios data"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Apžvalga"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Laisvas"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Užimtas"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Š"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Paspauskite, kad atidaryti %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "P"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Bevardė"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "R"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Pradžios data:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Kada reikia:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografinė vietovė turi būti įvesta formatu:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Būsena:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioritetas:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Tinklalapis:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nežinomas"
+#: 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 "Viešas"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Pasikartojantis"
+#: 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 "Asmeniškas"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Priskirtas"
+#: 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 "Slaptas"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5729,17 +5676,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Laisvas"
+
+#: 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 "Užimtas"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Trinami pasirinkti objektai"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "Ati_daryti"
 
@@ -5748,41 +5704,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Į_dėti"
 
@@ -5840,78 +5797,158 @@ msgstr "Svarbumas"
 msgid "Start date"
 msgstr "Pradžios data"
 
+#: 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 "Apžvalga"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Užduočių rikiavimas"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Naujas į_vykis..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Naujas visos _dienos įvykis"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Naujas Susitikimas"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Pažymėti _giją"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Pa_srinkite..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Skelbti laisvas/užimtas informaciją"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopijuoti į aplanką..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Perkelti į Aplanką..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Suplanuoti Susitikimą..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Persiųsti kaip iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Ištrinti šį _pasitaikymą"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Ištrinti _visus pasitaikymus"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Eiti į šia_ndieną"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Eiti į datą..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Nuo_statos..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Data"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Nežinomas"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Pasikartojantis"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Ne"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Š"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "P"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "R"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: 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 ""
+"Geografinė vietovė turi būti įvesta formatu:\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5935,36 +5972,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minučių padalos"
+#. 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 " "
+
+#. 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 " "
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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, %B %e"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 "%b %d"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr " "
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr " "
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minučių padalos"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6079,10 +6116,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Joks</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Būsena:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6112,7 +6145,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Gerai"
 
@@ -6325,65 +6358,61 @@ msgstr "Priede nėra tvarkingo kalendoriaus pranešimo"
 msgid "The attachment has no viewable calendar items"
 msgstr "Priede nėra peržiūrimų kalendoriaus elementų"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalendoriaus byla negalėjo būti atnaujinta!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Atnaujinimas užbaigtas\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Įvyko CORBA sistemos klaida\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objektas nerastas\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Dalyvio būsena atnaujinta\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Dalyvio būsena negali būti atnaujinta!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Pašalinimas užbaigtas"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Elementas išsiųstas!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Elementas negalėjo būti išsiųstas!\n"
 
@@ -6500,28 +6529,6 @@ msgstr "Pavestas"
 msgid "In Process"
 msgstr "Vykdomas"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %Y m. %B %e"
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 %Y-%m-%d"
-
-#. 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 "%Y-%m-%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Nesu darbe"
@@ -6582,7 +6589,34 @@ msgstr "Susitikimo _pradžios laikas:"
 msgid "Meeting _end time:"
 msgstr "Susitikimo pa_baigos laikas:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %Y m. %B %e"
+
+#. 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 %Y-%m-%d"
+
+#. 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 "%Y-%m-%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Įveskite „%s“ slaptažodį"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6591,21 +6625,19 @@ msgstr ""
 "Klaida tarp %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atidaromos užduotys tarp %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6614,51 +6646,106 @@ msgstr ""
 "Klaida atidarant %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Užbaigiamos užduotys..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Trinami pasirinkti objektai..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Išvaloma"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Užduotys"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Įvykis -- %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Įkeliamos užduotys"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Atidaroma %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Trinama"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendorius ir Užduotys"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Čia galima nustatyti savo laiko juostą, Kalendorių bei Užduočių Sąrašą "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution Kalendorius ir Užduotys"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Kalendoriaus konfigūravimo priemonė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Kalendoriaus žinučių grafiko vaizduoklė"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Kalendoriaus/Užduočių redaktorius"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution Kalendoriaus komponentas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution Užduočių komponentas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendoriai"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Užduotys"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Balandis"
@@ -6806,6 +6893,23 @@ msgstr "Gimtadieniai ir Sukaktuvės"
 msgid "On The Web"
 msgstr "Tinkle"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Nepavyko atidaryti kalendoriaus „%s“."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nepavyko atverti „%s“ užduočių."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1-a"
@@ -7025,7 +7129,7 @@ msgid "Contacts: "
 msgstr "Kontaktai: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Spaudinio peržiūra"
 
@@ -7037,68 +7141,80 @@ msgstr "Spausdinti elementą"
 msgid "Print Setup"
 msgstr "Spausdinimo nuostatos"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Naujas Užduočių sąrašas"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d kontaktai"
+msgstr[1] "%d kontaktai"
+msgstr[2] "%d kontaktai"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Ištrintas"
+msgstr[1] "Ištrintas"
+msgstr[2] "Ištrintas"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Įkeliamos užduotys"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 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:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Užduotis"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Sukurti naują užduotį"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nauja užduotis"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Užduočių Sąrašo Grupė"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Sukurti naują užduotį"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Vaizduojamo užduočių aplanko URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Negalėjau įkelti užduočių į „%s“"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7110,11 +7226,11 @@ msgstr ""
 "\n"
 "Tikrai ištrinti šias užduotis?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Kitą kartą nebeklausti."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Atspausdinti Užduotis"
 
@@ -8763,7 +8879,7 @@ msgstr "Nukopijuoti aplanko turinį į nuosavą kompiuterį darbui neprisijungus
 msgid "Downloading new messages for offline mode"
 msgstr "Atsisiunčiami nauji laiškai darbui atsijungusiame režime"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Aplankas „%s“ ruošiamas atsijungusiam darbui"
@@ -8856,33 +8972,6 @@ msgstr "Netinkami argumentai pateikti tarp (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Klaida vykdant filtro paiešką: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Negaliu išnagrinėti paieškos išraiškos: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Klaida vykdant paieškos išraišką „%s“:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) reikalauja vienintelio loginio rezultato"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Vykdoma užklausa nežinomai antraštei: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8914,7 +9003,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Filtruojami nauji pranešimai"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Negaliu išnagrinėti paieškos išraiškos: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Klaida vykdant paieškos išraišką „%s“:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) reikalauja vienintelio loginio rezultato"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) reikalauja vienintelio loginio rezultato"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) reikalauja vienintelio loginio rezultato"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Vykdoma užklausa nežinomai antraštei: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8925,15 +9059,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepavyko apdoroti gpg userid patarimo."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepavyko apdoroti gpg slaptažodžio užklausos."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8942,29 +9076,29 @@ msgstr ""
 "Jūs turi pateikti slaptažodį, kuris atblokuoja raktą, skirtą\n"
 "vartotojui: „%s“"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Nutraukta."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Nepavyko atblokuoti privataus rakto: tris kartus pateiktas blogas "
 "slaptažodis."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Netikėtas atsakymas iš GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nepavyko užkoduoti: Nenurodyti tinkamo gavėjai."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8975,81 +9109,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG klaida %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nepavyko sukurti parašo duomenų: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Nepavyko paleisti gpg programos: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Nepavyko paleisti gpg programos."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ši laiško dalis yra pasirašyta skaitmeniniu būdu"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Nepavyko patikrinti laiško parašo: Klaidingas laiško formatas"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nepavyko patikrinti laiško parašo: negalima sukurti laikinos bylos: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nepavyko sukurti užkoduojančių duomenų: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Ši laiško dalis yra užkoduota skaitmeniu būdu"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Koduotas turinys"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Nepavyko apdoroti laiško turinio"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nepavyko sukurti rezervuoto pagalbos nukreipimo: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nepavyko paleisti rezervuoto pagalbos proceso: %s"
-
-#: 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 "Nepavyko rezervuoti „%s“: rezervavimo pagalbininko protokolo klaida"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Negalėjau užrakinti '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9070,6 +9184,26 @@ msgstr "Nepavyko gauti užrakto naudojant fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepavyko gauti užrakto naudojant flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nepavyko sukurti rezervuoto pagalbos nukreipimo: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nepavyko paleisti rezervuoto pagalbos proceso: %s"
+
+#: 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 "Nepavyko rezervuoti „%s“: rezervavimo pagalbininko protokolo klaida"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Negalėjau užrakinti '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9324,7 +9458,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Blogas autentikacijos atsakymas iš serverio."
 
@@ -9528,7 +9662,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Kodavimo sertifikatas:"
 
 #: camel/camel-smime-context.c:360
@@ -9545,7 +9679,7 @@ msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Nepavyko įrašyti laiško į „Išsiųstų“ aplanką: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Autorizacija nepavyko.\n"
@@ -9610,98 +9744,98 @@ msgstr "Negalima sukurti aplanko: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Nepavyko gauti laiško %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Sertifikato parašo klaida"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Tvarkingas parašas"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Pasirašė: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Nepavyko IMAP komanda: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Sukur_ti Filtrą pagal Laišką"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Negaliu sukurti aplanko užrakto ant %s: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Nepavyko serveriui nusiųsti vartotojo vardo"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komanda neįgyvendinta"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9718,16 +9852,26 @@ msgstr "Negalima sukurti aplanko: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nepavyko sukurti aplanko: Neleistina šios saugyklos operacija"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Šiukšlės"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Šiukšlės"
@@ -9848,7 +9992,7 @@ msgstr "Raktas nepalaiko sertifikatų pasirašymo"
 msgid "Error in application verification"
 msgstr "Klaida tikrinant programą"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9861,11 +10005,11 @@ msgstr ""
 "Požymis:       %s\n"
 "Parašas:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GERAS"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BLOGAS"
 
@@ -9889,7 +10033,7 @@ msgstr ""
 "Ar vis tiek norite priimti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9904,7 +10048,7 @@ msgstr ""
 "\n"
 "Ar vis tiek norite priimti?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9913,7 +10057,7 @@ msgstr ""
 "Sertifikato problema: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9922,7 +10066,7 @@ msgstr ""
 "Blogas sertifikato domenas: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9931,7 +10075,7 @@ msgstr ""
 "Sertifikatas pasenęs: %s\n"
 "Leidėjas: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9945,17 +10089,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Negalėjau išnagrinėti URL „%s“"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Klaida saugant „%s“: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nėra tokio laiško %s aplanke %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
@@ -9964,11 +10108,6 @@ msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9985,10 +10124,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Tikrinama, ar yra naujų laiškų"
 
 #: 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 "Patikrinti, ar yra naujų laiškų visuose aplankuose"
@@ -10021,6 +10162,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Skirtas pasiekti Novel Groupwise serverius"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10042,26 +10184,323 @@ msgstr ""
 msgid "Checklist"
 msgstr "sąrašas"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Negalėjau gauti aplanko „%s“: %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 "Serveris netikėtai atsijungė: %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 "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Negalėjau gauti aplanko „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Negaliu gauti laiško: %s iš aplanko %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 ""
+"Negaliu gauti laiško: %s iš aplanko %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Negalėjau pridurti laiško prie mh aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Negalėjau pridurti laiško prie mh aplanko: %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 ""
+"Negaliu gauti laiško: %s iš aplanko %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 ""
+"Negaliu gauti laiško: %s iš aplanko %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 ""
+"Negaliu gauti laiško: %s iš aplanko %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 ""
+"Negaliu gauti laiško: %s iš aplanko %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 "Aplankai"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Rodyti tik užsakytus aplankus"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Pakeisti serverio pateiktą aplankų vardų zoną"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Vardų zona"
+
+#: 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 "Pašto skaitymui ir rašymui IMAP serveriuose."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Su šia parinktimi jungiantis prie IMAP serverio bus naudojamas paprasto "
+"teksto slaptažodis."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP tarnyba, skirta %s tarp %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:140
+#: 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 "Negalėjau prisijungti prie %s (prievadas %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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Jungtis nutraukta"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Nežinoma klaida"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nepavyko prisijungti prie POP serverio %s. Nepalaikomas reikiamas "
+"autentifikacijos mechanizmas."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPrašom įvesti SMTP slaptažodį dėl %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Autentifikacija su POP serveriu %s nepavyko: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%c“"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Komanda:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Negaliu ištrinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Negaliu pervadinti aplanko: %s: Bloga operacija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Negalima sukurti aplanko: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Netikėtas atsakymas iš IMAP serverio: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Nepateikta jokių duomenų"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Veiksmas nutrauktas"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris netikėtai atsijungė: %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:1089
-msgid "Unknown error"
-msgstr "Nežinoma klaida"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10106,21 +10545,21 @@ msgstr "Negalėjau sukurti katalogo %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nepavyko įkelti %s santraukos"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Aplankas serveryje buvo sunaikintas ir vėl sukurtas."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Ieškoma pakeistų laiškų"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepavyko gauti laiško: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10136,25 +10575,25 @@ msgstr ""
 "Negaliu gauti laiško: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nėra tokio laiško"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Šis laiškas šiuo metu nepasiekiamas"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Atsiunčiama naujų laiškų santrauka"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Negalėjau rasti laiško teksto FETCH atsakyme"
 
@@ -10193,23 +10632,6 @@ msgstr "Naudoti specialią jungties prie serverio komandą"
 msgid "Command:"
 msgstr "Komanda:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Aplankai"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Rodyti tik užsakytus aplankus"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Pakeisti serverio pateiktą aplankų vardų zoną"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Vardų zona"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Pritaikyti filtrus naujiems laiškams šio serverio INBOX aplanke"
@@ -10232,85 +10654,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP serveris %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP tarnyba, skirta %s tarp %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Negalėjau prisijungti prie %s (prievadas %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nepasiekiamas"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Jungtis nutraukta"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL komunikacijų klaida"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Nepavyko prisijungti naudojant komandą „%s“: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Tu neįvedei slaptažodžio."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10320,25 +10700,18 @@ msgstr ""
 "Negalėjau autentikuotis į IMAP serverį.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nėra tokio aplanko %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Aplanko vardas „%s“ yra neleistinas, kadangi jame yra simbolis „%c“"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10346,7 +10719,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nežinomas aukštesnysis aplankas: %s"
@@ -10456,58 +10829,58 @@ msgstr ""
 "Taip pat gali būti naudojamas skaityti Elm, Pine ar Mutt tipo aplankų "
 "struktūras."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Saugyklos šaknis %s nėra absoliutus kelias"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Saugyklos šaknis %s nėra nėra paprastas katalogas"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Negalėjau gauti aplanko „%s“: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Vietinėse saugyklose nėra inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Vietinė pašto byla %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Negalėjau pervadinti aplanko „%s“ į %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nepavyko pervardinti „%s“: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Negalėjau ištrinti aplanko santraukos bylos „%s“: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Negalėjau ištrinti aplanko indekso bylos „%s“: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10573,7 +10946,7 @@ msgstr "Negalėjau ištrinti aplanko „%s“: %s"
 msgid "not a maildir directory"
 msgstr "ne maildir katalogas"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10906,7 +11279,7 @@ 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:258
+#: 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
@@ -10915,8 +11288,8 @@ msgid "User cancelled"
 msgstr "Operacija nutraukta"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10925,46 +11298,46 @@ msgstr "Operacija nutraukta"
 msgid "Cannot get message %s: %s"
 msgstr "Nepavyko gauti laiško %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Vidinė klaida: uid yra netinkamame formate: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -11081,8 +11454,9 @@ msgid "Could not get group: %s"
 msgstr "Nepavyko gauti grupės: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
-msgstr ""
+#, fuzzy
+msgid "Could not get messages: unspecified error"
+msgstr "Negalėjau išsiųsti laiško: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
@@ -11134,8 +11508,8 @@ msgstr "Nėra laiško su uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Parsiunčiamas POP laiškas %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nežinomas priežastis"
 
@@ -11589,7 +11963,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "priedas"
 
@@ -11633,6 +12007,105 @@ msgstr "MIME tipas:"
 msgid "Suggest automatic display of attachment"
 msgstr "Pasiūlyti automatinį priedo parodymą"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Negalima pasirašyti išsiunčiamo laiško: Nenustatytas šios sąskaitos parašo "
+"sertifikatas"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Negalima užkoduoti išsiunčiamo laiško: Nenustatytas šios sąskaitos kodavimo "
+"sertifikatas"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nepavyko atidaryti bylos"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nepavyko gauti laiško iš redaktoriaus"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Keletas laiškų"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Atidaryti bylą"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autogeneruotas"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Parašas:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Prikabinta Byla"
+msgstr[1] "<b>%d</b> Prikabintos Bylos"
+msgstr[2] "<b>%d</b> Prikabinta Bylų"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Paslėpti _Priedų Juosta (meskite priedus čia)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Rodyti _Priedų Juostą (meskite priedus čia)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Sukurti laišką"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nepavyko sukurti laiškų rašymo lango:\n"
+"Nepavyko aktyvuoti adresų pasirinkimo valdymo."
+
+#: 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 ""
+"Negalėjau sukurti rašyklės lango:\n"
+"Nepavyko aktyvuoti HTML redaktoriaus komponento.\n"
+"Įsitikinkite, kad pas Jus įdiegtos tinkamos gtkhtml bei\n"
+"libgtkhtml versijos.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Negalėjau sukurti rašyklės lango:\n"
+"Nepavyko aktyvuoti HTML redaktoriaus komponento."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Laiško rašymo langas turi netekstinį neredaguotiną laiško tekstą.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Paskirties vieta"
@@ -11713,213 +12186,135 @@ msgstr "Spausk čia, kad pasirinktum aplanką"
 msgid "Attach file(s)"
 msgstr "Prisegti bylą(as)"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Negalima pasirašyti išsiunčiamo laiško: Nenustatytas šios sąskaitos parašo "
-"sertifikatas"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Negalima užkoduoti išsiunčiamo laiško: Nenustatytas šios sąskaitos kodavimo "
-"sertifikatas"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Nepavyko atidaryti bylos"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nepavyko gauti laiško iš redaktoriaus"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Keletas laiškų"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Atidaryti bylą"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogeneruotas"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Parašas:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> Prikabinta Byla"
-msgstr[1] "<b>%d</b> Prikabintos Bylos"
-msgstr[2] "<b>%d</b> Prikabinta Bylų"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Paslėpti _Priedų Juosta (meskite priedus čia)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Rodyti _Priedų Juostą (meskite priedus čia)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Sukurti laišką"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Prisegti bylą prie šio laiško"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Nepavyko sukurti laiškų rašymo lango:\n"
-"Nepavyko aktyvuoti adresų pasirinkimo valdymo."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Negalėjau sukurti rašyklės lango:\n"
-"Nepavyko aktyvuoti HTML redaktoriaus komponento.\n"
-"Įsitikinkite, kad pas Jus įdiegtos tinkamos gtkhtml bei\n"
-"libgtkhtml versijos.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Negalėjau sukurti rašyklės lango:\n"
-"Nepavyko aktyvuoti HTML redaktoriaus komponento."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Laiško rašymo langas turi netekstinį neredaguotiną laiško tekstą.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Neskaitytos žinutės"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Ar nori išsaugoti pakeitimus?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Negalėjau sukurti pipe: %s"
+msgid "Don't Recover"
+msgstr "Neimportuoti"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nepavyko išsaugoti parašo bylos: %s"
+msgid "Recover"
+msgstr "Pašalinti"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nepavyko išsaugoti parašo bylos: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Atsikratyti Pakeitimų"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Ar nori išsaugoti pakeitimus?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Klaida išsaugant trumpes."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Neimportuoti"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Įspėjimas: Pakeistas laiškas"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Klaida išsaugant trumpes."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Ar tu tikrai nori ištrinti šį bevardį įvykį?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Pašalinti"
+msgid "Discard Changes"
+msgstr "_Atsikratyti Pakeitimų"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Išsaugoti Laišką..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Negalėjau sukurti pipe: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Neskaitytos žinutės"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nepavyko išsaugoti parašo bylos: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Įspėjimas: Pakeistas laiškas"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Prisegti bylą prie šio laiško"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 "Jūs turite nustatyti savo pašto sąskaitos parametrus prieš pradėdami kurti "
@@ -12050,7 +12445,8 @@ msgstr ""
 "Byla tokiu vardu jau yra.\n"
 "Užrašyti ją?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Užrašyti bylą?"
 
@@ -12234,81 +12630,97 @@ msgstr "Pasirink laiką, su kuriuo palyginti"
 msgid "_Filter Rules"
 msgstr "Filtravimo taisyklės"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Klaida reguliarioje išraiškoje „%s“:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Byla „%s“ neegzistuoja arba nėra standartinė byla."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Susitikimo Atnaujinimas"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Jūs turite pasirinkti datą."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Skirtinis _vardas:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Jūs turite nurodyti bylos vardą."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Trinamas aplankas %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Byla „%s“ neegzistuoja arba nėra standartinė byla."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Priskyrimas"
+msgid "Missing folder."
+msgstr "Trinamas aplankas %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Jūs turite nurodyti aplanką."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Joks serveris nepasirinktas"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Klaida reguliarioje išraiškoje „%s“:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Jūs turite pasirinkti datą."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Priskyrimas"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Jūs turite suteikti šiam filtrui vardą."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Jūs turite įvardinti ši virtualų aplanką."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Jūs turite nurodyti bylos vardą."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Jūs turite nurodyti aplanką."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Joks serveris nepasirinktas"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12321,66 +12733,11 @@ msgstr "Pasirinkite bylą"
 msgid "<b>Then</b>"
 msgstr "<b>Laikas</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Pasirink aplanką"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Svarbus"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Darbai"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Vėliau"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Bandyti"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Taisyklės pavadinimas:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Bevardė"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Laikas</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Įvykdyti veiksmus"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "jei visos sąlygos tenkinamos"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "jei kuri nors sąlyga tenkinama"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "gaunamas"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "siunčiamas"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12471,6 +12828,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Vėliau"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Bandyti"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Taisyklės pavadinimas:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Laikas</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "jei visos sąlygos tenkinamos"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "jei kuri nors sąlyga tenkinama"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Įvykdyti veiksmus"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Pavestas"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Gavėjai"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Atsakymai į %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Įtraukti:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "gaunamas"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "siunčiamas"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12601,7 +13029,7 @@ msgstr "nėra pažymėtas"
 msgid "Junk Test"
 msgstr "Birželis"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Užrašas"
@@ -12641,7 +13069,7 @@ msgstr "Išeiti iš programos"
 msgid "Play Sound"
 msgstr "Groti garsą"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Skaitytas"
 
@@ -12711,9 +13139,9 @@ msgstr "prasideda su"
 msgid "Stop Processing"
 msgstr "Sustabdyti vykdymą"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12776,106 +13204,60 @@ msgstr "Temoje nėra"
 msgid "Virtual _Folders"
 msgstr "Virtualūs aplankai"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Pridėti"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder išeities tekstas"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Rašymo Nuostatos"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Čia gali valdyti įvairius pašto nustatymus, įskaitant saugumą bei laiškų "
-"rodymą"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Čia galima valdyti rašybos tikrinimą, parašus ir kitus laiškų rašymo "
-"nustatymus"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Čia galite nustatyti savo turimas pašto sąskaitas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution Paštas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Pašto sąskaitų nustatymų valdyklė"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution Pašto komponentas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Pašto rašyklė"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Pašto rašymo nustatymų valdymas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Pašto aplanko vaizduoklė"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Pašto nustatymų valdymas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Paštas"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Pašto Sąskaitos"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Pašto Nustatymai"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Įprasta]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Sąskaitos vardas"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokolas"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Bevardis"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Kalba(os)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Pridėti Parašą"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Parašas(ai)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Persiųstas Laiškas --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%Y %m %d %H:%M %%+05d, %%s rašė:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Sukurti _Virtualų Aplanką pagal Paiešką..."
 
@@ -12909,266 +13291,440 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Nurodyk, kur sukurti aplanką:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Sukurti aplanką"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Aplanko _vardas:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "vAplankai"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Gauti laiškai"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Įkeliama..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Negalima kopijuoti arba perkelti laiškų į Virtualų Aplanką"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Perkelti"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Atšaukti užduotį"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Pasirink aplanką"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopijuoti"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Sukurti aplanką"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pervadinti aplanką „%s“ į:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Pervadinti Aplanką"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Rodyti"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Atidaryti _Naujame Lange"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Perkelti"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Naujas Aplankas..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Pe_rvadinti"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "vAplankai"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Gauti laiškai"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Taisyti kaip naują laišką..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "S_pausdinti"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atsakyti į _konferenciją"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atsakyti _visiems"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "P_ersiųsti"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Tęsinys..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Pažymėti Bai_gtu"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Atša_ukti Pažymėjimą"
 
-#: mail/em-folder-view.c:787 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 "Pažymėti s_kaitytu"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Pažymėti _Neskaitytu"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Pažymėti svarb_iu"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Pažymėti Nes_varbiu"
 
-#: mail/em-folder-view.c:791 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 "Pažymėti kaip _Šiukšlę"
 
-#: mail/em-folder-view.c:792 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 "Atšaukti Šiukšlės _Pažymėjimą"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "S_ugrąžinti"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Perkelti į Aplanką..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opijuoti į aplanką..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Įtraukti Siuntėją į Adresų _Knygą"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Pritaik_yti Filtrus"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtravimo taisyklės"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Sukur_ti Filtrą pagal Laišką"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "vAplankas pagal _Temą"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "vAplankas pagal Siu_ntėją"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "vAplankas pagal _Gavėjus"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "vAplankas pagal _Konferenciją"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "vAplankas pagal Tąsą"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtras pagal T_emą"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtras pagal Si_untėją"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtras pagal Ga_vėjus"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtras pagal K_onferenciją"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtras pagal Tąsą"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Įprastas"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Spausdinti laišką"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Kopijuoti Nuorodą"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Paspauskite, kad išsiųsti %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Nuo"
+
+#: 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 "Atsakyti-kam"
+
+#: 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 "Kam"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Paspauskite, kad atidaryti %s"
+msgid "%s attachment"
+msgstr "%s priedas"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepalaikomas parašo formatas"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nežinoma klaida tikrinant parašą"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nežinoma klaida tikrinant parašą"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Gaunama „%s“"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Nepasirašytas"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Tvarkingas parašas"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Netvarkingas parašas"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Parašas tvarkingas, negalima patikrinti siuntėjo"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Nekoduotas"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Silpnai koduotas"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Koduotas"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Smarkiai užkoduotas"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Blogai suformuota išorinio kūno dalis."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Rodyklė į FTP svetainę (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Rodyklė į vietinę bylą (%s), galiojanti svetainėje „%s“"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Rodyklė į vietinę bylą (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Rodyklė į nutolusius duomenis (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Laiškas formatuojamas"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Pašto programa"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13176,11 +13732,7 @@ msgstr "Paspauskite, kad atidaryti %s"
 msgid "Matches: %d"
 msgstr "Atitinka: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Nepasirašytas"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13189,11 +13741,7 @@ msgstr ""
 "Šis laiškas nėra pasirašytas. Nėra jokių garantijų, kad laiško siuntėjas yra "
 "būtent tas asmuo, kurio vardas įrašytas laiške."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Tvarkingas parašas"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13202,11 +13750,7 @@ msgstr ""
 "Šis laiškas yra tvarkingai pasirašytas. Laiško siuntėjas turėtų būti būtent "
 "tas, kuo teigia esąs."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Netvarkingas parašas"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13214,11 +13758,11 @@ msgstr ""
 "Laiško parašas negali būti patikrintas, laiškas galėjo būti pakeistas "
 "persiuntimo metu."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Parašas tvarkingas, negalima patikrinti siuntėjo"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13226,11 +13770,7 @@ msgstr ""
 "Laiškas pasirašytas su tvarkingu parašu, bet siuntėjas negali būti "
 "patikrintas."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Nekoduotas"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13239,11 +13779,7 @@ msgstr ""
 "Šis laiškas nėra koduotas. Jo turinys galėjo būti perskaitytas siuntimo "
 "tinkle metu."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Silpnai koduotas"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13252,11 +13788,7 @@ msgstr ""
 "Laiškas yra užkoduotas, bet naudoja silpną kriptografinį algoritmą. "
 "Įsilaužėlis gali per pakankamai trumpą laiką atkoduoti laiško turinį."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Koduotas"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13264,11 +13796,7 @@ msgstr ""
 "Šis laiškas yra užkoduotas. Įsilaužėliui būtų sunku perskaityti laiško "
 "turinį."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Smarkiai užkoduotas"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13278,184 +13806,65 @@ msgstr ""
 "Įsilaužėliui yra labai sunku atkoduoti tokį laišką naudojant šiuo metu "
 "prieinamas priemones."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Peržiūrėti Sertifikatą"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Negalima peržiūrėti šio sertifikato"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Praleistos užduotys:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Žiūrėti Kontekste"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Slėpti"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Puslapis %d iš %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Gaunama „%s“"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Blogai suformuota išorinio kūno dalis."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Rodyklė į FTP svetainę (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Rodyklė į vietinę bylą (%s), galiojanti svetainėje „%s“"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Rodyklė į vietinę bylą (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Rodyklė į nutolusius duomenis (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Rodyklė į nežinomus išorinius duomenis („%s“ tipo)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Laiškas formatuojamas"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Nuo"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Atsakyti-kam"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kam"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Pašto programa"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s priedas"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nepavyko apdoroti S/MIME laiško: Nežinoma klaida"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Negalėjau išnagrinėti MIME laiško. Rodomas šaltinis."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Nepalaikomas parašo formatas"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Nežinoma klaida tikrinant parašą"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Nežinoma klaida tikrinant parašą"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (vidinis)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Kasmet"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Kiekvieną savaitę"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "kiekvieną mėnesį"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13467,25 +13876,55 @@ msgstr ""
 "\n"
 "Palaukite kol Evolution perkels Jūsų ankstesnius aplankus..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Nepavyko perkelti pop3 uid podėlių: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Nepavyko perkelti pop3 uid podėlių: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Nepavyko nukopijuoti bylos rodiklio: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, 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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Nepavyko atverti saugyklos, skirtos „%s“: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Nepavyko sukurti katalogo „%s“: %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13496,89 +13935,75 @@ msgstr "Išsaugoti kaip..."
 msgid "untitled_image.%s"
 msgstr "neįvardintas_paveikslėlis.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Nustatyti kaip _foną"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Atsakyti siuntėjui"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "Atverti Nu_orodą Naršyklėje"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Siųsti laišką _kitam..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Įtraukti į Adresų Knygą"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Atidaryti su %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ši saugykla nepalaiko užsakymų arba jie yra neįjungti."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Užsakytos"
 
-#: mail/em-subscribe-editor.c:637 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 "Aplankas"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Prašom pasirinkti serverį."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Joks serveris nepasirinktas"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Kitą kartą neberodyti šios žinutės."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtrai"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Persiųstas Laiškas --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y %m %d %H:%M %%+05d, %%s rašė:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "laiškas"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Išsaugoti Laišką..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Išsaugoti adresą"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Laiškai nuo %s"
@@ -13596,11 +14021,13 @@ msgid "Check incoming mail being junk"
 msgstr "Tikrinti ateinančius laiškus dėl galimų šiukšlių"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Citatų išskyrimo spalva"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Citatų išskyrimo spalva."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13709,14 +14136,20 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Žymių ir su jomis susijusių spalvų sąrašas"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Sąskaitų sąrašas"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Sąskaitų sąrašas"
+
+#: 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."
@@ -13724,27 +14157,32 @@ msgstr ""
 "Evolution pašto komponentui žinomų sąskaitų sąrašas. Čia išvardinamos sekus "
 "nurodančios katalogus tarp /apps/evolution/accounts registro."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Specialių antraščių sąrašas bei jų įjungimo parametrai."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Evolution pašto komponentui žinomų žymių sąrašas. Sąraše nurodytos vardų ir "
 "spalvų sąsajos, kur spalvos naudoja HTML šešioliktainius kodus."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "mime tipų, tikrinamų tarp bonobo komponentų žiūryklių, sąrašas"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Įkelti išorinius paveikslėlius įterptus per http į HTML laiškus"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13754,89 +14192,89 @@ msgstr ""
 "reikšmės yra: 0 - Niekada neįkelti išįrinių paveikslėlių, 1 - Įkelti tik jei "
 "siuntėjas yra tarp adresų knygos, 2 - Visada įkelti išorinius paveikslėlius"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Registruoti filtro veiksmus"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Registruoti filtrų veiksmus į nurodytą žurnalo bylą."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Byla registruojanti filtrų veiksmus"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Byla registruojanti filtrų veiksmus."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Pažymėti kaip perskaityta po nurodyto laiko tarpo"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Pažymėti kaip Perskaityta po nurodyto laiko tarpo."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Pažymėti citatas tarp laiško „Peržiūros“"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Pažymėti citatas tarp laiško „Peržiūros“."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Įprastas lango aukštis"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Laiško rodymo stilius (normalus, pilnos antraštės, pradinis tekstas)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Naujo Pašto Perspėjimų garso byla"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Perspėjimų apie Naują Paštą tipas"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Užklausti, kai tema nenurodyta"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Užklausti patvirtinimo, kai bandoma išvalyti aplanką."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 "Užklausti patvirtinimo, kai bandoma siųsti laišką nenurodžius temos."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Įspėti vartotoją išvalymo metu"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Užklausti patvirtinimo, kai užpildomi tik bcc gavėjų laukai"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13844,36 +14282,28 @@ msgstr ""
 "Paklausti, kai siunčiamas HTML laiškas adresatams, kurie gali nenorėti gauti "
 "HTML formato laiškų."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Užklausti patvirtinimo, kai bandoma siųsti HTML laišką to nenorintiems "
 "adresatams"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Atpažinti nuorodas tekste ir jas pakeisti."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Atpažinti šypsiukus tekste ir juos pakeisti paveikslėliais."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Tikrinti ateinantį paštą dėl galimų šiukšlių"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S14pt4 nu0st4t4"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S14pt4 nu0st4t4."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Paprastai siųsti laiškus HTML formatu"
@@ -13920,8 +14350,9 @@ msgid "Spell check inline"
 msgstr "Rašybą tikrinti rašymo metu"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Įprastas lango aukštis"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14063,33 +14494,67 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importuoti"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importavimo priemonė"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importavimo priemonė"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Rašymo Nuostatos"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importavimo priemonė"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Čia gali valdyti įvairius pašto nustatymus, įskaitant saugumą bei laiškų "
+"rodymą"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importavimo priemonė"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Čia galima valdyti rašybos tikrinimą, parašus ir kitus laiškų rašymo "
+"nustatymus"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importavimo priemonė"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Čia galite nustatyti savo turimas pašto sąskaitas"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution Paštas"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Pašto sąskaitų nustatymų valdyklė"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution Pašto komponentas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Pašto rašyklė"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Pašto rašymo nustatymų valdymas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Pašto nustatymų valdymas"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Pašto Sąskaitos"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Pašto Nustatymai"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_El. paštas:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14097,15 +14562,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prašome palaukti"
 
@@ -14137,19 +14602,47 @@ msgid "Select folder to import into"
 msgstr "Pasirinkti įkeliamą sertifikatą..."
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importuojama"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importuojamos bylos"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importavimo priemonė"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importavimo priemonė"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importavimo priemonė"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importavimo priemonė"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importavimo priemonė"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Skanuojama %s"
@@ -14159,7 +14652,7 @@ msgstr "Skanuojama %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetų  Filtras „%s“"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14185,7 +14678,7 @@ msgstr ""
 "dirba\n"
 "taip, kaip numatyta."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14197,7 +14690,7 @@ msgstr ""
 "kurios yra nepalaikomos Evolution.\n"
 "Šie filtrai nebus įkelti."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14210,24 +14703,24 @@ msgstr ""
 "bus pakeisti taip, kad tikrintų ar pateikta simbolių seka yra\n"
 "tarp laiško."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importuoja tavo senus Netscape duomenis"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Pašto Filtrai"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14261,127 +14754,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution sąskaitų tvarkyklė"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Rakto Sutartis"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Hostas:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Vartotojo _vardas:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Kelias:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Laiškai į %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Tema yra %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Laiškai nuo %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencija"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Atsakymai į %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Pridėti filtro taisyklę"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Ištrintas"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d dienų"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sekundžių"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d sekundžių"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d kontaktai"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Ištrintas"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Naujas pašto laiškas"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Pašto laiškas"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Rašyti naują laišką"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Naujas vAplankas"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pašto Filtrai"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Sukurti naują kalendorių"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Tikrinama paslauga"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Jungiamasi prie serverio..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Asmenybė"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14391,12 +14896,12 @@ msgstr ""
 "laukai žemiau gali likti tušti, nebent norėtumėte įtraukti šią informaciją "
 "Jūsų siunčiamame pašte."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Pašto gavimas"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14405,15 +14910,15 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Prašom pasirinkti iš žemiau esančių parinkčių"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Pašto siuntimas"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14422,11 +14927,11 @@ msgstr ""
 "gerai nežinote, paklauskite savo sistemos administratoriaus arba interneto "
 "paslaugų tiekėjo."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Sąskaitos tvarkymas"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14439,14 +14944,6 @@ msgstr ""
 "sąskaitą. Prašome įvesti šios sąskaitos pavadinimą žemiau esančiame "
 "laukelyje. Šis pavadinimas bus naudojamas tik vaizdavimui."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Tikrinama paslauga"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Jungiamasi prie serverio..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14761,7 +15258,8 @@ msgid "Execute Command..."
 msgstr "Paleisti Komandą..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Fi_ksuotas-plotis:"
 
 #: mail/mail-config.glade.h:82
@@ -15088,351 +15586,456 @@ msgstr "spalva"
 msgid "description"
 msgstr "aprašymas"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Jau yra aplankas pavadintas „%s“. Pasirinkite kitą vardą."
+msgid "Invalid authentication"
+msgstr "Autentikacija"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP serveris %s nepalaiko prašyto autentikacijos tipo %s."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+#. 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: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 "Ar tu tikrai nori ištrinti šią sąskaitą?"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Visam laikui sunaikinti visus ištrintus laiškus iš šio aplanko"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Jūs bandote išsiųsti HTML formatuotą laišką. Įsitikinkite, kad žemiau \n"
+"esantys laiško gavėjai sutinka gauti HTML laiškus ir sugebės juos "
+"perskaityti:\n"
+"%sAr tikrai galima išsiųsti?"
 
-#: mail/mail-errors.xml.in.h:5
+#: 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 ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Visam laikui sunaikinti visus ištrintus laiškus iš visų aplankų"
+msgid "_Send"
+msgstr "Siųsti"
 
-#: mail/mail-errors.xml.in.h:6
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Ar tu tikrai nori ištrinti šią sąskaitą?"
+msgid "Are you sure you want to send a message without a subject?"
+msgstr "Užklausti patvirtinimo, kai bandoma siųsti laišką nenurodžius temos."
+
+#. 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-errors.xml.in.h:7
+#. 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 "Paklausti prieš siunčiant laiškus vien tik su _Bcc gavėjais."
 
-#: mail/mail-errors.xml.in.h:8
-#, fuzzy
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Užklausti patvirtinimo, kai bandoma siųsti laišką nenurodžius temos."
-
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nepavyko nukopijuoti aplanko: %s"
+msgid "Use default drafts folder?"
+msgstr "Kelias iki įprasto kontaktų aplanko"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Negalima sukurti aplanko: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Nepavyko atidaryti šios sąskaitos juodraščių aplanko.\n"
+"Ar norėtum naudoti įprastinį juodraščių aplanką?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Negalėjau sukurti laikino katalogo: %s"
+msgid "Use _Default"
+msgstr "Įprastas"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Negaliu sukurti katalogo „%s“: %s."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Visam laikui sunaikinti visus ištrintus laiškus iš šio aplanko"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Negalėjau ištrinti aplanko:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
+msgid "_Expunge"
+msgstr "Iš_valyti"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Nėra tokio aplanko „%s“."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Visam laikui sunaikinti visus ištrintus laiškus iš visų aplankų"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Nepavyko perkelti aplanko: %s"
+msgid "_Empty Trash"
+msgstr "Ištuštinti _šiukšlinę"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Nepavyko atidaryti „%s“: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Nepavyko atidaryti „%s“: %s"
+#. 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-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Negaliu atidaryti laiško"
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:25
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
+msgid "Error while {0}."
+msgstr ""
+"Klaida „%s“ metu:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Negaliu sukurti katalogo „%s“: %s."
+msgid "Error while performing operation."
+msgstr ""
+"Klaida vykdant veiksmą:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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 ""
-"Negalima saugoti į „%s“\n"
-" %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Pridėti Parašą"
+msgid "Enter password."
+msgstr "Įveskite slaptažodį"
 
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Klaida, įkeliant filtro informaciją:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:31
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Nepavyko išsaugoti parašo bylos: %s"
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Negaliu sukurti katalogo „%s“: %s."
 
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Ištrinti \"%s\""
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Delete account?"
-msgstr "Ištrinti pažymėtus kontaktus"
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"Negalima saugoti į „%s“\n"
+" %s"
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Discard changed?"
-msgstr "A_tsisakyti pakeitimų"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Negaliu sukurti katalogo „%s“: %s."
 
-#: mail/mail-errors.xml.in.h:35
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Ar nori išsaugoti pakeitimus?"
+msgid "Cannot create temporary save directory."
+msgstr "Negalėjau sukurti laikino katalogo: %s"
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Neištrinti"
+#. 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/mail-errors.xml.in.h:37
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Enter password."
-msgstr "Įveskite slaptažodį"
+msgid "File exists but cannot overwrite it."
+msgstr "Byla egzistuoja, užrašyti?"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Error loading filter definitions."
-msgstr ""
-"Klaida, įkeliant filtro informaciją:\n"
-"%s"
+msgid "File exists but is not a regular file."
+msgstr "Byla „%s“ neegzistuoja arba nėra standartinė byla."
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Klaida vykdant veiksmą:\n"
+"Negalėjau ištrinti aplanko:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Negaliu ištrinti aplanko: %s: Nėra tokio aplanko"
+
+#. mail:no-delete-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."
 msgstr ""
-"Klaida „%s“ metu:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Byla egzistuoja, užrašyti?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Negaliu pervadinti aplanko: %s: Nėra tokio aplanko"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Byla „%s“ neegzistuoja arba nėra standartinė byla."
+msgid "Delete \"{0}\"?"
+msgstr "Ištrinti \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
+"Ar tikrai norite ištrinti aplanką „%s“ ir visus su juo susijusius aplankus?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "Jau yra aplankas pavadintas „%s“. Pasirinkite kitą vardą."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autentikacija"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Nepavyko perkelti aplanko: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Nepavyko atidaryti „%s“: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Negaliu atidaryti laiško"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Nepavyko nukopijuoti aplanko: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Jūs bandote išsiųsti HTML formatuotą laišką. Įsitikinkite, kad žemiau \n"
-"esantys laiško gavėjai sutinka gauti HTML laiškus ir sugebės juos "
-"perskaityti:\n"
-"%sAr tikrai galima išsiųsti?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Negalima sukurti aplanko: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr ""
-"Ar tikrai norite ištrinti aplanką „%s“ ir visus su juo susijusius aplankus?"
+msgid "Cannot open source \"{1}\""
+msgstr "Nepavyko atidaryti „%s“: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Tu neįvedei visos būtinos informacijos."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Tu negali sukurti dviejų aplankų tuo pačiu vardu."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Ištrinti pažymėtus kontaktus"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Ar tu tikrai nori ištrinti šią sąskaitą?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Žemiau nurodyti vAplankai:\n"
-"%sNaudojo ištrintą aplanką:\n"
-"    '%s'\n"
-"Ir buvo atnaujinti."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Neištrinti"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Žemiau nurodyti vAplankai:\n"
-"%sNaudojo ištrintą aplanką:\n"
-"    '%s'\n"
-"Ir buvo atnaujinti."
+msgid "Could not save signature file."
+msgstr "Nepavyko išsaugoti parašo bylos: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Pridėti Parašą"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "A_tsisakyti pakeitimų"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP serveris %s nepalaiko prašyto autentikacijos tipo %s."
+msgid "Do you wish to save your changes?"
+msgstr "Ar nori išsaugoti pakeitimus?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15440,85 +16043,97 @@ msgstr ""
 "\n"
 "Ar norėtum išsaugoti pakeitimus?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nepavyko atidaryti šios sąskaitos juodraščių aplanko.\n"
-"Ar norėtum naudoti įprastinį juodraščių aplanką?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Įprastas"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "A_tsisakyti pakeitimų"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Kelias iki įprasto kontaktų aplanko"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Tu neįvedei visos būtinos informacijos."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Nėra tokio aplanko „%s“."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Tu negali sukurti dviejų aplankų tuo pačiu vardu."
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "A_tsisakyti pakeitimų"
-
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Ištuštinti _šiukšlinę"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Žemiau nurodyti vAplankai:\n"
+"%sNaudojo ištrintą aplanką:\n"
+"    '%s'\n"
+"Ir buvo atnaujinti."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Iš_valyti"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Siųsti"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Žemiau nurodyti vAplankai:\n"
+"%sNaudojo ištrintą aplanką:\n"
+"    '%s'\n"
+"Ir buvo atnaujinti."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Perrašyti"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Siųsti"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Tikrinamas %s"
@@ -15527,20 +16142,20 @@ msgstr "Tikrinamas %s"
 msgid "Working"
 msgstr "Dirbama"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtruojamas aplankas"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Gaunamas paštas"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepavyko pritaikyti išeinančių filtrų: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15549,101 +16164,101 @@ msgstr ""
 "Nepavyko įterpti į %s: %s\n"
 "Įterpiama į vietinį „Išsiųstų laiškų“ aplanką."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Siunčiamas laiškas %d iš %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nesėkmė ties laišku %d iš %d"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Užbaigta."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Laiškas išsaugomas į aplanką"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Laiškai perkeliami į %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Laiškai kopijuojami į %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanuojami aplankas, esantys „%s“"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Persiųsti laiškai"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atidaromas aplankas %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Atidaroma saugykla %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Trinamas aplankas %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Įrašomas aplankas '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Atnaujinamas aplankas"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Išvalomas aplankas"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Išvaloma šiukšlinė tarp „%s“"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Vietiniai Aplankai"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Gaunamas laiškas %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15651,7 +16266,7 @@ msgstr[0] "Gaunami %d laiškai"
 msgstr[1] "Gaunami %d laiškai"
 msgstr[2] "Gaunami %d laiškai"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15659,7 +16274,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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15668,7 +16283,7 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15677,11 +16292,11 @@ msgstr ""
 "Klaida išsaugant laiškus į: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Išsaugomas priedas"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15690,17 +16305,17 @@ msgstr ""
 "Negaliu sukurti išvesties bylos: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Negalėjau įrašyti duomenų: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atsijungiama nuo %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Vėl jungiamasi prie %s"
@@ -15764,24 +16379,24 @@ msgstr "Atnaujinama..."
 msgid "Waiting..."
 msgstr "Laukiama..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Vartotojas nutraukė veiksmą."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Įvesk %s slaptažodį"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Įvesk slaptažodį"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Prisiminti šį slaptažodį"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "P_risiminti šį slaptažodį iki šios sesijos galo"
 
@@ -15823,89 +16438,94 @@ msgstr "Persiųstas laiškas"
 msgid "Invalid folder: `%s'"
 msgstr "Netinkamas aplankas: „%s“"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Tvarkomas virtualus aplankas: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Atnaujinami vAplankai pagal uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Atnaujinami vAplankai pagal uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vAplankai"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Keisti vAplanką"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Naujas vAplankas"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nematytas"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Matytas"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Atsakytas"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Keletas nematytų laiškų"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Keletas laiškų"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Žemiausias"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Žemesnis"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Aukštesnis"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Aukščiausias"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Šiandien %H:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Vakar %H:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %H:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %H:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%Y %b %d"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generuojamas laiškų sąrašas"
 
@@ -15937,43 +16557,43 @@ msgstr "Gautas"
 msgid "Size"
 msgstr "Dydis"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Skambutis"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Nepersiųsti"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Tęsinys"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Jūsų Žiniai"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Persiųsti"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Atsakymas Nebūtinas"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atsakyti"
 
-#: mail/message-tag-followup.c:70 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 "Atsakyti visiems"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Peržiūra"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Pažymėti kaip Tęsinį"
 
@@ -16018,51 +16638,31 @@ msgstr "_Užsakyti"
 msgid "_Unsubscribe"
 msgstr "_Atsisakyti"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Apvalkalas"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution bandymas"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Testavimo komponentas"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Įprasta trumpių grupė"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Įprastas aplankų juostos plotis"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Įprastas trumpių juostos plotis"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Įprastas lango aukštis"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Įprastas lango plotis"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Evolution nustatymų versija"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "Komponento ID arba trumpas vardas rodomas paleidimo metu."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -16070,7 +16670,7 @@ msgstr ""
 "Jei reikšmė teigiama, Evolution pasileistų neprisijungusiame režime vietoj "
 "prisijungusio."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -16078,60 +16678,20 @@ msgstr ""
 "Jei reikšmė yra teigiama, perspėjimai apie bandomąją Evolution versiją nebus "
 "rodomi."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 "Aplankų, kurie turi būti sulyginti atsijungusiam režimui, sąrašas"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Kelias iki įprasto kalendoriaus aplanko"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Kelias iki įprasto kontaktų aplanko"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Kelias iki įprasto pašto aplanko"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Kelias iki įprasto užduočių aplanko"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Realus įprasto kalendoriaus aplanko adresas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Realus įprasto kontaktų aplanko adresas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Realus įprasto pašto aplanko adresas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Realus įprasto užduočių aplanko adresas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Ar rodyti aplankų juostą"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Ar rodyti trumpių juostą"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Ar nerodyti bandomosios versijos perspėjimų lango"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "paštas"
 
@@ -16139,6 +16699,32 @@ msgstr "paštas"
 msgid "Brought to you by"
 msgstr "Produktą sukūrė"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%B %d"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Nežinoma klaida"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Blogi argumentai"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Negaliu užsiregistruoti OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Konfigūracijos duombazė nerasta"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Bendroji klaida"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bevardis)"
@@ -16278,11 +16864,11 @@ msgstr "Nepavyko paleisti gpg programos."
 msgid "_Import"
 msgstr "_Importuoti"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Uždaromos jungtys..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution Nustatymai"
 
@@ -16324,11 +16910,35 @@ msgstr "Aplanko varde negali būti simbolio „#“."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' ir '..' yra rezervuoti katalogų vardai."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution dabar yra atsijungimo procese."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Laiškai į %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Klaida vykdant %s."
@@ -16342,14 +16952,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy negalėjo būti paleistas."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Apie Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Dirbti prisijungus"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Dirbti atsijungus"
 
@@ -16357,50 +16968,6 @@ msgstr "_Dirbti atsijungus"
 msgid "Work Offline"
 msgstr "Dirbti atsijungus"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution dabar yra atsijungimo procese."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, fuzzy, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Dėmesio: Evolution negali atnaujinti Jūsų duomenų iš %s versijos.\n"
-"Duomenis nebus ištrinti, bet jie ir nebus įkelti į šią Evolution versiją.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Blogi argumentai"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Negaliu užsiregistruoti OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfigūracijos duombazė nerasta"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Bendroji klaida"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Pasirinkimo laukas"
@@ -16471,6 +17038,43 @@ msgstr "Esamos Jungtys"
 msgid "Click OK to close these connections and go offline"
 msgstr "Paspausk Gerai, kad uždarytum šias jungtis ir atsijungtum"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendorius:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontaktai: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_El. paštas:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Užduotys:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Aplanko _tipas:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Atidaryti Kito Vartotojo Aplanką"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "Sąsk_aita:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Aplanko Vardas:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Vartotojas:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Nustatymo Pagalbininkas"
@@ -16513,6 +17117,18 @@ msgstr ""
 "\n"
 "Pasirinkite „Pritaikyti“ mygtuką, kad išsaugoti savo nustatymus. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Apvalkalas"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution bandymas"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Testavimo komponentas"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Spausk „Import“, kad pradėtum importuoti bylą į Evolution."
@@ -16576,13 +17192,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution gali importuoti duomenis iš žemiau nurodytų bylų:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16612,57 +17228,48 @@ msgstr ""
 "Mes tikimės, kad Jums patiks mūsų sunkaus darbo vaisiai, ir\n"
 "laukiame Jūsų prisidėjimo prie šio produkto tobulinimo!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Ačiū\n"
 "Ximian Evolution komanda\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Kitą kartą nebeklausti"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Negalėjau prieiti prie Ximian Evolution apvalkalo."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Negalėjau inicializuoti Ximian Evolution apvalkalo: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Evolution paleidimas aktyvuoja nurodytą komponentą"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Paleisti neprisijungiant"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Paleisti prisijungiant"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Priverstinai uždaryti visus Evolution komponentus"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Siųsti visų komponentų derinimo išvestį į bylą."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16671,13 +17278,79 @@ msgstr ""
 "%s: --online ir --offline negali būti naudojami tuo pačiu metu.\n"
 "  Naudokite %s --help norėdami gauti daugiau informacijos.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Jungiamasi"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Negalėjau prieiti prie Ximian Evolution apvalkalo."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution sąskaitų padėjėjas"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Sertifikato Vardas"
 
@@ -16908,11 +17581,6 @@ msgstr "Jūsų sertifikatų byla saugo šių asmenų sertifikatus:"
 msgid "Your Certificates"
 msgstr "Jūsų Sertifikatai"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Toks sertifikatas jau yra"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y %m %d"
@@ -17103,6 +17771,11 @@ msgstr "Unikalus Temos ID"
 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
+msgid "Certificate already exists"
+msgstr "Toks sertifikatas jau yra"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Bylos Slaptažodis"
@@ -17142,12 +17815,12 @@ msgstr "Įprasta laiško tema."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nepavyko paleisti „%s“: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Išsijungiama %s (%s)\n"
@@ -17211,7 +17884,8 @@ msgid "Select all contacts"
 msgstr "Pažymėti visus kontaktus"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Siųsti laišką pažymėtiems kontaktams."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17242,8 +17916,8 @@ msgstr "Rodyti esamą kontaktą"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Veiksmai"
@@ -17261,7 +17935,8 @@ msgid "_Preview Pane"
 msgstr "_Peržiūros sritis"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Iš_saugoti kaip VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17388,10 +18063,20 @@ msgstr "Peržiūrėti esamą paskyrimą"
 msgid "Week"
 msgstr "Savaitė"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Darbo savaitė"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Atidaryti Paskyrimą"
 
+#: 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 "_Uždaryti"
+
 #: 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
@@ -17709,6 +18394,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Uždaryti"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17950,7 +18645,8 @@ msgid "Open the selected message in a new window"
 msgstr "Atidaryti pasirinktą laišką naujame lange"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Atidaryti pasirinktą laišką rašyklės lange siuntimui iš naujo"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18065,58 +18761,46 @@ msgstr "vAplankas pagal _Temą..."
 msgid "_Attached"
 msgstr "Prik_abinta"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopijuoti į aplanką"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Sukurti filtrą iš laiško"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Eiti į"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Kontekste"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Didesnis"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Laiško rodymas"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Perkelti į aplanką"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Kitas Laiškas"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normalus rodymas"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Atidaryti laišką"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Ankstesnis Laiškas"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Cituojant"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Da_r kartą siųsti..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Įran_kiai"
@@ -18125,16 +18809,6 @@ msgstr "Įran_kiai"
 msgid "_Undelete"
 msgstr "S_ugrąžinti"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Uždaryti"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Prisegti"
@@ -18526,6 +19200,11 @@ msgstr "Pašto Nustatymai"
 msgid "_Send / Receive"
 msgstr "_Siųsti / Gauti"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Langas"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Pagal _kompaniją"
@@ -18593,10 +19272,6 @@ msgstr "_Kada reikia:"
 msgid "With _Status"
 msgstr "Priskirti būseną"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Užduotys"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18755,6 +19430,34 @@ msgstr "Kita..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution Klaida"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution Paštas"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Susitikimo informacija"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution bandymas"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Išsiųsti laiškai ir juodraščiai"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18868,6 +19571,35 @@ msgstr "Tekstas"
 msgid "Find _Now"
 msgstr "_Surasti"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 jau egzistuoja.\n"
+"Ar nori įrašyti vietoj jo?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Negalima saugoti į „%s“\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Negalima saugoti į „%s“\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18878,15 +19610,145 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% užbaigta)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Adresų Knygos aplankų vaizduoklė"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adresas _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Žurnalas"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Kalendoriaus vaizduoklė"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Užduočių vaizduoklė"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Negalėjau inicializuoti gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nepavyko atidaryti aplanko tarp „%s“"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, kurį rodys kalendorius"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Naudojamas rodynio tipas"
+
+#~ msgid "Display a message"
+#~ msgstr "Rodyti pranešimą"
+
+#~ msgid "Alerts"
+#~ msgstr "Perspėjimai"
+
+#~ msgid "Time"
+#~ msgstr "Laikas"
+
+#~ msgid "_General"
+#~ msgstr "_Esmė"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Pasirink importavimo komponentą"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalendorius"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Naujas užduočių sąrašas"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalendoriaus byla negalėjo būti atnaujinta!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Vaizduojamo užduočių aplanko URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Negalėjau įkelti užduočių į „%s“"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution Pašto aplanko vaizduoklė"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "vAplankas pagal Tąsą"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtras pagal Tąsą"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Nepavyko perkelti pop3 uid podėlių: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Nepavyko perkelti pop3 uid podėlių: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Nepavyko atverti saugyklos, skirtos „%s“: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S14pt4 nu0st4t4"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S14pt4 nu0st4t4."
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Įprasta trumpių grupė"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Įprastas trumpių juostos plotis"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Kelias iki įprasto kalendoriaus aplanko"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Kelias iki įprasto kontaktų aplanko"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Kelias iki įprasto pašto aplanko"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Kelias iki įprasto užduočių aplanko"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Realus įprasto kalendoriaus aplanko adresas"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Realus įprasto kontaktų aplanko adresas"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Realus įprasto pašto aplanko adresas"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Realus įprasto užduočių aplanko adresas"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Ar rodyti aplankų juostą"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Ar rodyti trumpių juostą"
+
 #, fuzzy
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
 #~ msgstr ""
-#~ "Adresų knygutė „%s“ bus pašalinta. Ar Jūs tikrai norite taip pasielgti?"
+#~ "Dėmesio: Evolution negali atnaujinti Jūsų duomenų iš %s versijos.\n"
+#~ "Duomenis nebus ištrinti, bet jie ir nebus įkelti į šią Evolution "
+#~ "versiją.\n"
 
-#, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Nauja Adresų Knyga"
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Negalėjau inicializuoti Ximian Evolution apvalkalo: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Da_r kartą siųsti..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "Išvedamų kontaktų šaltinio ID"
@@ -19057,9 +19919,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "S_pouse:"
 #~ msgstr "S_utuoktinis:"
 
-#~ msgid "_Add"
-#~ msgstr "_Pridėti"
-
 #~ msgid "_Business:"
 #~ msgstr "_Verslo:"
 
@@ -19181,15 +20040,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Galutinis terminas yra anksčiau už pradžią!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Pradžios data:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Kada reikia:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioritetas:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19221,13 +20071,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nepavyko nukopijuoti bylos rodiklio: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19377,9 +20220,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Kalendoriaus pradžios rodinys"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Įveskite „%s“ slaptažodį"
-
 #~ msgid "New task list"
 #~ msgstr "Naujas užduočių sąrašas"
 
@@ -19436,30 +20276,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Nepavyko rasti nurodyti bendrinio aplanko."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendorius:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_El. paštas:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Užduotys:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Aplanko _tipas:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Atidaryti Kito Vartotojo Aplanką"
-
-#~ msgid "_Account:"
-#~ msgstr "Sąsk_aita:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Aplanko Vardas:"
-
-#~ msgid "_User:"
-#~ msgstr "_Vartotojas:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Sukurti naują langą"
 
@@ -19765,9 +20581,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Uždaryti Pagalbininką"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Žemiau nurodytos jungtys šiuo metu yra aktyvios:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Ieškoti kontaktų"
 
@@ -19783,9 +20596,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "Addressbook Sources"
 #~ msgstr "Adresų knygelės šaltinis"
 
-#~ msgid "No data provided"
-#~ msgstr "Nepateikta jokių duomenų"
-
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
@@ -20001,9 +20811,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ "Šis laiškas yra pasirašytas skaitmeniniu parašu, bet neina patikrinti, ar "
 #~ "jis autentiškas"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution Klaida"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20099,15 +20906,6 @@ msgstr "%s (%d%% užbaigta)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "<b>Aliarmo Garsas</b>"
 
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "<b>Priminimai</b>"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Perspėjimai</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Užduočių Sąrašas</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Klasifikacija</b>"
 
diff --git a/po/lv.po b/po/lv.po
index 94e7e0559d..f1a56cda4c 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -21,6 +21,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Rediģēt adrešu grāmatau"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakti:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution _logs"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -46,16 +56,6 @@ msgstr "kartes"
 msgid " card"
 msgstr "1 karte"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakti:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution _logs"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Noklusētā sinhr. adrese:"
@@ -71,74 +71,20 @@ msgstr "Nevarēju ielādēt %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nevarēju nolasīt Pilot adrešu aplikācijas bloku"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Autoaizpildes mapes"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "_Sertifikāta ID:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Šeit konfigurējiet jūsu epasta kontus"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Rediģēt adrešu grāmatau"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Ražotne adrešu grāmatas adrešu izniršanai"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Izmantoju LDAP serveri anonīmi"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Neizdevās autentificēties.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sIevadiet %s paroli (lietotājs %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -181,42 +127,46 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Izveidot jaunu saīsinājumu grupu"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Gaidu..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Ehotestējam %s"
@@ -224,8 +174,8 @@ msgstr "Ehotestējam %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -233,7 +183,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personīgi"
@@ -283,20 +233,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Izmantoju LDAP serveri anonīmi"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Neizdevās autentificēties.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Adrešu grāmata"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sIevadiet %s paroli (lietotājs %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -316,6 +288,69 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Autoaizpildes mapes"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_Sertifikāta ID:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Šeit konfigurējiet jūsu epasta kontus"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Rediģēt adrešu grāmatau"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Ražotne adrešu grāmatas adrešu izniršanai"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  Pa_rādīt atbalstītās bāzes"
@@ -337,6 +372,7 @@ msgstr "  Pa_rādīt atbalstītās bāzes"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 ""
@@ -409,7 +445,7 @@ msgstr "_Kontakti:"
 msgid "Address Book Properties"
 msgstr "Adrešu grāmatas resursi"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Vienmēr"
@@ -424,107 +460,97 @@ msgid "Basic"
 msgstr "Pamata"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Krāsas"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Savienojos"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Atšķiramais _vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Atbalstītās meklēšanas bāzes"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Galvenais"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nekad"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Viens"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Izvēlies krāsu"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: 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:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "M_eklēšanas mērogs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Meklēšana"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -533,7 +559,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -550,7 +576,7 @@ msgstr ""
 "savienojums jau\n"
 "ir drošs."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -564,19 +590,19 @@ msgstr ""
 "drošības\n"
 "kļūdu izmantojumiem."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Apakš"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Atbalstītās meklēšanas bāzes"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -587,7 +613,7 @@ msgstr ""
 "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:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -602,14 +628,14 @@ 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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -620,7 +646,7 @@ msgstr ""
 "pārlieku \n"
 "lielu, tiks bremzēta jūsu adrešu grāmatas darbība."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -630,7 +656,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -639,7 +665,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -650,129 +676,136 @@ msgstr ""
 "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:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Laika formāts:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Izmantoju atšķirīgo vārdu (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Izmantoju epasta adresi"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kad iespējams"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Lejupielādes limits:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Epasta _adrese:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Pieteikšanās metode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Vārds:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Porta numurs:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritāte:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Meklēšanas bāze:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Servera nosaukums:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Serveris:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Taimouts (minūtes):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Lietot drošu savienojumu (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kartes"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minūtes"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Izņemt visu"
+msgid "Select Contacts from Address Book"
+msgstr "Izvēlieties kontaktus no adrešu grāmatas"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Izņemt"
 
+#: 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 "Nosaukums"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Izņemt visu"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -797,23 +830,16 @@ msgstr "Pievienot kontaktiem"
 msgid "Unnamed Contact"
 msgstr "Nenosaukts kontakts"
 
-#: 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
-msgid "Name"
-msgstr "Nosaukums"
-
 #: 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
 msgid "Source"
 msgstr "Avots"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Izvēlieties kontaktus no adrešu grāmatas"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adrešu grāmatas vārda izvēles saskarne."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -886,143 +912,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adrese _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adrese:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ikga_dējs:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistents"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Dzimšanas diena:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bologna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alendārs:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Pilsēta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Kompānija"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktu redaktors"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Va_lsts:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "D_epartaments:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "Brīvs/Aizņemts URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Pil_ns vārds..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Mājas"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Epasta adrese:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Menedžeris"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Iesauka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Piezīm_es:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Citi"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Pasta Kastīte:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1050,9 +1076,9 @@ msgstr "Lapa"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Darbs"
@@ -1087,24 +1113,41 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Vai jūs tiešām vēlaties\n"
+"dzēst šo kontaktu?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #, fuzzy
 msgid "Editable"
 msgstr "Aktivizēt"
@@ -2084,102 +2127,120 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Publicēt vēstuli"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Nenosaukts saraksts"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Serviss kārtībā"
-
-#: 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 "Lokācija: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Lietotājvārds:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Joro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Avots"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Jauns kontakts"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Merril Field"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Čada"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Šis kontakts pieder šādām kategorijām:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Pašreizējie aktīvie savienojumi ir:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Publicēt vēstuli"
+
+#: 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 "Serviss kārtībā"
+
+#: 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 "Lokācija: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Lietotājvārds:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Kontakta ātrā pievienošana"
@@ -2202,23 +2263,6 @@ msgstr ""
 "\n"
 "E-pasts:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Vai jūs tiešām vēlaties\n"
-"dzēst šo kontaktu?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adrese _2:"
@@ -2372,8 +2416,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Bodo"
@@ -2436,6 +2480,462 @@ 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
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Locekļi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-pasts"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizācija"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Bostona"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponkē"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Darbs"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobilais telefons"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Personīgi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Piezīme"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Darba nosaukums:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Epasts"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Mājas fakss"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Veiksmīgi"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repozitorijs nesaistes režīmā"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Atļauja liegta"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Karte nav atrasta"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokols nav atbalstīts"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Atsaukts"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Autentifikācija neizdevusies"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Pieprasīta autentifikācija"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Nav tādas vēstules"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Cita kļūda"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Mēs nevarējām atvērt šo adrešu grāmatu. Tas nozīmē,\n"
+"ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
+"ir nesasniedzams."
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Mēs nevaram atvērt šo adrešu grāmatu. Tas nozīmē,\n"
+"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
+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 ""
+"Par daudz karšu šajā pieprasijumā ir atgriezts, nekā vai nu serveris ir \n"
+"nokonfigurēts atgriezt vai arī Evolution nokonfigurēta parādīt.\n"
+"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
+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 ""
+"Laiks pieprasījuma izpildei pārsniedza servera limitu vai arī limitu\n"
+"šajai adresu grāmatai.  Lūdzu padariet jūsu meklējumu nedaudz precīzāku\n"
+"vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
+"šajai adrešu grāmatai."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Kļūda pievienojot karti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Kļūda mainot sarakstu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Kļūda mainot karti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Kļūda izņemot karti"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"%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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s jau eksistē\n"
+"Vai tu vēlies to pārrakstīt?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "saraksts"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Pārvietot karti uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopēt karti uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Pārvietot kartes uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopēt kartes uz"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Izvēlieties kontaktus no adrešu grāmatas"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Vairākas VKartes"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s VKarte"
+
+#.
+#. * 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 "(nekas)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primārais epasts"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Epasts 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Epasts 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Izvēlieties darbību"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Izveidojiet jaunu \"%s\" kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Pievienot adresi eksistējošajam \"%s\" kontaktam"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Meklēju adrešu grāmatā..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Rediģēt kontakta informāciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Apvienot e-pasta adreses"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "un vēl viena karte."
+msgstr[1] "un vēl viena karte."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Parādīt _pilnas galvenes"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Saglabāt konaktu kā VKarti"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Saglabāt adrešu grāmatā"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2451,8 +2951,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
 msgid "Query"
 msgstr "Quimper"
@@ -2509,9 +3009,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Saglabāt kā VKarti"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2579,7 +3080,7 @@ msgid "Cut"
 msgstr "Izgriezt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2590,18 +3091,8 @@ msgstr "Kopēt"
 msgid "Paste"
 msgstr "Ievietot"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Dzēst"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Pašreizējais skats"
 
@@ -2618,7 +3109,7 @@ msgstr ""
 "izmantot"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Jebkura kategorija"
@@ -2659,21 +3150,6 @@ msgstr "Kategorijas"
 msgid "Company Phone"
 msgstr "Kompānijas telefons"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Epasts"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Epasts 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Epasts 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Uzvārds"
@@ -2713,29 +3189,14 @@ msgstr "Jordāna"
 msgid "Manager"
 msgstr "Menedžeris"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobilais telefons"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Iesauka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Piezīme"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Birojs"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizācija"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Cits fakss"
@@ -2789,23 +3250,33 @@ msgstr "Unsta"
 msgid "Web Site"
 msgstr "Web lapaspuse"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Platums:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Augstums:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Izvēlētais:"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Uzdevumu kārtošana"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -2825,11 +3296,6 @@ msgstr "Teksta _izmērs"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
-msgid "Column Width"
-msgstr "Kolumbija"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2859,438 +3325,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adrara"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Izvēlētais:"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Uzdevumu kārtošana"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Locekļi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-pasts"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Bostona"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponkē"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Darbs"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Personīgi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Darba nosaukums:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Mājas fakss"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Veiksmīgi"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repozitorijs nesaistes režīmā"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Atļauja liegta"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Karte nav atrasta"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Kartes ID jau eksistē"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokols nav atbalstīts"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Atsaukts"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Autentifikācija neizdevusies"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Pieprasīta autentifikācija"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nav tādas vēstules"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Cita kļūda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Mēs nevarējām atvērt šo adrešu grāmatu. Tas nozīmē,\n"
-"ka esat ievadijuši nepareizu URI, vai arī LDAP serveris\n"
-"ir nesasniedzams."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Mēs nevaram atvērt šo adrešu grāmatu. Tas nozīmē,\n"
-"ka esat ievadijuši nepareizu URI, vai arī serveris\n"
-"ir nesasniedzams."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Nevaru atvērt adrešu gramatu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Par daudz karšu šajā pieprasijumā ir atgriezts, nekā vai nu serveris ir \n"
-"nokonfigurēts atgriezt vai arī Evolution nokonfigurēta parādīt.\n"
-"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:167
-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 ""
-"Laiks pieprasījuma izpildei pārsniedza servera limitu vai arī limitu\n"
-"šajai adresu grāmatai.  Lūdzu padariet jūsu meklējumu nedaudz precīzāku\n"
-"vai arī palieliniet laika limitu direktorijas servera preferencēs\n"
-"šajai adrešu grāmatai."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Šis pieprasījums netika izpildīts veiksmīgi."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, fuzzy
-msgid "_Discard"
-msgstr "Dinarda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Kļūda pievienojot sarakstu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Kļūda pievienojot karti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Kļūda mainot sarakstu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Kļūda mainot karti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Kļūda izņemot sarakstu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Kļūda izņemot karti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"%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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s jau eksistē\n"
-"Vai tu vēlies to pārrakstīt?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Pārrakstīt"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "saraksts"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Pārvietot karti uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopēt karti uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Pārvietot kartes uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopēt kartes uz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Izvēlieties kontaktus no adrešu grāmatas"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Vairākas VKartes"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s VKarte"
-
-#.
-#. * 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 "(nekas)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primārais epasts"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Izvēlieties darbību"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Izveidojiet jaunu \"%s\" kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Pievienot adresi eksistējošajam \"%s\" kontaktam"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Meklēju adrešu grāmatā..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Rediģēt kontakta informāciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Apvienot e-pasta adreses"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "un vēl viena karte."
-msgstr[1] "un vēl viena karte."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Parādīt _pilnas galvenes"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 #, fuzzy
-msgid "Show Compact VCard"
-msgstr "Saglabāt konaktu kā VKarti"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Saglabāt adrešu grāmatā"
+msgid "Column Width"
+msgstr "Kolumbija"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3339,11 +3377,6 @@ msgstr "Evolution pasta sacerētājs."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Drukāt aploksni"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Drukāt kontaktus"
@@ -3354,6 +3387,11 @@ msgstr "Drukāt kontaktus"
 msgid "Print contact"
 msgstr "Drukāt kontaktus"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Drukāt aploksni"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3540,18 +3578,6 @@ msgstr "Kontaktu _saraksts"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nevar atvērt vēstuli"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Karte nav atrasta"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3609,6 +3635,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nevar atvērt vēstuli"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Karte nav atrasta"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Kļūda ielādējot noklusēto adrešu grāmatu."
@@ -3621,11 +3659,12 @@ msgstr "Ievada fails"
 msgid "No filename provided."
 msgstr "Nav dots faila nosaukums."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Nenosaukts saraksts"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Ievadiet paroli"
@@ -3658,127 +3697,55 @@ msgstr "Noklusētā prioritāte:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nevar nolasīt Pilota ToDo aplikācijas bloku"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendārs un uzdevumi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendārs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Šeit konfigurējiet jūsu laika zonu, kalendāru un uzdevumu sarakstu"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendārs un uzdevumi"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalendāra iTip/iMip skatītājs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalendāra iTip/iMip skatītājs"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution ziņu redaktors"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution ziņu redaktors"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalendāra kopsavilkuma komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution Kopsavilkuma komponente."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Uzdevumi"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Ražotne trauksmes notifikācijas servisam"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Sākums:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Beigas:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution trauksme"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Trauksme %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Aiz_vērt"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Snau_st"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Snaust kādu laiku (minūtes)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "R_ediģēt tikšanos"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Snau_st"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Atvērt"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Apraksts nav pieejams."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3787,12 +3754,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Brīdinājums"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3804,7 +3771,7 @@ msgstr ""
 "nokonfigurēta nosūtīt epastu. Evolution tā vietā attēlos\n"
 "normālu atgādinātāja dialoga logu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3821,19 +3788,20 @@ msgstr ""
 "\n"
 "Vai jūs patiešām vēlaties laist šo programmu?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Neprasīt vairāk man par šo programmu."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Ražotne trauksmes notifikācijas servisam"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nevarēju inicializēt Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nespēju inicializēt gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nevarēju izveidot trauksmes notifikācijas servisa ražotni"
 
@@ -3947,61 +3915,46 @@ 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 "Pr_asīt apstiprinājumu, kad dzēš priekšmetus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Pr_asīt apstiprinājumu, kad dzēš priekšmetus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Dzēst izpildītos uzdevumus"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Kopsavilkums satur"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Apraksts satur"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentāri satur"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Apraksts satur"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Neatbilstoši"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendārs"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4013,126 +3966,137 @@ msgstr ""
 "\n"
 "Tiešām izdzēst šos uzdevumus?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "atgriež mazāk kā"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dienas"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Rekvizīti..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Ielādēju Kalendāru..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendārs"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Jauna tikšanās"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Tikšanās"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sanāksme"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Izveidot jaunu sanāksmes pieprasījumu"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Jauna tikšanās visu dienu"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Visas _dienas tikšanās"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ievietot jaunu ierakstu par tikšanos"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Jaunkaledonija"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendārs:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Izveidot jaunu mapi"
@@ -4163,16 +4127,37 @@ msgstr "Nedēļas skats"
 msgid "Month View"
 msgstr "Mēneša skats"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Kopsavilkums satur"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Apraksts satur"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentāri satur"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Apraksts satur"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Neatbilstoši"
+
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Kļūda savienojoties ar kalendāra serveri"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Atļauja liegta"
@@ -4182,19 +4167,6 @@ msgstr "Atļauja liegta"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nevarēju atvērt mapi %s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, ko kalendārs parādīs"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Rādāmais skata tips"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Skaņas trauksmes opcijas"
@@ -4265,7 +4237,7 @@ msgstr "papildus laiks katras"
 msgid "hours"
 msgstr "stundas"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4284,14 +4256,14 @@ msgstr "Pamati"
 msgid "Date/Time:"
 msgstr "Datums/laiks:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Parādīt paziņojumu"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Spēlēt skaņu"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4307,6 +4279,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
 msgid "Summary:"
 msgstr "Kopsavilkums:"
@@ -4345,10 +4318,110 @@ msgstr "minūte(s)"
 msgid "start of appointment"
 msgstr "tikšanās sākums"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Jaunkaledonija"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Uzdevumu saraksts"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Jaunkaledonija"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tips:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "nedēļas"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Aktivizēts"
 
@@ -4364,19 +4437,19 @@ msgstr "Nepārvietot"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Deaktivizēt"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aktivizēt"
 
@@ -4401,164 +4474,177 @@ msgid "60 minutes"
 msgstr "60 minūtes"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Trauksmes"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Sākas:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Atgādinājumi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Kalendāra informācija"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Līdz:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Darba nedēļa"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Kalendāra un uzdevumu uzstādījumi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Krāsa neizpildītajiem uzdevumiem"
 
-#: 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 "Krāsas šodienas uzdevumiem"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Diena _beidzas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dienas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Attēlot"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktivizēt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Piekdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Stundas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minūtes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Pirmdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Sv"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sesdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Pa_rādīt atgādinājumu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Parādīt nedēļas _numurus datuma navigātorā"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Svēdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Šodien iz_pildāmie uzdevumi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "Ce_t"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Uzdevumu saraksts"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Ceturdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Laiks"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Laika _zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Laika formāts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Otradiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "N_edēļa sākas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Trešdiena"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Darba nedēļa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Darba dienas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 stundu (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 stundu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Pievienot ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Pr_asīt apstiprinājumu, kad dzēš priekšmetus"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Saspiest nedēļas mēneša skatā"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Diena sākas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Attēlot"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4568,146 +4654,46 @@ msgstr "_Attēlot"
 msgid "_Edit"
 msgstr "R_ediģēt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Brīvs/aizņemts pieprasījums"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Piek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Galvenais"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Slēpt izpildītos uzdevumus pēc"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Pir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "N_okavētie uzdevumi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Ses"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Parādīt tikšanos b_eigu laikus nedēļas un mēneša skatos"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Laika vienības:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "Ot_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Tre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "pirms katras tikšanās"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Jaunkaledonija"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Uzdevumu saraksts"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "iKalendāra kļūda"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Jaunkaledonija"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tips:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nedēļas"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4792,83 +4778,83 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Jūs neesat veicis izmaiņas, atjaunināt redaktoru?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Validācijas kļūda: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " uz "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Izpildīts "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Izpildīts"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Līdz "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Līdz"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nevarēju atjaunināt objektu"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Rediģēt tikšanos"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Tikšanās - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Uzdevums - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Žurnāla ieraksts - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nav kopsavilkuma"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Saglabāt kā..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Izmaiņas, izdarītas šajā priekšmetā, varētu tikt atceltas, ja atjauninājums "
 "atnāk caur epastu"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nevar dabūt pašreizējo versiju!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Validācijas kļūda: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " uz "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Izpildīts "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Izpildīts"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Līdz "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Līdz"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -5006,27 +4992,27 @@ msgstr "Deleģēt Uz:"
 msgid "Enter Delegate"
 msgstr "Ievadīt delegātu"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Tikšanās"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Atgādinājums"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Atkārtošanās"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Plānošana"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Sanāksme"
 
@@ -5038,7 +5024,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Sākuma datums ir nepareizs"
 
@@ -5128,10 +5114,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5150,15 +5136,15 @@ msgstr "Nepieciešams organizētajs."
 msgid "At least one attendee is required."
 msgstr "Tiek pieprasīts vismaz viens apmeklētājs."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Deleģēt uz..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5449,26 +5435,19 @@ msgstr ""
 msgid "Save Event"
 msgstr "Kalendāra notikumi"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Izvēlēties mapi"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Izvēlieties gala mērķa direktoriju, lai importētu šos datus"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalendārs"
+msgid "_Destination"
+msgstr "Dzēst šo mapi"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Uzdevumu saraksts"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5497,38 +5476,44 @@ msgid "% _Complete"
 msgstr "% izpildīts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Pabeigts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Augsts"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Progresā"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Zems"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normāls"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nav iesākts"
 
@@ -5566,11 +5551,11 @@ msgstr "_Web lapaspuses adrese:"
 msgid "Assignment"
 msgstr "Uzticējums"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Izpildes datums ir nepareizs"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nevaru atvērt adrešu gramatu"
@@ -5579,8 +5564,9 @@ msgstr "Nevaru atvērt adrešu gramatu"
 msgid "Con_fidential"
 msgstr "Konfidenciāli"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Apraksts:"
@@ -5735,101 +5721,56 @@ msgstr "%s iekš %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s nezināma palaidēja tipam"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Publisks"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privāts"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Konfidenciāls"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Beigu datums"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Sākuma datums"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Kopsavilkums"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Brīvs"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Aizņemts"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Z"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "D"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Nenosaukts"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "A"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Sākum_a datums:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "R"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Datuma laikā:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Ģeogrāfiskajai atrašanās vietai jābūt ievadītajai šādā formātā: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Statuss:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritāte:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nē"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Web lapaspuses adrese:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nezināms"
+#: 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 "Publisks"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Periodisks"
+#: 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 "Privāts"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Asignēts"
+#: 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 "Konfidenciāls"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5875,17 +5816,26 @@ msgstr "80%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Brīvs"
+
+#: 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 "Aizņemts"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Dzēšu izvēlētos objektus"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Atvērt"
 
@@ -5895,41 +5845,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Ievietot"
 
@@ -5987,78 +5938,157 @@ msgstr "Prioritāte"
 msgid "Start date"
 msgstr "Sākuma datums"
 
+#: 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 "Kopsavilkums"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Uzdevumu kārtošana"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Jauna _tikšanās...."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Jauns visas di_enas notikums"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Jauna sanāksme"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izvēlēties _pavedienu"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Dzēst..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopēt uz mapi..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pār_vietot uz mapi..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Plānot _sanāksmi..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Pārsūtīt kā iKalendāru..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Iet uz _dienu"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Iet uz datumu..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Uzstādījumi..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Beigu datums"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Nezināms"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Periodisks"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nē"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "Z"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "A"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "R"
+
+#: 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 ""
+"Ģeogrāfiskajai atrašanās vietai jābūt ievadītajai šādā formātā: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -6082,36 +6112,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minūšu sadaļas"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minūšu sadaļas"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6220,10 +6250,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Nekas</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Statuss:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6253,7 +6279,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6466,62 +6492,58 @@ msgstr "Piesaistne nesatur atļautu kalendāra ziņu"
 msgid "The attachment has no viewable calendar items"
 msgstr "Piesaistnei nav skatāmu kalendāra priekšmetu"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalendāra fails nevarēja tikt atjaunināts!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Atjaunināšana izpildīta\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Ir kļūda CORBA sistēmā\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objektu nevarēja atrast\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Apmeklētāja status atjaunināts\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Apmeklētāja status nevar tikt atjaunināts!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Izņemšana pabeigta"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Priekšmets nosūtīts!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Priekšmets nevar tikt nosūtīts!\n"
 
@@ -6638,28 +6660,6 @@ msgstr "Deleģēts"
 msgid "In Process"
 msgstr "Procesā"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Neatrodas Birojā"
@@ -6720,7 +6720,34 @@ msgstr "Sanāksmes _sākuma laiks:"
 msgid "Meeting _end time:"
 msgstr "Sanāksmes _beigu laiks:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Ievadiet %s paroli"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6729,21 +6756,19 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Atvērt uzdevumus uz %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6752,53 +6777,113 @@ msgstr ""
 "Kļūda %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Izpildam uzdevumus..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Dzēšam izvēlētos objektus..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Iztīru"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Uzdevumi"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nav tikšanos"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Ielādēju attēlus"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Atvērt ar %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turīna"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Šeit konfigurējiet jūsu laika zonu, kalendāru un uzdevumu sarakstu"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendārs un uzdevumi"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalendāra iTip/iMip skatītājs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution ziņu redaktors"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalendāra kopsavilkuma komponente."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Kopsavilkuma komponente."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendārs"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Uzdevumi"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprīlis"
@@ -6936,6 +7021,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Atļauja liegta"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nevaru atvērt adrešu gramatu"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7155,7 +7257,7 @@ msgid "Contacts: "
 msgstr "Kontakti:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Drukāšanas Pirmsapskats"
 
@@ -7167,68 +7269,78 @@ msgstr "Drukāt Priekšmetu"
 msgid "Print Setup"
 msgstr "Drukāšanas Uzstādijumi"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Ielādēju attēlus"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Uzdevums"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Jauns uzdevums"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Uzdevumu saraksts"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Ievietot jaunu uzdevumu"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Parādāmās uzdevumu mapes URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nevar ielādēt uzdevumus uz `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7240,11 +7352,11 @@ msgstr ""
 "\n"
 "Tiešām izdzēst šos uzdevumus?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Neprasiet man vēlreiz."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Drukāt uzdevumus"
 
@@ -8899,7 +9011,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Sagatavojam mapi '%s' nesaistei"
@@ -8992,33 +9104,6 @@ msgstr "Nepareizi argrumenti uz (user-flag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Kļūda sāknējot filtra meklēšanu: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nevaru parsēt meklēšanas izteiksmi: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Kļūda sāknējot meklēšanas izteiksmi: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) pieprasa vienu būla rezultātu"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Izpildu pieprasījumu uz nezināmas galvenes: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9051,7 +9136,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Saņemu %d vēstuli(es)"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nevaru parsēt meklēšanas izteiksmi: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Kļūda sāknējot meklēšanas izteiksmi: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) pieprasa vienu būla rezultātu"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) pieprasa vienu būla rezultātu"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) pieprasa vienu būla rezultātu"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Izpildu pieprasījumu uz nezināmas galvenes: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9062,15 +9192,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Neizdevās noparsēt gpg userid padomu."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Neizdevās noparsēt gpg paroļfrāzes pieprasījumu."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9079,27 +9209,27 @@ msgstr ""
 "Jums nepieciešama atslēgfrāze, lai atslēgtu atslēgu\n"
 "lietotājam: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Atsaukts."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Neizdevās atslēgt slepeno atslēgu: dotas 3 sliktas paroļfrāzes"
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Negaidīta atbilde no GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Neizdevās kodēt: Nav norādīti atļauti adresāti."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9110,87 +9240,67 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Neizdevās GPG %s vēstuli: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Neizdevās palaist gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Neizdevās palaist gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Nevaru pārbaudīt vēstules parakstu: nevarēju izveidot pagaidu failu: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nevaru pārbaudīt vēstules parakstu: nevarēju izveidot pagaidu failu: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Šī ir digitāli parakstītā vēstules daļa"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indeksa ķermenis satur"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nespēju saņemt vēstuli no redaktora"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nevaru būvēt noslēgošo palīga kanālu: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nevaru sazarot noslēgošo palīgu: %s"
-
-#: 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 "Nevarēju noslēgt '%s': protokola kļūda ar noslēgumpalīgu"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nevarēju noslēgt '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9212,6 +9322,26 @@ msgstr "Neizdevās dabūt slēgu lietojot fctl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Neizdevās dabūt slēgu lietojot flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nevaru būvēt noslēgošo palīga kanālu: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nevaru sazarot noslēgošo palīgu: %s"
+
+#: 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 "Nevarēju noslēgt '%s': protokola kļūda ar noslēgumpalīgu"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nevarēju noslēgt '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9456,7 +9586,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Slikta autentifikācijas atbilde no servera."
 
@@ -9657,7 +9787,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Sertifikāta ID:"
 
 #: camel/camel-smime-context.c:360
@@ -9674,7 +9804,7 @@ msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 msgid "Failed to add data to CMS encoder"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Neizdevās autentificēties.\n"
@@ -9745,99 +9875,99 @@ msgstr "Nevaru dabūt mapi: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Nevaru dabūt vēstuli: %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Sertifikāta paraksta neizdošanās"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Rediģēt parakstu"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Serveris: %s, Tips: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP komandas kļūda: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Neizdevās atrast sertifikātu \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Neizdevās atrast parasto bulk algoritmu."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nevarēja izveidot S/MIME atkodēšanas kontekstu."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Neizdevās nosūtīt serverim lietotāja vārdu"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komanda nav ievietota"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9854,16 +9984,26 @@ msgstr "Nevaru dabūt mapi: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nevaru izveidot mapi: Nepareiza operācija šajā glabātuvē"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Atkritummape"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9985,7 +10125,7 @@ msgstr "Atslēgu lietojums neatbalsta sertifikāta parakstīšanu"
 msgid "Error in application verification"
 msgstr "Kļūda aplikāciju pārbaudē"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9998,11 +10138,11 @@ msgstr ""
 "Parakstnospiedums:      %s\n"
 "Paraksts:               %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "LABS"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "SLIKTS"
 
@@ -10026,7 +10166,7 @@ msgstr ""
 "Vai jūs vēlaties akceptēt jebkurā gadījumā?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10041,7 +10181,7 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties akceptēt?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -10050,7 +10190,7 @@ msgstr ""
 "Sertifikāta problēma: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -10059,7 +10199,7 @@ msgstr ""
 "Slikts sertifikāta domēns: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10068,7 +10208,7 @@ msgstr ""
 "Sertifikāta der. laiks iztecējis: %s\n"
 "Izsniedzējs: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10080,17 +10220,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nevarēja noparsēt URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Kļūda glabājot `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nav tādas vēstules %s iekš %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 
@@ -10099,11 +10239,6 @@ msgstr "Nevar kopēt vai pārvietot vēstules virtuālajā mapē"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10120,10 +10255,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Jūs nevarat kopēt vēstules uz atkritumu mapi."
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Pārbaudam jauno pastu"
 
 #: 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 "Pārbaudam jaunas vēstules visās mapēs"
@@ -10157,6 +10294,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10176,26 +10314,324 @@ msgstr "Šī opcija savienos ar IMAP serveri lietojot parasta teksta paroli."
 msgid "Checklist"
 msgstr "Bieza dūmaka"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Negaidīta atbilde no IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %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 "Serveris negaidīti atvienojās: %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 "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nevar dabūt vēstuli: %s no mapes %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 ""
+"Nevar dabūt vēstuli: %s no mapes %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nevar pievienot vēstuli mh mapei: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nevar pievienot vēstuli mh mapei: %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 ""
+"Nevar dabūt vēstuli: %s no mapes %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 ""
+"Nevar dabūt vēstuli: %s no mapes %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 ""
+"Nevar dabūt vēstuli: %s no mapes %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 ""
+"Nevar dabūt vēstuli: %s no mapes %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 "Mapes"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Parādīt tikai parakstītās mapes"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Pārrakstīt servera piedāvātos mapju nosaukumlaukumus"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Vārdalauks"
+
+#: 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 "Lai lasītu un glabātu pastu uz IMAP serveriem."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP serviss priekš %s uz %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:140
+#: 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 "Nevarēja savienoties ar %s (ports %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Konekcija pārtraukta"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Nezināma kļūda"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nevarēju savienoties ar POP serveri %s: Pieprasītajam autentifikācijas "
+"mehānismam nav atbalsta."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sLūdzu ievadiet %s@%s SMTP paroli"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Neizdevās autentificēties POP serverī %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr ""
+"\n"
+"Komentāri: "
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nevar izdzēst mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nevar pārsaukt mapi: %s: Nepareiza operācija"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nevaru dabūt mapi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Negaidīta atbilde no IMAP servera: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Nav uzdevumu"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operācija atsaukta"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serveris negaidīti atvienojā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:1089
-msgid "Unknown error"
-msgstr "Nezināma kļūda"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10240,21 +10676,21 @@ msgstr "Nevar izveidot direktoriju %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nevar ielādēt %s kopsavilkumu"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mape tika iznīcināta un pārizveidota uz servera."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Meklējam izmainītās vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nespēju saņemt vēstuli: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10270,25 +10706,25 @@ msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nav tādas vēstules"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Šī vēstule šobrīd nav pieejama"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nevarēju atrast vēstules ķermeni FETCH atbildē."
 
@@ -10332,23 +10768,6 @@ msgstr ""
 "\n"
 "Komentāri: "
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapes"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Parādīt tikai parakstītās mapes"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Pārrakstīt servera piedāvātos mapju nosaukumlaukumus"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Vārdalauks"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Attiecināt filtrus uz jaunām vēstulēm INBOX šajā serverī"
@@ -10371,86 +10790,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP serveris %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP serviss priekš %s uz %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nevarēja savienoties ar %s (ports %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS nav pieejams"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Konekcija pārtraukta"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL sarunas neizdevušās"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Jūs neievadījāt paroli."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10461,25 +10837,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nav tādas mapes %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mapes nosaukums \"%s\" ir nepareizs, jo satur rakstzīmi \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10487,7 +10856,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nezināma vecāku mape: %s"
@@ -10592,58 +10961,58 @@ msgstr ""
 "Lokālā pasta lasīšanai un glabāšanai ārējos standarta mbox spoļu failos.\n"
 "Var tikt arī izmantots, lai lasītu Elm, Pine vai Mutt stila mapju kokus."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Glabātuves sakne %s nav absolūtais ceļš"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Glabātuves sakne %s nav regulāra direktorija"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Nevaru dabūt mapi: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokālajām glabātuvēm nav iesūtnes"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokālā pasta fails %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nevarēju pārsaukt mapi %s par %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nevarēju izdzēst mapes kopsavilkuma failu `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nevarēju izdzēst mapes indeksa failu `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10709,7 +11078,7 @@ msgstr "Nevarēju izdzēst mapi `%s': %s"
 msgid "not a maildir directory"
 msgstr "nav maildir direktorija"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11045,7 +11414,7 @@ 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:258
+#: 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
@@ -11054,8 +11423,8 @@ msgid "User cancelled"
 msgstr "Lietotājs atsaukts"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11064,49 +11433,49 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Kļūda automātiski glabājot vēstuli: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Jūs nevarat kopēt vēstules uz atkritumu mapi."
@@ -11226,7 +11595,7 @@ msgstr "Nevaru dabūt grupu: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Nevarēju sagatavot vēstuli: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11279,8 +11648,8 @@ msgstr "Nav vēstules ar uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Saņemu POP vēstuli %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nezināms iemesls"
 
@@ -11734,7 +12103,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "piesaistne"
 
@@ -11779,6 +12148,100 @@ msgstr "MIME tips:"
 msgid "Suggest automatic display of attachment"
 msgstr "Ieteikt automātisku piesaistnes attēlošanu"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Nevaru kodēt šo vēstuli: nav parastā teksta, ko kodēt"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nevar atvērt vēstuli"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nespēju saņemt vēstuli no redaktora"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Nenosaukta vēstule)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Atvērt failu"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autoģenerēts"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Paraksts:"
+
+#: 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.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 "Uzrakstīt vēstuli"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nevarēju izveidot sacerētāja logu:\n"
+"Neizdevās aktivizēt adrešu izvēlētāja kontroli."
+
+#: 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 ""
+"Nevarēju izveidot sacerētāja logu:\n"
+"Nespēju aktivizēt HTML redaktora komponenti.\n"
+"Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
+"un libgtkhtml pareizās versijas.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nevarēju izveidot sacerētāja logu:\n"
+"Nespēju aktivizēt HTML redaktora komponenti."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Publicējuma mērķis"
@@ -11862,109 +12325,82 @@ msgstr "<klikšķiniet šeit, lai izvēlētos mapi>"
 msgid "Attach file(s)"
 msgstr "Piesaistīt failu"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "_Vienmēr parakstīt izejošās vēstules, kad izmanto šo kontu"
-
-#: composer/e-msg-composer.c:701
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Nevaru kodēt šo vēstuli: nav parastā teksta, ko kodēt"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nevar atvērt vēstuli"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nespēju saņemt vēstuli no redaktora"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Nenosaukta vēstule)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Atvērt failu"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autoģenerēts"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Paraksts:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Piesaistīt failu vēstulei"
 
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Uzrakstīt vēstuli"
-
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Nevarēju izveidot sacerētāja logu:\n"
-"Neizdevās aktivizēt adrešu izvēlētāja kontroli."
 
-#: composer/e-msg-composer.c:3165
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 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"
+"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 ""
-"Nevarēju izveidot sacerētāja logu:\n"
-"Nespēju aktivizēt HTML redaktora komponenti.\n"
-"Lūdzu pārliecinieties, ka jums ir uzstādītas gtkhtml\n"
-"un libgtkhtml pareizās versijas.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nevarēju izveidot sacerētāja logu:\n"
-"Nespēju aktivizēt HTML redaktora komponenti."
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Nākošā _neizlasītā vēstule"
+
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"<b>(Sacerētājs satur neteksta vēstules ķermeni, kas nevar tikt rediģēts.)<b>"
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
+#: composer/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Nepārvietot"
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Izņemt"
+
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Nevarēju saglabāt paraksta failu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Kļūda glabājot saīsinājumus."
+
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Brīdinājums: Mainīta vēstule"
+
+#. 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 "
@@ -11973,101 +12409,53 @@ msgstr ""
 "Vai jūs esat pārliecināts, ka vēlaties dzēst informāciju par šo nenosaukto "
 "tikšanos?"
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "Nevar izveidot kanālu: %s"
-
-#: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nevarēju saglabāt paraksta failu: %s"
-
-#: composer/mail-composer-errors.xml.in.h:9
-#, fuzzy
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Nevarēju saglabāt paraksta failu: %s"
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
 msgid "Discard Changes"
 msgstr "Dinarda"
 
-#: composer/mail-composer-errors.xml.in.h:12
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Nepārvietot"
+msgid "Save Message"
+msgstr "Saglabāt vēstuli kā..."
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Kļūda glabājot saīsinājumus."
+msgid "Could not create message."
+msgstr "Nevar izveidot kanālu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+#. 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/mail-composer-errors.xml.in.h:16
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Recover"
-msgstr "Izņemt"
-
-#: composer/mail-composer-errors.xml.in.h:17
-#, fuzzy
-msgid "Save Message"
-msgstr "Saglabāt vēstuli kā..."
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nevarēju saglabāt paraksta failu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:20
-#, fuzzy
-msgid "Unfinished messages found"
-msgstr "Nākošā _neizlasītā vēstule"
-
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Brīdinājums: Mainīta vēstule"
-
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Piesaistīt failu vēstulei"
-
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12199,7 +12587,8 @@ msgstr ""
 "Fails ar šadu nosaukumu jau eksistē.\n"
 "Pārrakstīt to?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Pārrakstīt failu?"
 
@@ -12376,83 +12765,99 @@ msgstr "Izvēlieties laiku ar ko salīdzināt"
 msgid "_Filter Rules"
 msgstr "Filtra noteikumi"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Kļūda neregulārajā izteiksmē '%s':\n"
-"%s"
+msgid "Missing date."
+msgstr "Atjaunināta informācija par sanāksmi"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Jums jāizvēlās datumu."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
+msgid "Missing file name."
+msgstr "Atšķiramais _vārds:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Atjaunināta informācija par sanāksmi"
+msgid "You must specify a file name."
+msgstr "Jums ir jānorāda faila vārds"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "Atšķiramais _vārds:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Izņemu mapi %s"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Uzticējums"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "Jums ir jānorāda mape.\n"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Nav izvēlēts serveris"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Kļūda neregulārajā izteiksmē '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Jums jāizvēlās datumu."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Uzticējums"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Jums jānosauc šis filtrs."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Jums jānosauc šī vmape."
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Jums ir jānorāda faila vārds"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "Jums ir jānorāda mape.\n"
+msgid "No sources selected."
+msgstr "Nav izvēlēts serveris"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12465,66 +12870,11 @@ msgstr "Izvēlieties failu"
 msgid "<b>Then</b>"
 msgstr "<b>Līdz:</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Izvēlēties mapi"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Svarīgs"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Darāmais"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Vēlāk"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Tests"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Noteikuma nosaukums:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Nenosaukts"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Līdz:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Aktivizēt darbības"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "ja visi kritēriji sakrīt"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ja jebkuršs kritērijs sakrīt"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "ienākošais"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "izejošais"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12615,6 +12965,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Vēlāk"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Tests"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Noteikuma nosaukums:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Līdz:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ja visi kritēriji sakrīt"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ja jebkuršs kritērijs sakrīt"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Aktivizēt darbības"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Deleģēts"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Adresāti"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Atbildēts uz"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Iekļaut:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "ienākošais"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "izejošais"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12745,7 +13166,7 @@ msgstr "nav karogots"
 msgid "Junk Test"
 msgstr "Jūnijs"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Iezīme"
@@ -12785,7 +13206,7 @@ msgstr "Iziet no programmas"
 msgid "Play Sound"
 msgstr "Spēlēt skaņu"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Lasīt"
 
@@ -12855,9 +13276,9 @@ msgstr "sākas ar"
 msgid "Stop Processing"
 msgstr "Apturēt procesēšanu"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12921,114 +13342,65 @@ msgstr "Subjekts nesatur"
 msgid "Virtual _Folders"
 msgstr "Virtuālās mapes"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Pievienot"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "vMapes avoti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Sacerētāja preferences"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Šeit konfigurējiet jūsu epasta kontus"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution pasta sacerētājs."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution pasta mapes attēlošanas komponents."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution pasta izpildkopsavilkuma komponente."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Pasts"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Pasta konti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Pasta Preferences"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Noklusētais]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Konta nosaukums"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokols"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Bezvārda"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 #, fuzzy
 msgid "Language(s)"
 msgstr "Valoda"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Izvēlieties paraksta skriptu"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 #, fuzzy
 msgid "Signature(s)"
 msgstr "_Paraksti"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Pārsūtīta vēstule"
+
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Izveidot _virtuālo mapi no meklējuma..."
 
@@ -13066,277 +13438,457 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Mapes nosaukums:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "vMapes"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Iesūtne"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Ielādēju..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Pārvietot"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Atcelt uzdevumu"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izvēlieties mapi"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopēt"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Pārdēvēt \"%s\" mapi par:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Pārdēvēt mapi"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Skatīt"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Atvērt jaunā logā"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Pārvietot"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Jauna mape"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Pārsaukt"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "vMapes"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Iesūtne"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediģēt kā jaunu ziņojumu..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Drukāt"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Atbildēt uz _sarakstu"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Atbildēt _visiem"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Pārsūtīt"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "S_ekojums..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Ka_rodziņš pabeigts"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Notīrī_t karodziņu"
 
-#: mail/em-folder-view.c:787 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 "A_tzīmēt kā lasītu"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Atzīmēt kā ne_svarīgu"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Atzīmēt kā _nelasītu"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Atzīmēt kā _svarīgu"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Atdzēst"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Pār_vietot uz mapi..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopēt uz mapi..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Pievienot sūtītāju adrešu _grāmatai"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "A_ttiecināt filtrus"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtra noteikumi"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Izveidot noteikumu no vēstules"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VMape ar subjektu"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VMape ar sūtītāju"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Vmape a_r adresātiem"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VMape ar adresātu sarakstu"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "VMape ar sūtītāju"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrs uz subjektu"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrs uz sūtītāju"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrs uz saņēmējiem"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrs uz adresātu sarakstu"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtrs uz sūtītāju"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Noklusētais"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Drukāt vēstuli"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopēt saites lokāciju"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klikšķināt, lai pievienotu uzdevumu"
 
-#: mail/em-folder-view.c:2214
+#: 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 "No"
+
+#: 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 "Atbildēt-Uz"
+
+#: 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 "Kam"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s piesaistne"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Neatbalstīta shēma"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Neizdodas pārbaudīt lapas parakstu"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Neizdodas pārbaudīt lapas parakstu"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Klikšķināt, lai pievienotu uzdevumu"
+msgid "Retrieving `%s'"
+msgstr "Saņemu vēstuli %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Asignēts"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Rediģēt parakstu"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Rediģēt parakstu"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Pārtraukts"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "PGP kodējums"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Sliktformēta ārējā ķermeņa daļa."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Norāde uz FTP saiti (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Norāde uz lokālu failu (%s) atļautu saitē \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Norāde uz lokālu failu (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Norāde uz attālinātiem datiem (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Pārvietojam vēstules"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Pastnieks"
+
+#. 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 ""
+
+#. 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
@@ -13344,12 +13896,7 @@ msgstr "Klikšķināt, lai pievienotu uzdevumu"
 msgid "Matches: %d"
 msgstr "Atbilstumi:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Asignēts"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13358,12 +13905,7 @@ msgstr ""
 "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Rediģēt parakstu"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13372,258 +13914,112 @@ msgstr ""
 "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 "autnetiska."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Rediģēt parakstu"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Pārtraukts"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "PGP kodējums"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Sertifikāta ID:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifikāts vēl nav derīgs"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Nokavētie:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "līdz %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Skatīt iekļauti"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Slēpt"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "%d. lapa no %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Saņemu vēstuli %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Sliktformēta ārējā ķermeņa daļa."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Norāde uz FTP saiti (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Norāde uz lokālu failu (%s) atļautu saitē \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Norāde uz lokālu failu (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Norāde uz attālinātiem datiem (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Norāde uz nezināmiem ārējiem datiem (\"%s\" tips)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Pārvietojam vēstules"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "No"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Atbildēt-Uz"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kam"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Pastnieks"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datums"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s piesaistne"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nevarēju noparsēt MIME vēstuli. Attēloju kā avotu."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Neatbalstīta shēma"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Neizdodas pārbaudīt lapas parakstu"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Neizdodas pārbaudīt lapas parakstu"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Katru gadu"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Viena diena"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Viena n_edēļa"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Viens _mēnesis"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13631,26 +14027,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Neizdevās keišot %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Neizdevās keišot %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Nevar meklēt failā: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, 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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Neizdevās izveidot kanālu %s: %s"
 
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Saglabāt kā..."
@@ -13660,99 +14086,83 @@ msgstr "Saglabāt kā..."
 msgid "untitled_image.%s"
 msgstr "Nenosaukta vēstule"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Atbildēt sūtītājam"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Kopēt saiti pārlūkprogrammā"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sūtīt _vēstuli uz saraksti..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pievienot adrešu grāmatu"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Atvērt ar %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Šis serveris neatbalsta LDAPv3 shēmas informāciju"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Pierakstīties"
 
-#: mail/em-subscribe-editor.c:637 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 "Mape"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Lūdzu izvēlieties serveri."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nav izvēlēts serveris"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Nerādīt šo ziņu vēlreiz."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Pārsūtīta vēstule"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%Y-%m-%d at %H:%M, %%s rakstīja:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Vēstule"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Saglabāt vēstuli kā..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "_Adrese:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Pasts no %s"
@@ -13772,11 +14182,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13890,167 +14300,168 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Pasta konti"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Pasta konti"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Reģistrēt filtra darbības:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Noklusētā prioritāte:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Ziņošana par jaunu pastu"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "_Norādīt, kad sūta HTML vēstules kontaktiem, kuri to nevēlas"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Norādīt, kad sūta vēstules tikai ar norādītiem _bcc adresātiem"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14106,8 +14517,9 @@ msgid "Spell check inline"
 msgstr "_Pareizrakstības pārbaude"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Noklusētā prioritāte:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14250,37 +14662,70 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importēt"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution pasta sacerētājs."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution pasta sacerētājs."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Sacerētāja preferences"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
+"Šeit konfigurējiet pasta preferences, ieskaitot drošību un vēstuļu attēlošanu"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Šeit konfigurējiet pareizrakstības pārbaudi, parakstus un vēstuļu sacerētājam"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Šeit konfigurējiet jūsu epasta kontus"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Evolution pasta sacerētājs."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Ražotne Evolution Kopsavilkuma konfigurācijas kontrolei."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution pasta izpildkopsavilkuma komponente."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Pasta konti"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Pasta Preferences"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Pasts"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14288,15 +14733,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Lūdzu uzgaidiet"
 
@@ -14328,19 +14773,51 @@ msgid "Select folder to import into"
 msgstr "Izvēlēties mapi"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importējam"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importējam failus"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution pasta sacerētājs."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Skanējam %s"
@@ -14350,7 +14827,7 @@ msgstr "Skanējam %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritātes filtrs \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14376,7 +14853,7 @@ msgstr ""
 "vietā. Pārbaudiet importētos filtrus, lai pārliecinātos,\n"
 "kas viss strādā kā plānots."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14388,7 +14865,7 @@ msgstr ""
 "\"Watch Thread\" (Skatīt pavedienu)\n"
 "iespēju, kas netiek atbalstīta Evolution. Šie filtri tiks ignorēti."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14402,24 +14879,24 @@ msgstr ""
 "tiks pārveidoti ar vienkāršu testu, kas pārbaudīs, vai virkne ir\n"
 "vai nav vēstules ķermenī."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importē jūsu vecos Netscape datus"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Pasta filtri"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14453,128 +14930,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution kontu redaktors"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Hosts:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Lietotājvārds:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Ceļš:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pasts uz %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subjekts ir %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pasts no %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s pasta sarakste"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Atbildēts uz"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Pievienot filtra noteikumus"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d izvēlētas"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d nenosūtītas"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Melnraksti"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d nosūtītas"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d nenosūtītas"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d kopā"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d nenosūtītas"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d izvēlētas"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Jauna pasta vēstule"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Pasta vēstule"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Sacerēt jaunu pasta vēstuli"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Jauna vMape"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Pasta filtri"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Izveidot jaunu mapi"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, ko kalendārs parādīs"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Pārbaudam servisu"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Savienojamies ar serveri..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitāte"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14584,13 +15072,13 @@ msgstr ""
 "tikt neaizpildīti, kāmēr jūs nevēlaties iekļaut šo informāciju epastā ko "
 "nosūtāt."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Saņemot pastu"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14599,16 +15087,16 @@ msgstr ""
 "neesat pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet "
 "servisa piegādātājam."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Lūdzu izvēlieties starp sekojošām opcijām"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "_Sūtot pastu"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14617,11 +15105,11 @@ msgstr ""
 "pārliecināti, prasiet jūsu sistēmu administrātoram vai Internet servisa "
 "piegādātājam."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontu pārvaldība"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14635,14 +15123,6 @@ msgstr ""
 "kontu. Lūdzu ievadiet konta nosaukumu laukumā zemāk. Šis nosaukums tiks "
 "izmantots tikai attēlošanas nolūkos."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Pārbaudam servisu"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Savienojamies ar serveri..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14962,7 +15442,8 @@ msgid "Execute Command..."
 msgstr "Izpildīt komandu..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Fiksē_ts -platums:"
 
 #: mail/mail-config.glade.h:82
@@ -15292,351 +15773,456 @@ msgstr "krāsa"
 msgid "description"
 msgstr "apraksts"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autentifikācija"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s."
+
+#. 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-errors.xml.in.h:2
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
+#. 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 "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules atsevišķos "
-"logos?"
+"Jūs sūtat HTML formatētu vēstuli. Lūdzu pārliecinieties, vai\n"
+"sekojoši adresāti vēlas un spēj saņemt HTML pastu:\n"
 
-#: mail/mail-errors.xml.in.h:5
+#: 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 ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Nekavējoties izdzēst visas dzēstās vēstules no visām mapēm"
+msgid "_Send"
+msgstr "Sūtīt"
 
-#: mail/mail-errors.xml.in.h:6
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-errors.xml.in.h:7
-#, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
+#. 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-errors.xml.in.h:8
+#. 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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Vai jūs vēlaties pārsūtīt vēlreiz visas %d vēstules?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nevaru nokopēt mapi: %s"
+msgid "Use default drafts folder?"
+msgstr "Atveru noklusēto uzdevumu mapi"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Nevaru dabūt mapi: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Nevaru atvērt melnraksta mapi šim kontam.\n"
+"Vai jūs vēlaties izmantot noklusēto melnrakstu mapi?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nevar izveidot pagaidu direktoriju: %s"
+msgid "Use _Default"
+msgstr "Noklusētais"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Nevar izveidot direktoriju\n"
-"%s\n"
-"Kļūda: %s"
+"Vai jūs esat pārliecināts, ka vēlaties atvērt visas %d vēstules atsevišķos "
+"logos?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Nevaru izdzēst mapi:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
+msgid "_Expunge"
+msgstr "_Iztīrīt"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Mape '%s' neeksistē."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Nekavējoties izdzēst visas dzēstās vēstules no visām mapēm"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Nevaru pārvietot mapi: %s"
+msgid "_Empty Trash"
+msgstr "Iztukšot _Atkritumkasti"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Nevar atvērt koplietošanas mapi: `%s'."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Jums ir nenosūtītas vēstules, vai jūs vēlaties iziet jebkurā gadījumā?"
+
+#. 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-errors.xml.in.h:22
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Nevar atvērt koplietošanas mapi: `%s'."
+msgid "Error while {0}."
+msgstr ""
+"Kļūda kamēr '%s':\n"
+"%s"
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Nevar atvērt vēstuli"
+msgid "Error while performing operation."
+msgstr ""
+"Kļūda izpildot operāciju:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
+msgid "Enter password."
+msgstr "Ievadiet paroli"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Kļūda ielādējot filtra informāciju:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nevar izveidot direktoriju %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Nevar dabūt vēstuli: %s\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Izvēlieties paraksta skriptu"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Nevar izveidot direktoriju\n"
+"%s\n"
+"Kļūda: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Nevarēju saglabāt paraksta failu: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Dzēst \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Dzēst kontaktu"
+msgid "Cannot create temporary save directory."
+msgstr "Nevar izveidot pagaidu direktoriju: %s"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Nedzēst"
+msgid "File exists but cannot overwrite it."
+msgstr "Fails eksistē, pārrakstīt?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Ievadiet paroli"
+msgid "File exists but is not a regular file."
+msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Kļūda ielādējot filtra informāciju:\n"
+"Nevaru izdzēst mapi:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Kļūda izpildot operāciju:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Nevar izdzēst mapi: %s: Nav tādas mapes"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Kļūda kamēr '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Fails eksistē, pārrakstīt?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Nevar pārsaukt mapi: %s: Nav tādas mapes"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Fails '%s' neeksistē vai arī nav regulārs fails."
+msgid "Delete \"{0}\"?"
+msgstr "Dzēst \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Patiešām izdzēst mapi \"%s\"?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autentifikācija"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Nevaru pārvietot mapi: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Nevar atvērt koplietošanas mapi: `%s'."
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Nevar atvērt vēstuli"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Nevaru nokopēt mapi: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Jūs sūtat HTML formatētu vēstuli. Lūdzu pārliecinieties, vai\n"
-"sekojoši adresāti vēlas un spēj saņemt HTML pastu:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nevaru dabūt mapi: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Patiešām izdzēst mapi \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Nevar atvērt koplietošanas mapi: `%s'."
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Jūs neesat aizpildijis visu pieprasīto informāciju."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Jūs nevarat izveidot divus kontus ar vienādiem nosaukumiem."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Dzēst kontaktu"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Vai jūs esat pārliecināts, ka vēlaties izdzēst šo kontu?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Sekojošas vMapes:\n"
-"%sIzmantoja izdzēsto mapi:\n"
-"    '%s'\n"
-"Un tagad tiek atjauninātas."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Nedzēst"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Sekojošas vMapes:\n"
-"%sIzmantoja izdzēsto mapi:\n"
-"    '%s'\n"
-"Un tagad tiek atjauninātas."
+msgid "Could not save signature file."
+msgstr "Nevarēju saglabāt paraksta failu: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Izvēlieties paraksta skriptu"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP serveris %s neatbalsta pieprasīto autentifikācijas tipu %s."
+msgid "Do you wish to save your changes?"
+msgstr "Vai jūs vēlaties saglabāt izmaiņas?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15644,85 +16230,97 @@ msgstr ""
 "\n"
 "Vai jūs vēlaties saglabāt jūsu izmaiņas?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
-"Nevaru atvērt melnraksta mapi šim kontam.\n"
-"Vai jūs vēlaties izmantot noklusēto melnrakstu mapi?"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use _Default"
-msgstr "Noklusētais"
-
-#: mail/mail-errors.xml.in.h:65
-#, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Atveru noklusēto uzdevumu mapi"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Jūs neesat aizpildijis visu pieprasīto informāciju."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Jums ir nenosūtītas vēstules, vai jūs vēlaties iziet jebkurā gadījumā?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Jūs nevarat izveidot divus kontus ar vienādiem nosaukumiem."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Mape '%s' neeksistē."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Iztukšot _Atkritumkasti"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Sekojošas vMapes:\n"
+"%sIzmantoja izdzēsto mapi:\n"
+"    '%s'\n"
+"Un tagad tiek atjauninātas."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Iztīrīt"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Sūtīt"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Sekojošas vMapes:\n"
+"%sIzmantoja izdzēsto mapi:\n"
+"    '%s'\n"
+"Un tagad tiek atjauninātas."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Pārrakstīt"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspena"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Ehotestējam %s"
@@ -15731,135 +16329,135 @@ msgstr "Ehotestējam %s"
 msgid "Working"
 msgstr "Strādāju"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrējam mapi"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Pasta saņemšana"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neizdevās saglabāt pastu pagaidu failā %s: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sūtam %d. vēstuli no %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Neizdevās atkodēt vēstuli."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Izpildīts."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Saglabāju vēstuli mapē"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Pārvietoju vēstules uz %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopēju vēstules uz %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Skanēju mapes \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Pārsūtītās vēstules"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Atveru glabātuvi %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Izņemu mapi %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Glabāju mapi '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Atjauninu mapi"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Iztīru mapi"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Importējam %s kā %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokālās mapes"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Saņemu vēstuli %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15868,7 +16466,7 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15877,11 +16475,11 @@ msgstr ""
 "Kļūda glabājot vēstules uz: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Saglabājam piesaistni"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15890,17 +16488,17 @@ msgstr ""
 "Nevaru izveidot izejas failu: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nevarēju ierakstīt datus: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Atvienojos no %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Pārvienojos ar %s"
@@ -15966,24 +16564,24 @@ msgstr "Atjauninu..."
 msgid "Waiting..."
 msgstr "Gaidu..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Lietotājs atsauca operāciju."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ievadiet %s paroli"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Ievadiet paroli"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Atcerēties šo paroli"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Atcerēties šo paroli uz visu atlikušo sesijas laiku"
 
@@ -16025,89 +16623,94 @@ msgstr "Pārsūtīta vēstule"
 msgid "Invalid folder: `%s'"
 msgstr "Atveru mapi %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Uzstādu vmapi: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Atjauninu vmapes priekš uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Atjauninu vmapes priekš uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMapes"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Rediģēt vMapi"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Jauna vMape"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Neredzēta"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Redzēta"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Atbildēta"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Vairākas neredzētas vēstules"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Vairākas vēstules"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Zemākais"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Zemāk"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Augstāk"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Augstākais"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Šodien %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Vakardien %I:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Izveidoju vēstuļu sarakstu"
 
@@ -16139,43 +16742,43 @@ msgstr "Saņemts"
 msgid "Size"
 msgstr "Izmērs"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Izsaukums"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Neparsūtīt (Do Not Forward)"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Sekojums"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Jūsu zināšanai (For Your Information)"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Pārsūtīt"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Nav nepieciešama atbilde (No Response Necessary)"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Atbildēt"
 
-#: mail/message-tag-followup.c:70 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 "Atbildēt Visiem"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Apskats"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Karogs sekojumam"
 
@@ -16223,21 +16826,6 @@ msgstr "_Parakstīties"
 msgid "_Unsubscribe"
 msgstr "_Atrakstīties"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution čaula."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution Kopsavilkuma komponente."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16245,111 +16833,55 @@ msgstr "380"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Pārdēvēt saīsinājumu grupu"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Norādīt, vai tiek rādīta mapes josla"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Paslēpt saīsinājumjoslu"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Noklusētā prioritāte:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Noklusētā prioritāte:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Pasta konfigurēšanas saskarne"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Atzīmēt piesaistni, lai tā tiktu rādīta iekļauti pēc noklusējuma."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Atveru noklusēto uzdevumu mapi"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Atveru noklusēto uzdevumu mapi"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Atveru noklusēto uzdevumu mapi"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Atveru noklusēto uzdevumu mapi"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Norādīt, vai tiek rādīta mapes josla"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Epasts"
@@ -16358,6 +16890,32 @@ msgstr "Epasts"
 msgid "Brought to you by"
 msgstr "Piedāvā jums"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Nezināma kļūda"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Nepareizi argrumenti"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Nevar reģistrēties uz OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Konfigurāciju datubāze nav atrasta"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Vispārēja kļūda"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Nenosaukts)"
@@ -16498,11 +17056,11 @@ msgstr "Neizdevās palaist gpg."
 msgid "_Import"
 msgstr "Importēt"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Aizvērt savienojumus..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution Uzstādījumi"
 
@@ -16541,11 +17099,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution ieiet nesaistes režīmā."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pasts uz %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Kļūda sāknējot %s."
@@ -16560,14 +17142,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy nevar tikt palaists."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Par Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Strādāt tiešsaistē"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Strādāt nesaistē"
 
@@ -16575,48 +17158,6 @@ msgstr "_Strādāt nesaistē"
 msgid "Work Offline"
 msgstr "Strādāt nesaistē"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution ieiet nesaistes režīmā."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Nepareizi argrumenti"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Nevar reģistrēties uz OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfigurāciju datubāze nav atrasta"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Vispārēja kļūda"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Izvēles rūtiņa"
@@ -16692,6 +17233,44 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Klikšķiniet 'Labi', lai aizvērtu šos savienojumus un ietu nesaistes režīmā"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendārs:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakti:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Pasts:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Uzdevumi:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Mapes tips:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Atvērt cita lietotāja mapi"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Konts:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mapes nosaukums:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Lietotājs:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution uzstādīšanas asistents"
@@ -16736,6 +17315,21 @@ msgstr ""
 "\n"
 "Klikšķināt \"Beigt\" pogu, lai saglabātu uzstādijumus. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution čaula."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution Kopsavilkuma komponente."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikšķināt \"Importēt\" lai sāktu faila importēšanu Evolution. "
@@ -16800,13 +17394,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution var importēt datus no sekojošiem failiem:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16835,58 +17429,49 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Paldies\n"
 "Ximian Evolution Komanda\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nesakiet man vēlreiz"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Nevar atvērt Ximian Evolution čaulu."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Nevaru inicializēt Ximian Evolution čaulu: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Startēt nesaistes režīmā"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Startēt tiešsaistes režīmā"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Forsēt konfigurācijas failu atjaunināšanu no Evolution versijas 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Sūtīt visu atkļudošanas informāciju no visiem komponentiem uz failu."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16895,14 +17480,80 @@ msgstr ""
 "%s: --online un --offline nevar tikt lietoti kopā.\n"
 "  Izmantojiet %s --help, lai iegūtu vairāk informācijas.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Nevar atvērt Ximian Evolution čaulu."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution kontu asistents"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikāta ID:"
@@ -17155,12 +17806,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifikāta ID:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kartes ID jau eksistē"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17383,6 +18028,12 @@ msgstr "Subjekts ir %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kartes ID jau eksistē"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17424,12 +18075,12 @@ msgstr "Vēstules noklusētais subjekts."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nevarēju pārsaukt '%s': %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17493,7 +18144,8 @@ msgid "Select all contacts"
 msgstr "Izvēlēties visus kontaktus"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Sūtīt vēstuli izvēlētajiem kontaktiem."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17525,8 +18177,8 @@ msgstr "Parādīt pašreizējo kontaktu"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Darbības"
@@ -17544,7 +18196,8 @@ msgid "_Preview Pane"
 msgstr "_Apskata lauks"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Saglabāt kā Vkarti"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17679,11 +18332,21 @@ msgstr "Parādīt pašreizējo kontaktu"
 msgid "Week"
 msgstr "Nedēļa"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Darba nedēļa"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Tikšanās"
 
+#: 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 "Aiz_vērt"
+
 #: 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
@@ -18012,6 +18675,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Aizvērt"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18258,7 +18931,8 @@ msgid "Open the selected message in a new window"
 msgstr "Atvērt izvēlēto vēstuli jaunā logā"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Atvērt norādīto vēstuli sacerētājā, lai to pārsūtītu"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18376,58 +19050,46 @@ msgstr "VMape pēc _subjekta..."
 msgid "_Attached"
 msgstr "_Piesaistīt"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopēt uz mapi"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Izveidot filtru no vēstules"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Ej uz "
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Iekļaut"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Lielāks"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Vēstules attēlošana"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Pārvietot uz mapi"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Nākošā vēstule"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normāla attēlošana"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Atvērt vēstuli"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Iepriekšējā vēstule"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citēts"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Pārsūtīt..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Rīki"
@@ -18436,16 +19098,6 @@ msgstr "_Rīki"
 msgid "_Undelete"
 msgstr "_Atdzēst"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Aizvērt"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Piesaistīt"
@@ -18843,6 +19495,11 @@ msgstr "Pasta Preferences"
 msgid "_Send / Receive"
 msgstr "_Sūtīt / Saņemt"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Meklēt Tagad"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Pēc _kompānijas"
@@ -18916,10 +19573,6 @@ msgstr "_Datuma laikā:"
 msgid "With _Status"
 msgstr "Uzstādīt statusu"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Uzdevumi"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19081,6 +19734,34 @@ msgstr "Cita..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informācija par sanāksmi"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution Kopsavilkuma komponente."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Nosūtītās un melnraksta vēstules"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19201,6 +19882,35 @@ msgstr "Tests"
 msgid "Find _Now"
 msgstr "Meklēt tagad"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 jau eksistē\n"
+"Vai tu vēlies to pārrakstīt?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Nevar dabūt vēstuli: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Nevar dabūt vēstuli: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19212,8 +19922,135 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% izpildīts)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Adrešu grāmata"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution adrešu grāmatas minikaršu skatītājs"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adrese _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bologna"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution kalendāra iTip/iMip skatītājs"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution ziņu redaktors"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nespēju inicializēt gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nevarēju atvērt mapi %s"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, ko kalendārs parādīs"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Rādāmais skata tips"
+
+#~ msgid "Display a message"
+#~ msgstr "Parādīt paziņojumu"
+
+#~ msgid "Alerts"
+#~ msgstr "Trauksmes"
+
+#~ msgid "Time"
+#~ msgstr "Laiks"
+
+#~ msgid "_General"
+#~ msgstr "_Galvenais"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Izvēlēties mapi"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalendārs"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Uzdevumu saraksts"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalendāra fails nevarēja tikt atjaunināts!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Parādāmās uzdevumu mapes URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nevar ielādēt uzdevumus uz `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution pasta mapes attēlošanas komponents."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "VMape ar sūtītāju"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrs uz sūtītāju"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Neizdevās keišot %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Neizdevās keišot %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Neizdevās izveidot kanālu %s: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, ko kalendārs parādīs"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Pārdēvēt saīsinājumu grupu"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Paslēpt saīsinājumjoslu"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Atveru noklusēto uzdevumu mapi"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Atveru noklusēto uzdevumu mapi"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Atveru noklusēto uzdevumu mapi"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Atveru noklusēto uzdevumu mapi"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Norādīt, vai tiek rādīta mapes josla"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Norādīt, vai tiek rādīta saīsinājumu josla"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Nevaru inicializēt Ximian Evolution čaulu: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Pārsūtīt..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19400,9 +20237,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Dzīvesbiedrs:"
 
-#~ msgid "_Add"
-#~ msgstr "_Pievienot"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Darījumi"
@@ -19527,18 +20361,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ "par serveri. Lūdzu sazinieties ar jūsu sistēmu administrātoru ja jums \n"
 #~ "ir nepieciešama palīdzība, meklējot šo informāciju."
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Sākum_a datums:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Datuma laikā:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioritāte:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19569,14 +20391,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ "Nevar samazināt failu: %s\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nevar meklēt failā: %s\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19726,10 +20540,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Parāda kalendāru, kāds tas tiks drukāts"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Ievadiet %s paroli"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Uzdevumu saraksts"
 
@@ -19789,31 +20599,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Nevar atrast norādīto koplietošanas mapi."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendārs:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Pasts:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Uzdevumi:"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Mapes tips:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Atvērt cita lietotāja mapi"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konts:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mapes nosaukums:"
-
-#~ msgid "_User:"
-#~ msgstr "_Lietotājs:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Izveidot jaunu sanāksmes pieprasījumu"
@@ -20142,9 +20927,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Asistents"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Pašreizējie aktīvie savienojumi ir:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Meklēt kontaktus"
 
@@ -20387,9 +21169,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ "Šī vēstule ir digitāli parakstīta, bet nevar tikt pārbaudīta, vai ir "
 #~ "autnetiska."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution kļūda "
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20521,18 +21300,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Kalendāra informācija"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Atgādinājumi"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Sākas:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Kalendāra informācija"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klasifikācija"
 
@@ -21591,10 +22358,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgstr "Šeit konfigurējiet Evolution Kopsavilkuma izskatu"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolution Kopsavilkuma komponente."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolution Kopsavilkuma komponente."
 
@@ -21998,9 +22761,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Asia"
 #~ msgstr "Āzija"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspena"
-
 #~ msgid "Asswan"
 #~ msgstr "Asvāna"
 
@@ -23051,9 +23811,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -23117,9 +23874,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Creston"
 #~ msgstr "Krestona"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -26102,9 +26856,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Nogales"
 #~ msgstr "Nogalesa"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolka"
 
@@ -28909,9 +29660,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Shown"
 #~ msgstr "Parādīts"
 
-#~ msgid "No tasks"
-#~ msgstr "Nav uzdevumu"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Nav apraksta)"
 
@@ -30003,9 +30751,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Delete news feed"
 #~ msgstr "Dzēst ziņu barotni"
 
-#~ msgid "_Mail"
-#~ msgstr "_Pasts"
-
 #~ msgid "_Weather"
 #~ msgstr "_Laikapstākļi"
 
@@ -31342,9 +32087,6 @@ msgstr "%s (%d%% izpildīts)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Nevarēju atvērt direktoriju ziņu serverim: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Nespēju atvērt vai izveidot .newsrc failu %s: %s"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Nevarēju pārbaudīt jaunās vēstules POP serverī: %s"
 
diff --git a/po/mn.po b/po/mn.po
index cf801d4cae..f31ff835bb 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,15 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Эвелюшин хаягийн дэвтэр"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Эволюшин сэрүүлэг"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -46,15 +55,6 @@ msgstr "картууд"
 msgid " card"
 msgstr "картууд"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Эволюшин сэрүүлэг"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr ""
@@ -69,63 +69,20 @@ msgstr "Хаягийн дэвтрийг ачааллаж чадсангүй"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Автоматаар гүйцээх"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Батламж"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Холбоонууд"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Эвелюшин хаягийн дэвтэр"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Эвелюшин хаягийн дэвтрийн хаяг үзүүлэгч"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr ""
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Эвелюшин хаягийн дэвтрийн бүрэлдэхүүн хэсэг"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Эволюшин хаягийн дэвтрийн хавтас үзүүлэгч"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Эволюшин хавтасны тохируулгын тохиргууны удирдлага"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Баталгаажуулалт хийж чадсангүй.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -166,41 +123,45 @@ msgstr "_Холбоо"
 msgid "Create a new contacts group"
 msgstr "Шинэ холбоо үүсгэх"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP серверээр баталгаажуулж чадсангүй"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr ""
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -208,8 +169,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Энэ компьютер дээр"
 
@@ -217,7 +178,7 @@ msgstr "Энэ компьютер дээр"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Хувийн"
@@ -266,20 +227,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP серверт нэргүй хэрэглэгчээр хандаж байна"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Баталгаажуулалт хийж чадсангүй.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Шинэ хаягийн дэвтэр"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
+#: 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
+#: 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
+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
+#: 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 "Холбоонууд"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -299,6 +282,60 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Автоматаар гүйцээх"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Холбоонууд"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Батламж"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Автомат гүйцээлтийг энд тохируул"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Эвелюшин хаягийн дэвтэр"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Эвелюшин хаягийн дэвтрийн хаяг үзүүлэгч"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Эвелюшин хаягийн дэвтрийн бүрэлдэхүүн хэсэг"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr ""
@@ -320,6 +357,7 @@ msgstr ""
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -392,7 +430,7 @@ msgstr "_Холбоо"
 msgid "Address Book Properties"
 msgstr "Хаягийн дэвтэр"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Үргэлж"
@@ -407,112 +445,102 @@ msgid "Basic"
 msgstr "Энгийн"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Коморск"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Холбогдож байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Татаж авах хязгаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Дэмжигдсэн хайлтын сууриуд"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ерөнхий"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Хэзээ ч"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Нэг"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr ""
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Хайх _хүрээ"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Хайх _хүрээ"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Хайж байна"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -523,7 +551,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -532,19 +560,19 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Дэд"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Дэмжигдсэн хайлтын сууриуд"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -552,7 +580,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -562,34 +590,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -597,127 +625,134 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Цагийн хэлбэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "SSL/TLS ашиглах:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Ц-шуудангийн хаяг ашиглан"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Хэзээ ч боломжтой"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Холбоо"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Татаж авах хязгаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Ц-шуудангийн хаяг:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Нэвтрэх арга:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Портын дугаар:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Давуу эрх:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Хайлтын суурь:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Серверийн нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Серверийн нэр:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "картууд"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "минут"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr ""
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:208
-msgid "Remove All"
-msgstr "Бүгдийг устгах"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Бүгдийг устгах"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Холбооны жагсаалтыг үзүүлэх"
@@ -740,21 +775,14 @@ msgstr "Холбоонуудад нэмэх"
 msgid "Unnamed Contact"
 msgstr "Нэргүй холбоо"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Эх үүсвэр"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
+#: 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
@@ -828,141 +856,142 @@ msgid "<b>Work</b>"
 msgstr "<b>Ажлын долоо хоног</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Хаяг _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Хаяг:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ойн _баяр:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Туслах"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Төрсөн _өдөр:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Хуанли:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Х_от:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "_Компаниар"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Холбооны засварлагч"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Улс:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Хэлтэс:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Чөлөөтэй/завгүй URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Бүтэн _нэр..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Гэрийн"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "_Дараагийн зурвас"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Ц-шуудангийн хаяг"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Зохион байгуулагч"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Хоч:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Т_эмдэглэлүүд:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Бусад"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Шуудангийн хайрцаг:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -988,9 +1017,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Ажилын"
@@ -1023,23 +1052,35 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Засварлагдах"
 
@@ -2018,95 +2059,113 @@ msgstr "Замби"
 msgid "Zimbabwe"
 msgstr "Зимбаб"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-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-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Бүлэг"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Эх дэвтэр"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Өөрчлөгдсөн"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Негр"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 ""
 
+#: 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:280
 msgid "Contact Quick-Add"
 msgstr ""
@@ -2124,18 +2183,6 @@ msgstr "_Бүтэн нэр:"
 msgid "E-_mail:"
 msgstr "_Ц-шуудан:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Хаяг _2:"
@@ -2285,8 +2332,8 @@ msgstr ""
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Дэвтэр"
 
@@ -2343,6 +2390,424 @@ msgstr ""
 msgid "Advanced Search"
 msgstr ""
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Гишүүдийг жагсаах"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Ц-шуудан"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Байгууллага"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Тайлбар"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Бүлэг"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Машины утас"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Ажилын"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Гар утас"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Хувийн"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Тэмдэглэл"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Албан тушаал"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Ц-шуудан"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Вэб хуудас"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Амжилттай"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr ""
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Хаягийн дэвтэр"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Зөвшөөрөгдөөгүй"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Холбоо олдсонгүй"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr ""
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr ""
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Цуцлагдсан"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "`%s' хавтсыг нээж чадахгүй байна"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Баталгаажуулж чадсангүй"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Баталгаажуулах хэрэгтэй"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Бусад алдаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, 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/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 ""
+
+#: 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 ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, 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:141
+msgid "Unable to open addressbook"
+msgstr "Хаягийн дэвтрийг нээх боломжгүй"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "Жагсаалтыг нэмэхэд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Холбоо нэмэхэд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Жагсаалтыг өөрчлөхөд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Жагсаалтыг устгахад алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Холбоог устгахад алдаа гарлаа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "жагсаах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Холбоог зөөх"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Холбоог хуулах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Холбоонуудыг зөөх"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Холбоонуудыг хуулах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Хаягийн дэвтэрт хадгалах"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+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
+#. * 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 ""
+
+#: 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
+msgid "Show Full VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Хаягийн дэвтэрт хадгалах"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Холбоо алга"
@@ -2357,8 +2822,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Хүсэлт"
 
@@ -2413,10 +2878,11 @@ msgstr "Хаягийн дэвтэр"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "Save as VCard..."
+msgstr "Нэрээр хадгалах..."
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
 msgid "New Contact..."
@@ -2483,7 +2949,7 @@ msgid "Cut"
 msgstr "Хайчлах"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2494,18 +2960,8 @@ msgstr "Хуулах"
 msgid "Paste"
 msgstr "Буулгах"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Устгах"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Одоогийн үзэмж"
 
@@ -2518,7 +2974,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr ""
@@ -2559,21 +3015,6 @@ msgstr ""
 msgid "Company Phone"
 msgstr "Компанийн утас"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Ц-шуудан"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Ц--шуудан 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Ц--шуудан 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Овог"
@@ -2610,29 +3051,14 @@ msgstr "Сэтгүүл"
 msgid "Manager"
 msgstr "Зохион байгуулагч"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Гар утас"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Хоч"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Тэмдэглэл"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Байгууллага"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Бусад факс"
@@ -2684,21 +3110,29 @@ msgstr "Нэгж"
 msgid "Web Site"
 msgstr "Вэб сайт"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Өргөн"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Өндөр"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 ""
@@ -2715,10 +3149,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2739,399 +3169,10 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Гишүүдийг жагсаах"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Ц-шуудан"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Тайлбар"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Бүлэг"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Машины утас"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Ажилын"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Хувийн"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Албан тушаал"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Вэб хуудас"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Амжилттай"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr ""
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Хаягийн дэвтэр"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Зөвшөөрөгдөөгүй"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Холбоо олдсонгүй"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr ""
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr ""
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Цуцлагдсан"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "`%s' хавтсыг нээж чадахгүй байна"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Баталгаажуулж чадсангүй"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Баталгаажуулах хэрэгтэй"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Бусад алдаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, 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/eab-gui-util.c:109
-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:114
-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 ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, 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:140
-msgid "Unable to open addressbook"
-msgstr "Хаягийн дэвтрийг нээх боломжгүй"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Энэ хүсэлт амжилттай дууссангүй."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Жагсаалтыг нэмэхэд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Холбоо нэмэхэд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Жагсаалтыг өөрчлөхөд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Жагсаалтыг устгахад алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Холбоог устгахад алдаа гарлаа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Дарж бичих"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr ""
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "жагсаах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Холбоог зөөх"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Холбоог хуулах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Холбоонуудыг зөөх"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Холбоонуудыг хуулах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Хаягийн дэвтэрт хадгалах"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-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
-#. * 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: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 ""
-
-#: 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
-msgid "Show Full VCard"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Хаягийн дэвтэрт хадгалах"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Картын үзэмж"
@@ -3177,11 +3218,6 @@ msgstr "Эволюшин сэрүүлэг"
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 msgid "Print contacts"
 msgstr "Холбоонуудыг хэвлэх"
@@ -3191,6 +3227,11 @@ msgstr "Холбоонуудыг хэвлэх"
 msgid "Print contact"
 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"
 msgstr "10 pt. Tahoma"
@@ -3375,16 +3416,6 @@ msgstr ""
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3439,6 +3470,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3451,11 +3492,12 @@ msgstr "Оролтын файл"
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Нэр үгүй жагсаалт"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr ""
 
@@ -3487,117 +3529,53 @@ msgstr ""
 msgid "Could not read pilot's ToDo application block"
 msgstr ""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Хуанлинууд"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Эволюшин сэрүүлэг"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Хаах"
+msgid "Snooze _time (minutes):"
+msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
+msgid "_Edit appointment"
 msgstr ""
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
-msgstr ""
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
-msgid "_Edit appointment"
+msgid "_Snooze"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Тайлбар алга."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3606,12 +3584,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3619,7 +3597,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3630,19 +3608,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
-msgid "Could not initialize Bonobo"
+#: 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:167
-msgid "Could not initialize gnome-vfs"
+#: calendar/gui/alarm-notify/notify-main.c:139
+msgid "Could not initialize Bonobo"
 msgstr ""
 
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 
@@ -3751,175 +3729,170 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
-msgid "Whether to hide completed tasks"
+msgid "Whether to ask for confirmation when folder is expunged"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
-msgid "Whether to set a default reminder for events"
+msgid "Whether to hide completed tasks"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
-msgid "Whether to show times in 24h format instead of using am/pm"
+msgid "Whether to set a default reminder for events"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
-msgid "Whether to show week numbers in date navigator"
+msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Дүгнэлтэд агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Тайлбарт агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Тайлбарт агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Тайлбарт агуулагдаж байна"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Тохироогүй"
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
+msgid "Whether to show week numbers in date navigator"
+msgstr ""
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Хуанли"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "өдрүүд"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Шинжүүд:"
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Хуанлийг ачааллаж байна..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Хуанлинууд"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Зориулалт"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Шинэ зориулалт үүсгэх"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Уул_залт"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Шинэ уулзалтын хүсэлт үүсгэх"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Бүтэн өдрийн шинэ зориулалт"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Бүтэн _өдрийн төлөвлөгөө"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Шинэ хуанли"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "_Хуанли"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Шинэ хуанли үүсгэх"
 
@@ -3949,15 +3922,36 @@ msgstr "Долоо хоногийн үзэмж"
 msgid "Month View"
 msgstr "Сарын  үзэмж"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Дүгнэлтэд агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Тайлбарт агуулагдаж байна"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Тохироогүй"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr ""
 
@@ -3966,19 +3960,6 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr ""
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr ""
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr ""
@@ -4046,7 +4027,7 @@ msgstr ""
 msgid "hours"
 msgstr "цаг"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4066,14 +4047,14 @@ msgstr "Энгийн"
 msgid "Date/Time:"
 msgstr ""
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Зурвас харуул"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Дуу тоглуул"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4089,6 +4070,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
 msgid "Summary:"
 msgstr "Нийт:"
@@ -4127,10 +4109,108 @@ msgstr "минут"
 msgid "start of appointment"
 msgstr ""
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Хуанлийн бүлэг"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Шинэ хуанли нэмэх"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Төрөл:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 ""
 
@@ -4146,19 +4226,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 ""
 
@@ -4183,165 +4263,176 @@ msgid "60 minutes"
 msgstr "60 минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr ""
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Хугацаа</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Хугацаа</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Үүргийн жагсаалт</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 "<b>Ажлын долоо хоног</b>"
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Үзүүл"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "Баасан"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Цаг"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Даваа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Н_ям"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Бямба"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Ням"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "Пү_р"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Үүргийн жагсаалтын нэр"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Пүрэв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Time"
-msgstr "Он сар өдөр/цаг"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Цагийн _бүс:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Цагийн хэлбэр:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Мягмар"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Долоо хоног эхлэнэ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Лхагва"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Ажлын долоо хоног"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Ажлын өдрүүд:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: 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:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 цаг"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Нэмэх"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Өдөр эхлэнэ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Үзүүл"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4351,144 +4442,46 @@ msgstr "_Үзүүл"
 msgid "_Edit"
 msgstr "_Засварлах"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Чөлөөтэй/завгүй хүсэлт"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Баа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Ерөнхий"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Дав"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Бям"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Цагийн хуваалт:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Мяг"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Лха"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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:5
-#, fuzzy
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Шинэ хуанли нэмэх"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Төрөл:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4563,79 +4556,79 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "-д"
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Дууссан"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Дууссан"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Дүгнэлт алга"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Нэрээр хадгалах..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr ""
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "-д"
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Дууссан"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Дууссан"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4758,27 +4751,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Уулзалт"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Сануулагч"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Уулзалт"
 
@@ -4790,7 +4783,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Эхлэх өдөр буруу байна"
 
@@ -4880,10 +4873,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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,15 +4895,15 @@ msgstr "Зохион байгуулагч шаардлагатай."
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5180,26 +5173,19 @@ msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
 msgid "Save Event"
 msgstr ""
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Оруулагчид"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Үйлдлээ тэмдэглэх"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Хуанли"
+msgid "_Destination"
+msgstr "Тайлбар"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Үүргийн жагсаалтын нэр"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5228,38 +5214,44 @@ msgid "% _Complete"
 msgstr "% _дууссан"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Өндөр"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Бага"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Хэвийн"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Эхлээгүй"
 
@@ -5297,11 +5289,11 @@ msgstr "_Вэб хуудас нээх"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr ""
@@ -5310,8 +5302,9 @@ msgstr ""
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Тайлбар:"
@@ -5464,98 +5457,55 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Нийтийн"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Хувийн"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "_Дуусах цаг:"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Дүгнэлт"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Чөлөөтэй"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-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:629
-msgid "E"
-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-model-tasks.c:304
-msgid "W"
-msgstr ""
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Он сар өдөр:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
 msgstr ""
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Давуу эрх:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Үгүй"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Вэб хуудас нээх"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
+#: 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
@@ -5602,17 +5552,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Нээх"
 
@@ -5621,41 +5580,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Буулгах"
 
@@ -5713,78 +5673,155 @@ msgstr "Давуу эрх"
 msgid "Start date"
 msgstr "_Эхлэх цаг:"
 
+#: 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:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Шинэ _уулзалт..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Шинэ уулзалт"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Бүгдийг _тэмдэглэх"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Устгах..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Хавтас руу хуулах..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Хавтас руу зөөх..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Тохируулгууд..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "_Дуусах цаг:"
+
+#: 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: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-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:168 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
+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:629
+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 ""
+
 #. 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
@@ -5808,36 +5845,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5944,10 +5981,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Алга</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr ""
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5977,7 +6010,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "За"
 
@@ -6190,59 +6223,55 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Устгалт дууслаа"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Илгээгдсэн!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6359,28 +6388,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ажлын байрандаа байхгүй"
@@ -6441,80 +6448,159 @@ msgstr "Уулзалтын _эхлэх цаг:"
 msgid "Meeting _end time:"
 msgstr "Уулзалт _дуусах цаг:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Жагсаалтыг устгахад алдаа гарлаа"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Тэмдэглэгдсэн обьектуудыг устгаж байна..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Үүргүүд"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Хуанлийг ачааллаж байна"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s-г нэмж байна"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
+#: calendar/gui/gnome-cal.c:2894
+msgid "Purging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2757
-msgid "Purging"
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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
+msgid "Evolution's Calendar component"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
 msgstr ""
 
+#: 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 "4-р сар"
@@ -6652,6 +6738,23 @@ msgstr ""
 msgid "On The Web"
 msgstr "Вэб дээр"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr ""
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr ""
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -6871,7 +6974,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr ""
 
@@ -6883,67 +6986,77 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Тэмдэглэгдсэн"
+msgstr[1] "Тэмдэглэгдсэн"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Хуанлийг ачааллаж байна"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Шинэ үүрэг"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Үүргийн жагсаалтын бүлэг"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Хаягийн дэвтэрт хадгалах"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6951,11 +7064,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr ""
 
@@ -8596,7 +8709,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8689,29 +8802,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8743,7 +8833,46 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8751,42 +8880,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8794,99 +8923,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9121,7 +9250,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9312,8 +9441,9 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
-msgstr ""
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9328,7 +9458,7 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Failed to add data to CMS encoder"
 msgstr ""
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Баталгаажуулалт хийж чадсангүй.\n"
@@ -9390,94 +9520,94 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Cannot set message digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Батламжийн дэлгэрэнгүй"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr ""
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Шинэ холбоо үүсгэх"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Баталгаажуулалт хийж чадсангүй.\n"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9494,16 +9624,26 @@ msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас ү�
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr ""
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr ""
@@ -9624,7 +9764,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9633,11 +9773,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9654,7 +9794,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9664,28 +9804,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9697,17 +9837,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9716,11 +9856,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9737,10 +9872,12 @@ 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 ""
@@ -9772,6 +9909,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9791,26 +9929,303 @@ msgstr ""
 msgid "Checklist"
 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:3118
-msgid "Operation cancelled"
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: 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
 #, c-format
-msgid "Server unexpectedly disconnected: %s"
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: 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 "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
+
+#: 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
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 ""
+
+#: 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:815
+#: 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/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: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/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:1089
+#: camel/providers/pop3/camel-pop3-store.c:545 shell/e-shell.c:1109
 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 %s-н нууц үгийг оруулах (%s хэрэглэгч)"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "LDAP серверээр баталгаажуулж чадсангүй"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "%d секунд"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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
+msgid "Operation cancelled"
+msgstr ""
+
+#: camel/providers/imap/camel-imap-command.c:302
+#: camel/providers/imap/camel-imap-store.c:3171
+#, c-format
+msgid "Server unexpectedly disconnected: %s"
+msgstr ""
+
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9853,21 +10268,21 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -9881,25 +10296,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -9937,23 +10352,6 @@ msgstr ""
 msgid "Command:"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -9974,85 +10372,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10060,25 +10416,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10086,7 +10435,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10185,58 +10534,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10302,7 +10651,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10623,7 +10972,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10632,8 +10981,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10642,46 +10991,46 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: camel/providers/nntp/camel-nntp-folder.c:201
 #, c-format
 msgid "Could not get article %s from NNTP server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr ""
 
@@ -10794,7 +11143,7 @@ msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Мэдээллийг хавтсанд хадгалах"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -10847,8 +11196,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11278,7 +11627,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
@@ -11322,6 +11671,89 @@ msgstr ""
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+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 "Файлыг нээх чадахгүй"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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.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 ""
@@ -11400,195 +11832,131 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Файлыг нээх чадахгүй"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
 msgstr ""
 
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Дараагийн _уншигдаагүй мэдээлэл"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Дараагийн _уншигдаагүй мэдээлэл"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Бүү оруулж ир"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Устгах"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. 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/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
 msgid "Discard Changes"
 msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
 
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Бүү оруулж ир"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "Устгах"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Серверийн мэдээлэл:"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
-#, fuzzy
-msgid "Unfinished messages found"
-msgstr "Дараагийн _уншигдаагүй мэдээлэл"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11706,7 +12074,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -11883,72 +12252,88 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "_Шүүлтүүрүүд..."
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
+msgid "Missing file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
-msgid "Missing file name."
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Хавтсанд хадгалах..."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr ""
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -11961,66 +12346,11 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr "<b>Хугацаа</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr ""
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr ""
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Загварын нэр:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr ""
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Хугацаа</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr " "
@@ -12105,6 +12435,75 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Хугацаа</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Сануулагч"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Агуулах:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12235,7 +12634,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "6-р сар"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr ""
@@ -12275,7 +12674,7 @@ msgstr "Програмаас гарах"
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr ""
 
@@ -12345,9 +12744,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 ""
@@ -12417,101 +12816,59 @@ msgstr "Тайлбарт агуулагдаж байна"
 msgid "Virtual _Folders"
 msgstr "_Хавтас"
 
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Нэмэх"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr ""
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12547,530 +12904,556 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr ""
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Хавтсанд хадгалах..."
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Хавтас руу хуулах..."
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Тэмдэглэгдсэн зурвасуудыг өөр хавтас руу зөө"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr ""
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Цуцлах"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Хуулах"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr ""
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr ""
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr ""
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr ""
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr ""
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr ""
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr ""
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr ""
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr ""
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
-msgstr ""
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, c-format
-msgid "Matches: %d"
-msgstr ""
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr ""
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: 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-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
+#: 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-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: 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-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
+#: 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 ""
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: 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 ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: 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-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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."
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
 msgstr ""
 
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1002
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1013
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%a %m/%d/%Y %I:%M:%S %p"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
 msgstr ""
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
+#: 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 ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
+#: 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."
 msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: 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 ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: 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 ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:757
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
+#: mail/em-format-html-display.c:772
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr ""
+
+#: mail/em-format-html-display.c:1018
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Холбоог өөрчлөхөд алдаа гарлаа"
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%a %m/%d/%Y %I:%M:%S %p"
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr ""
+
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
+msgstr ""
+
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Жил бүр"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Долоо хоног тутам"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "сар тутам"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13078,24 +13461,50 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: mail/em-migrate.c:1715
 #, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1919
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2350
-#, c-format
-msgid "Failed to open store for `%s': %s"
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
 msgstr ""
 
 #: mail/em-popup.c:699
@@ -13107,88 +13516,74 @@ msgstr ""
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr ""
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr ""
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr ""
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 ""
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr ""
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr ""
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr ""
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr ""
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr ""
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Илгээх зурвас"
@@ -13206,11 +13601,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13309,157 +13704,157 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13507,7 +13902,7 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13645,49 +14040,79 @@ msgstr ""
 msgid "spamd port"
 msgstr "Оруулах"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
 msgstr ""
 
+#: 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:96
+msgid "Mail Preferences"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Мали"
+
 #: mail/importers/elm-importer.c:88
 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13715,19 +14140,47 @@ msgid "Select folder to import into"
 msgstr ""
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -13737,7 +14190,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13752,7 +14205,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13760,7 +14213,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13769,24 +14222,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Файлуудыг оруулж байна"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13816,163 +14269,175 @@ msgid "Pine"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Тэмдэглэгдсэн"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d өдөр"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d секунд"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d секунд"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d холбоонууд"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Тэмдэглэгдсэн"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "_Хавтас руу зөөх"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Хавтас"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Шинэ хуанли үүсгэх"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
 msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: 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:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -13981,14 +14446,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr ""
@@ -14281,7 +14738,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14584,386 +15041,503 @@ msgstr "өнгө"
 msgid "description"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Баталгаажуулалт хийж чадсангүй.\n"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+#. 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-errors.xml.in.h:4
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"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-errors.xml.in.h:5
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
-
-#: mail/mail-errors.xml.in.h:6
+#. 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 "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
 
-#: mail/mail-errors.xml.in.h:7
+#. 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"
+"{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
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Та энэ нэрлэгдээгүй уулзалтыг устгахыг хүсч байна уу?"
+msgid "_Send"
+msgstr "Илгээх"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Та энэ нэрлэгдээгүй уулзалтыг устгахыг хүсч байна уу?"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
+#. 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-errors.xml.in.h:16
-msgid "Cannot create the save directory, because \"{1}\""
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
-
-#: mail/mail-errors.xml.in.h:18
-msgid "Cannot delete system folder \"{0}\"."
+#. 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?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:19
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+msgid "Use _Default"
+msgstr "Дэлгэрэнгүй"
 
-#: mail/mail-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "`%s' хавтсыг нээж чадахгүй байна"
+#. 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-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "`%s' хавтсыг нээж чадахгүй байна"
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Файлыг нээх чадахгүй"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "`%s' үүргийг устгана гэдэгтээ итгэлтэй байна уу?"
 
-#: mail/mail-errors.xml.in.h:25
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+msgid "_Empty Trash"
+msgstr "Хогны сав _хоослох"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
+#. 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-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
-msgstr "Файлыг нээх чадахгүй"
-
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "`%s' хавтсыг нээж чадахгүй байна"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Устгах"
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Өөрчлөлтүүдийг хэрэгсэхгүй"
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 msgid "Error loading filter definitions."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
-msgstr ""
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+#, fuzzy
+msgid "Cannot save to file \"{0}\"."
+msgstr "Файлыг нээх чадахгүй"
 
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. 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/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Баталгаажуулалт хийж чадсангүй.\n"
+msgid "Cannot delete folder \"{0}\"."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+msgid "Cannot delete system folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 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."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Устгах"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. 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-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. 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 "`%s' хавтсыг нээж чадахгүй байна"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
+#. 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-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "`%s' хавтсыг нээж чадахгүй байна"
+
+#. 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-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid "Use _Default"
-msgstr "Дэлгэрэнгүй"
+msgid "Delete account?"
+msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. 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-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "`%s' хавтсыг нээж чадахгүй байна"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#. 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
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Хогны сав _хоослох"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Илгээх"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#. 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-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:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -14972,170 +15546,170 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr ""
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Энэ мэдээллийг хэвлэх"
 msgstr[1] "Энэ мэдээллийг хэвлэх"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Энэ зурвасыг илгээх"
 msgstr[1] "Энэ зурвасыг илгээх"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15199,24 +15773,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15256,89 +15830,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Шинэ хаягийн дэвтэрт зориулан хавтас үүсгэж чадсангүй."
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15370,43 +15949,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15448,123 +16027,87 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Эволюшин"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Эвелюшин хаягийн дэвтрийн бүрэлдэхүүн хэсэг"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:12
+msgid "mail"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
-msgstr ""
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr ""
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Үл мэдэгдэх алдаа"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-msgid "mail"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1107
+msgid "Generic error"
 msgstr ""
 
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -15689,11 +16232,11 @@ msgstr ""
 msgid "_Import"
 msgstr ""
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15730,11 +16273,28 @@ msgstr ""
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+
+#: shell/e-shell-window.c:343
+msgid "Evolution is in the process of going offline."
+msgstr ""
+
+#: shell/e-shell-window.c:349
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+
+#: shell/e-shell-window.c:621
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr ""
@@ -15748,14 +16308,15 @@ msgid "Bug buddy could not be run."
 msgstr ""
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
-msgstr ""
+#, fuzzy
+msgid "About Evolution"
+msgstr "Эволюшин"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr ""
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr ""
 
@@ -15763,44 +16324,6 @@ msgstr ""
 msgid "Work Offline"
 msgstr ""
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr ""
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr ""
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr ""
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -15866,6 +16389,46 @@ msgstr "Идэвхитэй холболтууд"
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Хуанли:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Холбоо"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Ц-шуудан:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Хавтасны _төрөл:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Данс:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Ха_втасны нэр:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Хэрэглэгч:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Эволюшин тохируулагч туслах"
@@ -15899,6 +16462,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Эволюшин"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Эвелюшин хаягийн дэвтрийн бүрэлдэхүүн хэсэг"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Эволюшинд файл оруулж эхлэхийн тулд \"Оруулах\" товчийг товш"
@@ -15960,13 +16537,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Эволюшин дараахи файлуудаас өгөгдөл оруулаж чадна:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -15980,67 +16557,124 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
+"The Evolution Team\n"
+msgstr "Эволюшины тохиргоонуудыг солих"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Эволюшин"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Холбогдож байна"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+msgid "Cannot start Evolution"
+msgstr ""
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr ""
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Батламжийн нэр"
 
@@ -16265,11 +16899,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr ""
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16460,6 +17089,11 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr ""
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16499,12 +17133,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr ""
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16568,8 +17202,9 @@ msgid "Select all contacts"
 msgstr "Бүх холбоонуудыг тэмдэглэх"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr ""
+#, fuzzy
+msgid "Send a message to the selected contacts."
+msgstr "Тэмдэглэгдсэн холбоонуудыг устгах"
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
@@ -16599,8 +17234,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr ""
@@ -16618,8 +17253,9 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "Нэрээр хадгалах..."
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -16745,10 +17381,20 @@ msgstr ""
 msgid "Week"
 msgstr "Долоо хоног"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Ажлын долоо хоног"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 "_Хаах"
+
 #: 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
@@ -17066,6 +17712,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Хаах"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17306,8 +17962,9 @@ msgid "Open the selected message in a new window"
 msgstr "Тэмдэглэгдсэн зурвасыг шинэ цонхонд нээх"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
-msgstr ""
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
+msgstr "Тэмдэглэгдсэн зурвасыг шинэ цонхонд нээх"
 
 #: ui/evolution-mail-message.xml.h:72
 msgid "Original Si_ze"
@@ -17421,58 +18078,46 @@ msgstr ""
 msgid "_Attached"
 msgstr "_Хавсаргагдсан"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Хавтас руу хуулах"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Очих"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Илүү том"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Хавтас руу зөөх"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Дараагийн зурвас"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Энгийн дэлгэц"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Зурваыг нээх"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Өмнөх зурвас"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Хашигдсан"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Ахин илгээх..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Хэрэгслүүд"
@@ -17481,16 +18126,6 @@ msgstr "_Хэрэгслүүд"
 msgid "_Undelete"
 msgstr "_Устгасныг сэргээх"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Хаах"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Хавсаргах"
@@ -17883,6 +18518,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr "_Илгээх/хүлээж авах"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Цонх"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "_Компаниар"
@@ -17950,10 +18590,6 @@ msgstr "Бусад өдрүүд"
 msgid "With _Status"
 msgstr "_Байдал:"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18109,6 +18745,35 @@ msgstr "Бусад..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Эволюшин"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Эволюшин сэрүүлэг"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Мэдээлэл алга"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Эволюшин"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18223,6 +18888,29 @@ msgstr "Текст"
 msgid "Find _Now"
 msgstr "Одоо _ол"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr "Өөрчлөлтүүдийг хадгалахыг хүсч байна уу?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Файлыг нээх чадахгүй"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Файлыг нээх чадахгүй"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18233,9 +18921,40 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Эволюшин хаягийн дэвтрийн хавтас үзүүлэгч"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Шинэ хаягийн дэвтэр"
+#~ msgid "Address 2:"
+#~ msgstr "Хаяг _2:"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Үүрэг"
+
+#~ msgid "Display a message"
+#~ msgstr "Зурвас харуул"
+
+#, fuzzy
+#~ msgid "Time"
+#~ msgstr "Он сар өдөр/цаг"
+
+#~ msgid "_General"
+#~ msgstr "_Ерөнхий"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Оруулагчид"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Хуанли"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Үүргийн жагсаалтын нэр"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Ахин илгээх..."
 
 #, fuzzy
 #~ msgid "Address Book Creation Assistant"
@@ -18311,9 +19030,6 @@ msgstr ""
 #~ msgid "S_pouse:"
 #~ msgstr "Гэр бүлийн хүн:"
 
-#~ msgid "_Add"
-#~ msgstr "_Нэмэх"
-
 #~ msgid "_Business:"
 #~ msgstr "_Бизнес"
 
@@ -18406,25 +19122,9 @@ msgstr ""
 #~ msgstr "Хаягийн дэвтэр"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "%s %s-н нууц үгийг оруулах (%s хэрэглэгч)"
-
-#, fuzzy
 #~ msgid "_minute(s)"
 #~ msgstr "минут"
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Хуанли:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Хавтасны _төрөл:"
-
-#~ msgid "_Account:"
-#~ msgstr "_Данс:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Ха_втасны нэр:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Шинэ цонх үүсгэх"
 
@@ -18465,9 +19165,6 @@ msgstr ""
 #~ msgid "1 second"
 #~ msgstr "1 секунд"
 
-#~ msgid "Description"
-#~ msgstr "Тайлбар"
-
 #~ msgid "component"
 #~ msgstr "бүрэлдэхүүн хэсэг"
 
@@ -18500,9 +19197,6 @@ msgstr ""
 #~ msgid "LDAP Server Name:"
 #~ msgstr "_Серверийн нэр:"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Дараахи холболтууд одоо идэвхитэй байна:"
-
 #~ msgid "Go to today"
 #~ msgstr "Өнөөдөрт оч"
 
@@ -18560,9 +19254,6 @@ msgstr ""
 #~ msgid "<b>Alarm Action</b>"
 #~ msgstr "<b>Түгшүүрийн үйлдэл</b>"
 
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Үүргийн жагсаалт</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Ангилал</b>"
 
diff --git a/po/ms.po b/po/ms.po
index 229d795fed..26dee0dcc1 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Buku Alamat Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kenalan: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Tetingkap _Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,16 +57,6 @@ msgstr "kad"
 msgid " card"
 msgstr "1 kad"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kenalan: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Tetingkap _Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Alamat Segerak Piawai:"
@@ -71,65 +71,20 @@ msgstr "Tidak dapat memuatkan buku alamat"
 msgid "Could not read pilot's Address application block"
 msgstr "Tidak dapat membaca blok aplikasi Alamat rintis"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Folder Autocompletion"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sijil"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Buat konfigurasi akaun e-mel anda di sini"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kenalan"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up alamat Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Pelihat alamat Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Pelihat kad Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Komponen Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Pelihat folder Buku Alamat Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Kawalan Pengurusan Sijil S/Mime Evolution"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Mencapai Pelayan LDAP tanpa nama"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Kawalan konfigurasi seting folder Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Gagal disahkan.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Urus sijil S/Mime anda di sini"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -172,42 +127,46 @@ msgstr "_Kenalan:"
 msgid "Create a new contacts group"
 msgstr "Wujudkan kumpulan jalan pintas baru"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Sedang menunggu..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "%s berdenting"
@@ -215,8 +174,8 @@ msgstr "%s berdenting"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Atas Komputer Ini"
 
@@ -224,7 +183,7 @@ msgstr "Atas Komputer Ini"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Peribadi"
@@ -274,20 +233,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Mencapai Pelayan LDAP tanpa nama"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Gagal disahkan.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Buku Alamat"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sMasukkan kata laluan bagi %s (pengguna %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -307,6 +288,62 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Folder Autocompletion"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kenalan"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sijil"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up alamat Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Pelihat alamat Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Pelihat kad Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponen Buku Alamat Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Kawalan Pengurusan Sijil S/Mime Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kawalan konfigurasi seting folder Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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"
@@ -328,6 +365,7 @@ msgstr "  T_unjukkan Asas Sokongan"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -400,7 +438,7 @@ msgstr "_Kenalan:"
 msgid "Address Book Properties"
 msgstr "Sumber Buku Alamat"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Sentiasa"
@@ -415,109 +453,99 @@ msgid "Basic"
 msgstr "Asas"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "W_arna"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Disambungkan"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Nama_ berbeza:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Nama_ berbeza:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Asas Carian Sokongan"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Am"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Tidak Pernah"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Satu"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Pilih warna"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Skop C_arian: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Skop C_arian: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Sedang mencari"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -527,7 +555,7 @@ msgstr ""
 "LDAP anda jika\n"
 "pelayan LDAP anda menyokong SSL atau TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -545,7 +573,7 @@ msgstr ""
 "sambungan anda sudah\n"
 "selamat."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -559,19 +587,19 @@ msgstr ""
 "kepada eksploitasi\n"
 "keselamatan. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Asas Carian Sokongan"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -582,7 +610,7 @@ msgstr ""
 "bermula. Jika anda membiarkannya kosong, carian akan bermula pada akar "
 "pepohon direktori."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -597,14 +625,14 @@ msgstr ""
 "Skop carian bagi \"satu\" akan hanya merangkumi entri satu tahap di bawah "
 "asas anda.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -615,7 +643,7 @@ msgstr ""
 "sehingga \n"
 "terlalu besar akan melambatkan buku alamat anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -625,7 +653,7 @@ msgstr ""
 "perhatian bahawa mengesetkannya kepada \"Alamat E-mel\" memerlukan capaian "
 "tanpa nama kepada pelayan ldap anda."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -635,7 +663,7 @@ msgstr ""
 "anda.\n"
 "Ia untuk tujuan paparan sahaja. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -646,128 +674,136 @@ msgstr ""
 "senarai port piawai telah diberikan. Tanya pentadbir sistem anda\n"
 "apakah port yang patut anda tetapkan."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format masa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Menggunakan nama berbeza (NB)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Menggunakan alamat e-mel"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Pada bila-bila masa yang mungkin"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kenalan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Had muat turun:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Alamat e-mel:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Kaedah log masuk:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nama:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Nombor port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Keutamaan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Asas carian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Nama pelayan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "P_elayan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Tamat masa (minit):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Gunakan sambungan terjamin (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kad"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "tab sambung"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "tab am"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minit"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "tab cari"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Antara muka pemilihan nama Buku Alamat Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Keluarkan Semua"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Keluarkan"
 
+#: 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 "Nama"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Keluarkan Semua"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Lihat Senarai Kenalan"
@@ -790,23 +826,15 @@ msgstr "Tambahkan Kenalan"
 msgid "Unnamed Contact"
 msgstr "Kenalan Tanpa Nama"
 
-#: 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
-msgid "Name"
-msgstr "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
 msgid "Source"
 msgstr "Sumber"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Antara muka pemilihan nama Buku Alamat Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -879,143 +907,143 @@ msgid "<b>Work</b>"
 msgstr "Minggu Bekerja"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Alamat _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Alamat:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ulang_tahun:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Pembantu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Hari lahi_r:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Ba_ndar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Syarikat"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor Kenalan"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Negar_a:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "J_abatan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "U_RL Bebas/Sibuk:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Nama _Penuh..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Rumah"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Alamat E-mel"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Pengurus"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nama Ringkas:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "No_ta:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Lain"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Peti Surat:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1043,9 +1071,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Kerja"
@@ -1078,23 +1106,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Adakah anda pasti ingin\n"
+"menghapuskan kenalan ini?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Adakah anda pasti ingin\n"
+"menghapuskan kenalan ini?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Boleh Edit"
 
@@ -2073,99 +2117,117 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Kiriman Mesej"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Senarai Id Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Khidmat boleh digunakan"
-
-#: 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 "Lokasi:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nama_pengguna:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Kumpulan"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Sumber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Merupakan Kenalan Baru"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Medan Boleh Tulis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Diubah"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Kenalan ini tergolong dalam kategori ini:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Sila pilih opsyen berikut"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Sambungan berikut aktif sekarang:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Kiriman Mesej"
+
+#: 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 "Khidmat boleh digunakan"
+
+#: 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 "Lokasi:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nama_pengguna:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Tambah Cepat Kenalan"
@@ -2183,22 +2245,6 @@ msgstr "_Nama Penuh:"
 msgid "E-_mail:"
 msgstr "E-mel:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Adakah anda pasti ingin\n"
-"menghapuskan kenalan ini?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Adakah anda pasti ingin\n"
-"menghapuskan kenalan ini?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Alamat _2:"
@@ -2348,8 +2394,8 @@ msgstr "editor-senarai-kenalan"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Buku"
 
@@ -2410,6 +2456,450 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Carian Lanjutan"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Senaraikan Ahli"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisasi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Kumpulan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Kerja"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Telefon Bimbit"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Peribadi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Nota"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Gelaran Jawatan"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-mel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Laman web"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Berjaya"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+#, fuzzy
+msgid "Backend busy"
+msgstr "Bahagian belakang sibuk"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repositori luar talian"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Kebenaran dinafikan"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kenalan tidak dijumpai"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "ID Kenalan telah wujud"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protokol tidak disokong"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Batal"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Pengesahan Gagal"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Pengesahan Diperlukan"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Mesej tersebut tidak ada"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Ralat lain"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
+"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
+"tidak dapat dijangkau."
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+msgstr ""
+"Versi Evolution ini tidak mempunyai sokongan LDAP\n"
+"yang dikompilkan ke dalamnya.  Jika anda ingin menggunakan LDAP dalam "
+"Evolution\n"
+"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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
+"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
+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 ""
+"Lebih banyak kad sepadan dengan pertanyaan ini, maka sama ada pelayan ini \n"
+"dikonfigurasikan untuk dikembalikan atau Evolution dikonfigurasikan untuk "
+"dipaparkan.\n"
+"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
+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 ""
+"Masa untuk melaksanakan pertanyaan ini melebihi had pelayan atau had\n"
+"yang anda konfigurasikan untuk buku alamat ini.  Sila jadikan carian anda\n"
+"lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
+"direktori bagi buku alamat ini."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Ralat ketika menambahkan kenalan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Ralat ketika mengubahsuaikan senarai"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Ralat ketika mengubah suai kenalan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Ralat ketika mengeluarkan kenalan"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s telah wujud\n"
+"Adakah anda ingin menulis gantinya?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "senarai"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Alihkan kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Salin kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Alihkan kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Salin kenalan ke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Pilih Kenalan daripada Buku Alamat"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "VCard Berganda"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard bagi %s"
+
+#.
+#. * 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 "(tiada)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "E-mel Utama"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-mel 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-mel 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Pilih Tindakan"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Wujudkan kenalan baru \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Tambahkan alamat pada kenalan sedia ada \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Pertanyaan Buku Alamat..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Edit Maklumat Kenalan"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Cantumkan Alamat E-mel"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "dan satu kenalan lain."
+msgstr[1] "dan satu kenalan lain."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Tunjukkan Vcard Penuh"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Tunjukkan VCard Padat"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Simpan dalam buku alamat"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Tiada kenalan"
@@ -2424,8 +2914,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Pertanyaan"
 
@@ -2480,9 +2970,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Simpan sebagai VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2550,7 +3041,7 @@ msgid "Cut"
 msgstr "Potong"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2561,18 +3052,8 @@ msgstr "Salin"
 msgid "Paste"
 msgstr "Tampal"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Hapus"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Pandangan Semasa"
 
@@ -2589,7 +3070,7 @@ msgstr ""
 "semula"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Sebarang Kategori"
@@ -2630,21 +3111,6 @@ msgstr "Kategori"
 msgid "Company Phone"
 msgstr "Telefon Syarikat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-mel"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-mel 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-mel 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nama Keluarga"
@@ -2683,29 +3149,14 @@ msgstr "Jordan"
 msgid "Manager"
 msgstr "Pengurus"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Telefon Bimbit"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nama ringkas"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Nota"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pejabat"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisasi"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Faks Lain"
@@ -2759,21 +3210,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Laman Web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Lebar"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Tinggi"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Mempunyai Fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Dipilih"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Mempunyai Kursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Medan"
@@ -2790,10 +3249,6 @@ msgstr "Model Teks"
 msgid "Max field name length"
 msgstr "Panjang maksimum nama medan"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Lebar Lajur"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2822,424 +3277,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Penyesuai"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Dipilih"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Mempunyai Kursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Senaraikan Ahli"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Kumpulan"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Kerja"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Peribadi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Gelaran Jawatan"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Laman web"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Berjaya"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-#, fuzzy
-msgid "Backend busy"
-msgstr "Bahagian belakang sibuk"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repositori luar talian"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Kebenaran dinafikan"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kenalan tidak dijumpai"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "ID Kenalan telah wujud"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol tidak disokong"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Batal"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Tidak dapat membuka folder sumber: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Pengesahan Gagal"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Pengesahan Diperlukan"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Mesej tersebut tidak ada"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Ralat lain"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
-"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan LDAP\n"
-"tidak dapat dijangkau."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-msgstr ""
-"Versi Evolution ini tidak mempunyai sokongan LDAP\n"
-"yang dikompilkan ke dalamnya.  Jika anda ingin menggunakan LDAP dalam "
-"Evolution\n"
-"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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Kami tidak dapat membuka buku alamat ini.  Ini bermakna\n"
-"sama ada anda telah memasukkan URI yang tidak betul, atau pelayan\n"
-"tidak dapat dijangkau."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Tidak dapat membuka buku alamat"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Lebih banyak kad sepadan dengan pertanyaan ini, maka sama ada pelayan ini \n"
-"dikonfigurasikan untuk dikembalikan atau Evolution dikonfigurasikan untuk "
-"dipaparkan.\n"
-"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:167
-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 ""
-"Masa untuk melaksanakan pertanyaan ini melebihi had pelayan atau had\n"
-"yang anda konfigurasikan untuk buku alamat ini.  Sila jadikan carian anda\n"
-"lebih khusus atau tingkatkan had masa dalam keutamaan pelayan\n"
-"direktori bagi buku alamat ini."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Pertanyaan ini tidak dapat disiapkan dengan jayanya."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Adakah anda ingin menyimpan perubahan?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Buang"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Ralat ketika menambahkan senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Ralat ketika menambahkan kenalan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Ralat ketika mengubahsuaikan senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Ralat ketika mengubah suai kenalan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Ralat ketika mengeluarkan senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Ralat ketika mengeluarkan kenalan"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s telah wujud\n"
-"Adakah anda ingin menulis gantinya?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Tulis ganti"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "senarai"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Alihkan kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Salin kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Alihkan kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Salin kenalan ke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Pilih Kenalan daripada Buku Alamat"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "VCard Berganda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard bagi %s"
-
-#.
-#. * 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 "(tiada)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "E-mel Utama"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Pilih Tindakan"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Wujudkan kenalan baru \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Tambahkan alamat pada kenalan sedia ada \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Pertanyaan Buku Alamat..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Edit Maklumat Kenalan"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Cantumkan Alamat E-mel"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "dan satu kenalan lain."
-msgstr[1] "dan satu kenalan lain."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Tunjukkan Vcard Penuh"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Tunjukkan VCard Padat"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Simpan dalam buku alamat"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Lebar Lajur"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3283,11 +3323,6 @@ msgstr "Pengimport VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Cetak sampul surat"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Cetak kenalan"
@@ -3297,6 +3332,11 @@ msgstr "Cetak kenalan"
 msgid "Print contact"
 msgstr "Cetak kenalan"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Cetak sampul surat"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 poin Tahoma"
@@ -3481,16 +3521,6 @@ msgstr "Ujian Cetakan Kenalan"
 msgid "This should test the contact print code"
 msgstr "Ini sepatutnya menguji kod cetakan kenalan"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Menentukan fail output bukannya output piawai"
@@ -3548,6 +3578,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Ralat ketika memuatkan buku alamat piawai."
@@ -3560,11 +3600,12 @@ msgstr "Fail Input"
 msgid "No filename provided."
 msgstr "Tiada nama fail diberikan. "
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Senarai Tanpa Nama"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Masukkan Kata Laluan"
@@ -3597,117 +3638,55 @@ msgstr "Keutamaan Piawai:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Tidak dapat membaca blok aplikasi ToDo rintis"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendar dan Tugas"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Buat konfigurasi zon waktu, Kalendar dan Senarai Tugas anda di sini "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendar dan Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kawalan konfigurasi Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Pemandang mesej penjadualan Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Pemandang Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor Kalendar/Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Pemandang Tugas Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Komponen Kalendar Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponen ujian Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Tugas"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Bermula:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Berakhir:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Penggera Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Penggera pada %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "T_utup"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Tidur sekejap"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Masa tidur sekejap (minit)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Edit temu janji"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Tidur sekejap"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Buka"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Tidak ada huraian."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3720,12 +3699,12 @@ msgstr ""
 "Bermula pada %s\n"
 "Berakhir pada %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Amaran"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3737,7 +3716,7 @@ msgstr ""
 "dikonfigurasikan untuk menghantar e-mel. Evolution sebaliknya akan\n"
 "memaparkan kotak dialog peringatan yang normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3754,19 +3733,19 @@ msgstr ""
 "\n"
 "Adakah anda pasti ingin menjalankan atur cara ini?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Jangan tanya saya lagi tentang atur cara ini."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Khidmat pemberitahuan penggera Kalendar Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Tidak dapat memulakan Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Tidak dapat memulakan gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Tidak dapat mewujudkan penggera, maklumkan kilang khidmat"
 
@@ -3879,61 +3858,46 @@ 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 "_Minta pengesahan apabila menghapuskan item"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Minta pengesahan apabila menghapuskan item"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Hapuskan tugas yang siap"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Ringkasan mengandungi"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Huraian mengandungi"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Ulasan mengandungi"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Huraian mengandungi"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Tidak padan"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3943,123 +3907,133 @@ msgstr ""
 "jumlah masa yang dipilih. Jika anda meneruskannya, anda tidak akan dapat "
 "memulihkan tugas ini. "
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Singkirkan peristiwa yang lebih lama dari"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "hari"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Ciri-ciri..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Memuatkan kalendar..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalendar"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Temu janji baru"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Temu janji"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "M_esyuarat"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Wujudkan mesyuarat baru"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Temu Janji Baru Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Temu Janji _Sepanjang Hari"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Wujudkan temu janji baru"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Kalendar Baru"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendar:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Wujudkan kalendar baru"
 
@@ -4089,15 +4063,36 @@ msgstr "Pandangan Minggu"
 msgid "Month View"
 msgstr "Pandangan Bulan"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Ringkasan mengandungi"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Huraian mengandungi"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Ulasan mengandungi"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Huraian mengandungi"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Tidak padan"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Ralat ketika membuka kalendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Kaedah tidak disokong semasa membuka kalendar"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Kebenaran dinafikan untuk membuka kalendar"
 
@@ -4106,19 +4101,6 @@ msgstr "Kebenaran dinafikan untuk membuka kalendar"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Tidak dapat membuka folder dalam '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI yang akan dipaparkan oleh kalendar"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Jenis pandangan yang akan ditunjukkan"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opsyen Penggera Audio"
@@ -4186,7 +4168,7 @@ msgstr "masa tambahan setiap"
 msgid "hours"
 msgstr "jam"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4205,14 +4187,14 @@ msgstr "Asas"
 msgid "Date/Time:"
 msgstr "Tarikh/Masa:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Paparkan mesej"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Dengarkan bunyi"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4228,6 +4210,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
 msgid "Summary:"
 msgstr "Ringkasan:"
@@ -4266,10 +4249,110 @@ msgstr "minit"
 msgid "start of appointment"
 msgstr "temu janji bermula"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, 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
+#, 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 "Tambah Kalendar Baru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Senarai Tugas"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Tambah Kalendar Baru"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Jenis:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "minggu"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Dibolehkan"
 
@@ -4285,19 +4368,19 @@ msgstr "Jangan import"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Lumpuhkan"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Bolehkan"
 
@@ -4322,164 +4405,177 @@ msgid "60 minutes"
 msgstr "60 minit"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Berjaga-jaga"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Mula:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Peringatan"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Opsyen kalendar</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Genap tempoh:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Minggu Bekerja"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Seting Kalendar dan Tugas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Warna bagi tugas terlewat"
 
-#: 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 "Warna bagi tugas yang genap tempoh hari ini"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Hari _berakhir:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Hari"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Paparkan"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Bo_lehkan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Jumaat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Jam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Isnin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "A_had"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sabtu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Tun_jukkan peringatan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Tunjukkan bilangan _minggu dalam pemandu arah tarikh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Ahad"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "T_ugas yang genap tempoh hari ini:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "K_hamis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Senarai Tugas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Khamis"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Masa"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Zon _masa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format masa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Selasa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "M_inggu bermula:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Rabu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Minggu Bekerja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Hari bekerja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 jam (PAGI/PETANG)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 jam"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Tambah"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Minta pengesahan apabila menghapuskan item"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Mampatkan hujung minggu dalam pandangan bulan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Hari bermula:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Paparkan"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4489,146 +4585,46 @@ msgstr "_Paparkan"
 msgid "_Edit"
 msgstr "_Edit"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Permintaan Bebas/Sibuk"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Jumaat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Am"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Sembunyikan tugas yang siap selepas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Isnin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Tugas terlewat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sabtu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Tunjukkan masa akhir temu janji dalam pandangan minggu dan bulan"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Pembahagian masa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Selasa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Rabu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "sebelum setiap temu janji"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Anda mestilah menetapkan nama fail."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, 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:247
-#, 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 "Tambah Kalendar Baru"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Senarai Tugas"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Kumpulan Kalendar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Tambah Kalendar Baru"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Jenis:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "minggu"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4713,81 +4709,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Anda tidak membuat sebarang perubahan, kemas kini editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Ralat pengesahan: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " kepada "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr "(Siap "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Siap "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Genap Tempoh "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Genap Tempoh"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Tidak dapat mengemas kini objek"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Edit Temu Janji"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Temu janji - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Tugas - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Entri jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Tiada ringkasan"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Simpan sebagai..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Perubahan yang dibuat pada item ini boleh dibuang jika kemas kini dilakukan"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Tidak dapat memperoleh versi semasa!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Ralat pengesahan: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " kepada "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr "(Siap "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Siap "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Genap Tempoh "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Genap Tempoh"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4910,27 +4906,27 @@ msgstr "Ditugaskan Kepada:"
 msgid "Enter Delegate"
 msgstr "Masukkan Ditugaskan"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Temu janji"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Peringatan"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Perulangan"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Penjadualan"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Mesyuarat"
 
@@ -4943,7 +4939,7 @@ msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Tarikh mula adalah salah"
 
@@ -5032,10 +5028,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5054,15 +5050,15 @@ msgstr "Penyusun diperlukan."
 msgid "At least one attendee is required."
 msgstr "Sekurang-kurangnya seorang peserta diperlukan."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Ditugaskan Kepada..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5351,26 +5347,19 @@ msgstr "_Buang Perubahan"
 msgid "Save Event"
 msgstr "Simpan Peristiwa"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Pilih pengimport"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Pilih destinasi untuk folder ini disalin"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalendar"
+msgid "_Destination"
+msgstr "Hapuskan folder ini"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Senarai Tugas"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5399,38 +5388,44 @@ msgid "% _Complete"
 msgstr "% _Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Selesai"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Tinggi"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Sedang Dijalankan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Rendah"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Tidak Dimulakan"
 
@@ -5467,11 +5462,11 @@ msgstr "_Laman Web:"
 msgid "Assignment"
 msgstr "Umpukan"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Tarikh genap tempoh adalah salah"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Tidak dapat membuka buku alamat"
@@ -5480,8 +5475,9 @@ msgstr "Tidak dapat membuka buku alamat"
 msgid "Con_fidential"
 msgstr "Su_lit"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Huraian:"
@@ -5636,101 +5632,53 @@ msgstr "%s semasa %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s bagi jenis cetusan yang tak diketahui"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Awam"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Persendirian"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Sulit"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Tarikh Akhir"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Tarikh Mula"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Ringkasan"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Bebas"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Sibuk"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Klik untuk menambahkan tugas"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Tak Berjudul"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Tarikh Mula:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Tarikh Genap Tempoh:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Kedudukan geografi mestilah dimasukkan dalam format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Keutamaan:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Tidak"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Laman Web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Tak diketahui"
+#: 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 "Awam"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Berulang"
+#: 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 "Persendirian"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Diumpukkan"
+#: 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 "Sulit"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5776,17 +5724,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Bebas"
+
+#: 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 "Sibuk"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Menghapuskan objek yang dipilih"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Buka"
 
@@ -5795,41 +5752,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Cetak..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Tampal"
 
@@ -5887,78 +5845,157 @@ msgstr "Keutamaan"
 msgid "Start date"
 msgstr "Tarikh Mula"
 
+#: 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 "Ringkasan"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Isihan tugas"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Temu janji _Baru..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "_Peristiwa Baru Sepanjang Hari"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Mesyuarat Baru"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Tugas Baru"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Pilih _Bebenang"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Hapuskan..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Siarkan Maklumat Bebas/Sibuk"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Salin ke Folder..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Alih_kan ke Folder..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Jadualkan Mesyuarat..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Sampaikan sebagai iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Hapuskan Kejadian _ini"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Hapuskan _Semua Kejadian"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Pergi ke _Hari Ini"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Pergi ke Tarikh..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Seting..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Tarikh Akhir"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Tak diketahui"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Berulang"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Tidak"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Kedudukan geografi mestilah dimasukkan dalam format: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5982,36 +6019,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i bahagian minit"
+#. 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 "pagi"
+
+#. 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 "petang"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "pagi"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "petang"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i bahagian minit"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6120,10 +6157,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Tiada</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6153,7 +6186,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6366,61 +6399,57 @@ msgstr "Lampiran tidak mengandungi mesej kalendar yang sah"
 msgid "The attachment has no viewable calendar items"
 msgstr "Lampiran mempunyai item kalendar yang tidak dapat dilihat"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Fail kalendar tidak dapat dikemaskinikan!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Pengemaskinian siap\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Terdapat ralat pada sistem CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objek tidak dapat dijumpai\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Status peserta dikemaskinikan\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Status peserta tidak dapat dikemaskinikan!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Pengeluaran Selesai"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Item dihantar!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Item tidak dapat dihantar!\n"
 
@@ -6537,28 +6566,6 @@ msgstr "Ditugaskan"
 msgid "In Process"
 msgstr "Dalam Proses"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Di Luar Pejabat"
@@ -6619,7 +6626,34 @@ msgstr "Masa mula _mesyuarat:"
 msgid "Meeting _end time:"
 msgstr "Masa akhir _mesyuarat:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Masukkan Kata Laluan bagi %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6628,21 +6662,19 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Tugas permulaan pada %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6651,52 +6683,106 @@ msgstr ""
 "Ralat dalam %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Menyiapkan tugas..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Menghapuskan objek yang dipilih..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Sedang Buang"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Tugas"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Tiada temu janji."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Memuatkan Imej"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Buka dalam %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Menyingkir"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar dan Tugas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Buat konfigurasi zon waktu, Kalendar dan Senarai Tugas anda di sini "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendar dan Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kawalan konfigurasi Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Pemandang mesej penjadualan Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor Kalendar/Tugas Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Komponen Kalendar Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponen ujian Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tugas"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6834,6 +6920,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Kebenaran dinafikan untuk membuka kalendar"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Tidak dapat membuka buku alamat"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -7053,7 +7156,7 @@ msgid "Contacts: "
 msgstr "Kenalan: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Pralihat Cetakan"
 
@@ -7065,68 +7168,78 @@ msgstr "Item Cetakan"
 msgid "Print Setup"
 msgstr "Persediaan Cetakan"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d dipilih"
+msgstr[1] "%d dipilih"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Memuatkan Imej"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Tugas"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Wujudkan tugas baru"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Tugas baru"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Senarai Tugas"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Wujudkan tugas baru"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI bagi folder tugas akan memaparkan"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Tidak dapat memuatkan tugas dalam `%s"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7138,11 +7251,11 @@ msgstr ""
 "\n"
 "Anda pasti ingin memadamkan tugas ini?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Jangan tanya saya lagi."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Cetak Tugas"
 
@@ -8792,7 +8905,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr "Memuat turun mesej baru untuk mod bukan dalam talian"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Menyediakan folder '%s' untuk luar talian"
@@ -8885,33 +8998,6 @@ msgstr "Argumen tak sah pada (tag pengguna)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Ralat ketika melaksanakan carian penapis: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Tidak dapat menghuraikan ungkapan carian: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Ralat ketika melaksanakan ungkapan carian: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Membuat pertanyaan pada pengepala yang tak diketahui:  %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8943,7 +9029,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Menapis mesej baru"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Tidak dapat menghuraikan ungkapan carian: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Ralat ketika melaksanakan ungkapan carian: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(padan dengan semua) memerlukan hasil bool tunggal"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Membuat pertanyaan pada pengepala yang tak diketahui:  %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8954,15 +9085,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Gagal menghuraikan petunjuk id pengguna gpg."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Gagal menghuraikan permintaan ungkapan laluan gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8971,27 +9102,27 @@ msgstr ""
 "Anda memerlukan ungkapan laluan untuk membuka kunci bagi\n"
 "pengguna:  \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Batal."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Gagal membuka kunci rahsia: 3 ungkapan laluan yang rosak diberikan."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Maklum balas yang tidak dijangkakan daripada GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Gagal untuk menyulitkan: Penerima sah tidak ditetapkan."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9002,88 +9133,68 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Gagal untuk GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Gagal melaksanakan gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Gagal melaksanakan gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Tidak dapat mengesah betul tandatangan mesej: tidak dapat mewujudkan fail "
 "sementara: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Ini ialah bahagian mesej yang ditandatangani secara digital"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Kandungan badan indeks"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Tidak dapat menghuraikan kandungan mesej"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Tidak dapat membina saluran pembantu penguncian: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Tidak dapat memisahkan pembantu penguncian: %s"
-
-#: 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 "Tidak dapat mengunci '%s': ralat protokol dengan pembantu kunci"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Tidak dapat mengunci '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9105,6 +9216,26 @@ msgstr "Gagal mendapatkan kunci dengan menggunakan fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Gagal mendapatkan kunci dengan menggunakan flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Tidak dapat membina saluran pembantu penguncian: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Tidak dapat memisahkan pembantu penguncian: %s"
+
+#: 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 "Tidak dapat mengunci '%s': ralat protokol dengan pembantu kunci"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Tidak dapat mengunci '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9362,7 +9493,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Maklum balas pengesahan yang salah daripada pelayan."
 
@@ -9567,7 +9698,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Sijil Kenalan"
 
 #: camel/camel-smime-context.c:360
@@ -9584,7 +9715,7 @@ msgstr "Tidak dapat mewujudkan konteks nyahkod S/MIME."
 msgid "Failed to add data to CMS encoder"
 msgstr "Gagal untuk menambah ke folder 'Hantar' setempat: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Gagal disahkan.\n"
@@ -9649,99 +9780,99 @@ msgstr "Tidak boleh mewujudkan folder: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Tidak boleh mendapatkan mesej %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Kegagalan tandatangan sijil"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Tandatangan buruk"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Penandatangan: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Arahan IMAP gagal: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Gagal mencari sijil bagi \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Gagal mencari algoritma pukal sepunya."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Tidak dapat mewujudkan konteks nyahkod S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Gagal untuk menghantar nama pengguna ke pelayan"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Arahan tidak dilaksanakan"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9758,16 +9889,26 @@ msgstr "Tidak boleh mewujudkan folder: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Tidak dapat mewujudkan folder: pengendalian tak sah pada simpanan ini"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Sampah"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9889,7 +10030,7 @@ msgstr "Penggunaan kunci tidak menyokong tandatangan sijil"
 msgid "Error in application verification"
 msgstr "Ralat dalam pengesahbetulan aplikasi"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9902,11 +10043,11 @@ msgstr ""
 "Cap jari:          %s\n"
 "Tandatangan:       %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BAD"
 
@@ -9930,7 +10071,7 @@ msgstr ""
 "Adakah anda mahu menerimanya?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9945,7 +10086,7 @@ msgstr ""
 "\n"
 "Adakah anda mahu menerimanya?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9954,7 +10095,7 @@ msgstr ""
 "Masalah sijil: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9963,7 +10104,7 @@ msgstr ""
 "Domain sijil salah: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9972,7 +10113,7 @@ msgstr ""
 "Sijil tamat tempoh: %s\n"
 "Pengeluar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9986,17 +10127,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Tidak dapat menghuraikan URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Ralat ketika menyimpan `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Tiada mesej %s tersebut dalam %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 
@@ -10005,11 +10146,6 @@ msgstr "Tidak dapat menyalin atau mengalihkan mesej ke dalam Folder Maya"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10026,10 +10162,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Menyemak mel baru"
 
 #: 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 "Menyemak mesej baru dalam semua folder"
@@ -10062,6 +10200,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10083,26 +10222,323 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kabut yang tebal"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Tidak boleh mendapatkan folder: %s: %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 "Pelayan terputus tanpa dijangkakan: %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 "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Tidak boleh mendapatkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Tidak boleh mendapatkan mesej: %s dari folder %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 ""
+"Tidak boleh mendapatkan mesej: %s dari folder %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Tidak dapat menambahkan mesej ke folder mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Tidak dapat menambahkan mesej ke folder 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 ""
+"Tidak boleh mendapatkan mesej: %s dari folder %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 ""
+"Tidak boleh mendapatkan mesej: %s dari folder %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 ""
+"Tidak boleh mendapatkan mesej: %s dari folder %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 ""
+"Tidak boleh mendapatkan mesej: %s dari folder %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 "Folder"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Tunjukkan folder yang dilanggan sahaja"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Menolak ruang nama folder yang disediakan oleh pelayan"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Ruang nama"
+
+#: 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 "Untuk membaca dan menyimpan mel dalam pelayan IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Opsyen ini akan disambungkan ke pelayan IMAP dengan menggunakan kata laluan "
+"teks biasa."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Khidmat IMAP bagi %s pada %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:140
+#: 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 "Tidak dapat disambungkan ke %s (port %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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Sambungan dibatalkan"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Ralat tak diketahui"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Tidak dapat disambungkan ke pelayan POP %s: Tiada sokongan bagi mekanisme "
+"pengesahan yang diminta."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sSila masukkan kata laluan SMTP bagi %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Gagal disahkan pada pelayan POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nama folder \"%s\" tak sah kerana ia mengandungi aksara \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Syarikat"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menghapuskan folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Tidak dapat menamakan semula folder: %s: Pengendalian tak sah"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Maklum balas yang tidak dijangkakan daripada pelayan IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Tiada tugas"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Pengendalian dibatalkan"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Pelayan terputus tanpa dijangkakan: %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:1089
-msgid "Unknown error"
-msgstr "Ralat tak diketahui"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10147,21 +10583,21 @@ msgstr "Tidak dapat mewujudkan direktori %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Tidak dapat memuatkan ringkasan bagi %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder dimusnahkan dan diwujudkan semula dalam pelayan."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Mengimbas mesej yang diubah"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Tidak boleh mendapatkan semula mesej: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10177,25 +10613,25 @@ msgstr ""
 "Tidak boleh mendapatkan mesej: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Mesej tersebut tidak ada"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Mesej ini tidak ada pada masa ini"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Mengambil maklumat ringkasan bagi mesej baru"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Tidak dapat mencari badan mesej dalam maklum balas FETCH."
 
@@ -10237,23 +10673,6 @@ msgstr "Gagal disambungkan ke pelayan LDAP"
 msgid "Command:"
 msgstr "Syarikat"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Folder"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Tunjukkan folder yang dilanggan sahaja"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Menolak ruang nama folder yang disediakan oleh pelayan"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Ruang nama"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Gunakan penapis bagi mesej baru dalam INBOX dalam pelayan ini"
@@ -10276,85 +10695,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Pelayan IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Khidmat IMAP bagi %s pada %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Tidak dapat disambungkan ke %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL tidak Ada"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Sambungan dibatalkan"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Rundingan SSL gagal"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Anda tidak memasukkan kata laluan."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10365,25 +10742,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder tersebut tidak ada%s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nama folder \"%s\" tak sah kerana ia mengandungi aksara \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Folder ibu tidak dibenarkan mengandungi subfolder"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10391,7 +10761,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Folder ibu tak diketahui: %s"
@@ -10499,58 +10869,58 @@ msgstr ""
 "luaran.\n"
 "Boleh juga digunakan untuk membaca pepohon folder gaya Elm, Pine, atau Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Punca simpanan %s bukan laluan mutlak"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Punca simpanan %s bukan direktori biasa"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Tidak boleh mendapatkan folder: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Simpanan setempat tidak mempunyai kotak masuk"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fail mel setempat %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Tidak dapat menamakan semula folder %s ke %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Tidak dapat menamakan semula '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Tidak dapat menghapuskan fail ringkasan folder `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Tidak dapat menghapuskan fail indeks folder `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10616,7 +10986,7 @@ msgstr "Tidak dapat menghapuskan folder `%s': %s"
 msgid "not a maildir directory"
 msgstr "Bukan direktori dirmel"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10950,7 +11320,7 @@ 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:258
+#: 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
@@ -10959,8 +11329,8 @@ msgid "User cancelled"
 msgstr "Pengguna dibatalkan"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10969,48 +11339,48 @@ msgstr "Pengguna dibatalkan"
 msgid "Cannot get message %s: %s"
 msgstr "Tidak boleh mendapatkan mesej %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Ralat dalaman: uid dalam format tak sah: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Ralat ketika menyimpan mesej secara automatik: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Tidak dapat menyalin mesej ke folder mbox sementara: %s"
@@ -11132,7 +11502,7 @@ msgstr "Tidak boleh mendapatkan kumpulan: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Tidak dapat menghantar mesej: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11185,8 +11555,8 @@ msgstr "Tiada mesej dengan uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Mendapatkan semula mesej POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Sebab tak diketahui"
 
@@ -11646,7 +12016,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "lampiran"
 
@@ -11690,6 +12060,100 @@ msgstr "Jenis MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Cadangkan paparan automatik bagi lampiran"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Tidak dapat membuka fail"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mesej Tak Berjudul)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Buka fail"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autogenerated"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Tandatangan:"
+
+#: 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.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 "Gubah mesej"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Tidak dapat mewujudkan tetingkap penggubah:\n"
+"Tidak dapat mengaktifkan kawalan pemilih alamat."
+
+#: 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 ""
+"Tidak dapat mewujudkan tetingkap penggubah:\n"
+"Tidak dapat mengaktifkan komponen editor HTML.\n"
+"Sila pastikan versi gtkhtml dan libgtkhtml\n"
+"yang betul dipasang.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Tidak dapat mewujudkan tetingkap penggubah:\n"
+"Tidak dapat mengaktifkan komponen editor HTML."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Penggubah mengandungi badan mesej bukan teks yang tidak boleh diedit.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Destinasi Pengiriman"
@@ -11772,209 +12236,135 @@ msgstr "<klik di sini untuk memilih folder>"
 msgid "Attach file(s)"
 msgstr "Lampirkan fail"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "_Sentiasa tandatangan mesej keluar apabila menggunakan akaun ini"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Tidak dapat membuka fail"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Tidak boleh mendapatkan semula mesej daripada editor"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mesej Tak Berjudul)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Buka fail"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogenerated"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Tandatangan:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Gubah mesej"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Lampirkan fail ke mesej"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Tidak dapat mewujudkan tetingkap penggubah:\n"
-"Tidak dapat mengaktifkan kawalan pemilih alamat."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Tidak dapat mewujudkan tetingkap penggubah:\n"
-"Tidak dapat mengaktifkan komponen editor HTML.\n"
-"Sila pastikan versi gtkhtml dan libgtkhtml\n"
-"yang betul dipasang.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Tidak dapat mewujudkan tetingkap penggubah:\n"
-"Tidak dapat mengaktifkan komponen editor HTML."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Penggubah mengandungi badan mesej bukan teks yang tidak boleh diedit.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Mesej _Belum Dibaca Seterusnya"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Adakah anda ingin menyimpan perubahan?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Tidak dapat mewujudkan saluran: %s"
+msgid "Don't Recover"
+msgstr "Jangan import"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Tidak dapat menyimpan fail tandatangan: %s"
+msgid "Recover"
+msgstr "Keluarkan"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Tidak dapat menyimpan fail tandatangan: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Buang Perubahan"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Adakah anda ingin menyimpan perubahan?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Ralat ketika menyimpan jalan pintas."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Jangan import"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Amaran: Mesej yang Diubah Suai"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Ralat ketika menyimpan jalan pintas."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Adakah anda pasti ingin menghapuskan temu janji tak berjudul ini?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Keluarkan"
+msgid "Discard Changes"
+msgstr "_Buang Perubahan"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Simpan Mesej..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Tidak dapat mewujudkan saluran: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Mesej _Belum Dibaca Seterusnya"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Tidak dapat menyimpan fail tandatangan: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Amaran: Mesej yang Diubah Suai"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Lampirkan fail ke mesej"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Anda perlu mengkonfigurasikan akaun sebelum anda boleh menggubah mel."
 
@@ -12110,7 +12500,8 @@ msgstr ""
 "Fail dengan nama itu telah wujud.\n"
 "Tulis gantinya?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Tulis ganti fail?"
 
@@ -12287,81 +12678,97 @@ msgstr "Pilih masa untuk dibandingkan dengan"
 msgid "_Filter Rules"
 msgstr "Peraturan Penapis"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Ralat dalam ungkapan biasa '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Fail '%s' tidak wujud atau bukan fail biasa."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Pengemaskinian Mesyuarat"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Anda mestilah memilih tarikh."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Nama_ berbeza:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Anda mestilah menetapkan nama fail."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Mengeluarkan folder %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Fail '%s' tidak wujud atau bukan fail biasa."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Umpukan"
+msgid "Missing folder."
+msgstr "Mengeluarkan folder %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Anda mestilah menetapkan folder."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Pelayan tidak dipilih"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Ralat dalam ungkapan biasa '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Anda mestilah memilih tarikh."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Umpukan"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Anda mestilah menamakan penapis ini."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Anda mestilah menamakan vfolder ini."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Anda mestilah menetapkan nama fail."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Anda mestilah menetapkan folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Pelayan tidak dipilih"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12374,66 +12781,11 @@ msgstr "Pilih fail"
 msgid "<b>Then</b>"
 msgstr "<b>Genap tempoh:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Pilih Folder"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Penting"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Perkara yang Perlu Dibuat"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Selepas itu"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Ujian"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Tajuk Peraturan:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Tak Berjudul"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Genap tempoh:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Melaksanakan tindakan"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "sekiranya semua kriteria dipenuhi"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "sekiranya sebarang kriteria dipenuhi"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "masuk"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "keluar"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12525,6 +12877,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Selepas itu"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Ujian"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Tajuk Peraturan:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Genap tempoh:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "sekiranya semua kriteria dipenuhi"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "sekiranya sebarang kriteria dipenuhi"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Melaksanakan tindakan"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Ditugaskan"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Penerima"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Jawapan kepada"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Termasuk:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "masuk"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "keluar"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12655,7 +13078,7 @@ msgstr "tidak ditandai"
 msgid "Junk Test"
 msgstr "Jun"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12695,7 +13118,7 @@ msgstr "Keluar dari atur cara"
 msgid "Play Sound"
 msgstr "Dengarkan Bunyi"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Baca"
 
@@ -12765,9 +13188,9 @@ msgstr "bermula dengan"
 msgid "Stop Processing"
 msgstr "Hentikan Memproses"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12830,105 +13253,60 @@ msgstr "Tajuk tidak mengandungi"
 msgid "Virtual _Folders"
 msgstr "Folder Maya"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Tambah"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Sumber VFolder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Keutamaan Penggubah"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Buat konfigurasi keutamaan mel, termasuk keselamatan dan paparan mesej, di "
-"sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Buat konfigurasi semakan ejaan, tandatangan dan penggubah mesej di sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Buat konfigurasi akaun e-mel anda di sini"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kawalan konfigurasi akaun Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponen Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Penggubah Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kawalan konfigurasi penggubah Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Pemandang folder Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kawalan keutamaan Mel Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Mel"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Akaun Mel"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Keutamaan Mel"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Piawai]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Nama akaun"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Tanpa nama"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Bahasa"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Tambahkan Tandatangan"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Tandatangan"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Mesej Yang Disampaikan --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Wujudkan _Folder Maya Daripada Carian..."
 
@@ -12964,284 +13342,458 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Tetapkan di mana folder akan diwujudkan:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Nama _folder:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolder"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Kotak masuk"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Sedang memuatkan..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Alih"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Batalkan Tugas"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Pilih folder"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Salin"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Wujudkan folder"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Namakan semula folder \"%s\" kepada:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Namakan semula Folder"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Lihat"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Buka dalam Tetingkap _Baru"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Alih"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Folder Baru..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Namakan semula"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VFolder"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Kotak masuk"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Edit sebagai Mesej Baru..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Cetak"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Balas kepada Penghantar"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Balas kepada _Senarai"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Balas kepada _Semua"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Sampaikan"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Susu_lan..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Bendera Siap Ditunjukkan"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Ko_songkan Bendera"
 
-#: mail/em-folder-view.c:787 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 "Tanda_kan sebagai Telah Dibaca"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Tandakan sebagai Tidak Penting"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Tandakan sebagai _Belum Dibaca"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Tandakan sebagai _Penting"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Batalkan hapus"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Alih_kan ke Folder..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Salin ke Folder..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Tambahkan Penghantar ke Buku_Alamat"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Gunak_an Penapis"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Peraturan Penapis"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Wujud_kan Peraturan Daripada Mesej"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder bagi _Tajuk"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder bagi Pen_ghantar"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder bagi _Penerima"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder bagi Senarai _Mel"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "VFolder bagi Pen_ghantar"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Penapis bagi Ta_juk"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Penapis bagi Peng_hantar"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Penapis bagi Pe_nerima"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Penapis bagi _Senarai Mel"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Penapis bagi Peng_hantar"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Piawai"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Cetak Mesej"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Salin Lokasi Pautan"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klik untuk menambahkan tugas"
 
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Klik untuk menambahkan tugas"
+#: 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 "Daripada"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: 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 "Balas Kepada"
+
+#: 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 "Kepada"
+
+#: 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 "Sk"
+
+#: 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 "St"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Matches: %d"
-msgstr "Padanan: %d"
+msgid "%s attachment"
+msgstr "lampiran %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Format tandatangan yang tidak disokong"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Tidak dapat mengesah betul tandatangan dedaun"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Mendapatkan semula %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
 msgid "Unsigned"
 msgstr "Diumpukkan"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Tandatangan buruk"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Tandatangan buruk"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Disampuk"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#, fuzzy
+msgid "Encrypted, weak"
+msgstr "Kandungan badan indeks"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "Penyulitan PGP"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Kandungan badan indeks"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Bahagian badan luaran tidak sempurna."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Penuding ke tapak FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Penuding ke fail setempat (%s) sah di tapak \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Penuding ke fail setempat (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Penuding ke data jauh (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Penuding ke data luaran yang tak diketahui (jenis \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Memformat mesej"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Pengemel"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
+
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr "Padanan: %d"
+
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13249,12 +13801,7 @@ msgid ""
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Tandatangan buruk"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13262,22 +13809,17 @@ msgid ""
 msgstr ""
 "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Tandatangan buruk"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13286,234 +13828,94 @@ msgstr ""
 "Token_input mengandungi tandatangan tak sah, atau tandatangan yang tidak "
 "dapat disah betul."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Disampuk"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-#, fuzzy
-msgid "Encrypted, weak"
-msgstr "Kandungan badan indeks"
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "Penyulitan PGP"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-#, fuzzy
-msgid "Encrypted, strong"
-msgstr "Kandungan badan indeks"
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Sijil"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sijil masih belum sah"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "oleh %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Terlewat"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "oleh %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Lihat Dalam Talian"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Sembunyikan"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Halaman %d daripada %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Mendapatkan semula %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Bahagian badan luaran tidak sempurna."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Penuding ke tapak FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Penuding ke fail setempat (%s) sah di tapak \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Penuding ke fail setempat (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Penuding ke data jauh (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Penuding ke data luaran yang tak diketahui (jenis \"%s\")"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Memformat mesej"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Daripada"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Balas Kepada"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kepada"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Sk"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "St"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Pengemel"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarikh"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "lampiran %s"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Tidak dapat menghuraikan mesej S/MIME. Ralat tak diketahui."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Tidak dapat menghuraikan mesej MIME. Dipaparkan sebagai sumber."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Format tandatangan yang tidak disokong"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Tidak dapat mengesah betul tandatangan dedaun"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Tidak dapat mengesah betul tandatangan dedaun"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Setiap tahun"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Satu hari"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Satu m_inggu"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Satu bul_an"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13521,25 +13923,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Gagal untuk cache %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Gagal untuk cache %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Tidak dapat menyalin penghurai fail: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Gagal menyelesaikan hos `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Gagal mewujudkan saluran bagi '%s': %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13550,90 +13982,76 @@ msgstr "Simpan Sebagai..."
 msgid "untitled_image.%s"
 msgstr "Mesej Tak Berjudul"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Set sebagai _Latar belakang"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Balas kepada penghantar"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Buka Pautan dalam Pelayar"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Ha_ntar mesej ke..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Tambah ke Buku Alamat"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Buka dalam %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Stor ini tidak menyokong langganan, atau ia tidak diaktifkan."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Dilanggan"
 
-#: mail/em-subscribe-editor.c:637 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 "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Sila pilih pelayan."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Pelayan tidak dipilih"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Jangan tunjukkan mesej ini lagi."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Penapis"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Mesej Yang Disampaikan --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Pada %a, %Y-%m-%d di %H:%M %%+05d, %%s menulis:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "mesej"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Simpan Mesej..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Alamat"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mel dari %s"
@@ -13653,11 +14071,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13770,131 +14188,140 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Akaun Mel"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Akaun Mel"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Melaksanakan tindakan"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Keutamaan Piawai:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Pemberitahuan Mel Baru"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -13902,33 +14329,25 @@ msgid ""
 msgstr ""
 "_Penggesa apabila menghantar mesej HTML kepada kenalan yang tidak mahukannya"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Penggesa apabila menghantar mesej dengan hanya penerima St ditentukan"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13984,8 +14403,9 @@ msgid "Spell check inline"
 msgstr "Semak _Ejaan"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Keutamaan Piawai:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14128,33 +14548,65 @@ msgstr ""
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Pengimport Elm Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Pengimport Mel Netscape Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Keutamaan Penggubah"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Pengimport Outlook Express 4 Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Buat konfigurasi keutamaan mel, termasuk keselamatan dan paparan mesej, di "
+"sini"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Pengimport Pine Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Buat konfigurasi semakan ejaan, tandatangan dan penggubah mesej di sini"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Pengimport peti mel Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Buat konfigurasi akaun e-mel anda di sini"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "Peti Mel (peti mel)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Mel Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kawalan konfigurasi akaun Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponen Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Penggubah Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kawalan konfigurasi penggubah Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kawalan keutamaan Mel Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Akaun Mel"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Keutamaan Mel"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Mel"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14162,15 +14614,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Sila tunggu"
 
@@ -14202,19 +14654,47 @@ msgid "Select folder to import into"
 msgstr "Pilih pengimport"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Mengimport"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Mengimport Fail"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Pengimport Elm Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Pengimport Mel Netscape Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Pengimport Outlook Express 4 Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Pengimport Pine Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Pengimport peti mel Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "Peti Mel (peti mel)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Mengimbas %s"
@@ -14224,7 +14704,7 @@ msgstr "Mengimbas %s"
 msgid "Priority Filter \"%s\""
 msgstr "Penapis Keutamaan \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14251,7 +14731,7 @@ msgstr ""
 "keutamaan. Semak penapis yang diimport untuk memastikan\n"
 "segalanya berfungsi seperti yang diinginkan."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14263,7 +14743,7 @@ msgstr ""
 "yang tidak disokong dalam Evolution.\n"
 "Penapis ini akan digugurkan."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14277,24 +14757,24 @@ msgstr ""
 "diubah suai untuk menguji sama ada rentetan itu terkandung\n"
 "dalam badan mesej atau tidak."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution sedang mengimport data Netscape lama anda"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Seting"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Penapis Mel"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14328,128 +14808,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor Akaun Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Hos:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Nama_pengguna:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Laluan:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Mel ke %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Tajuk adalah %s "
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mel dari %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s senarai mel"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Jawapan kepada"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Tambahkan Peraturan Penapis"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d dipilih"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d belum dihantar"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Draf"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d dihantar"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d belum dihantar"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d keseluruhan"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d belum dihantar"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d dipilih"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Mesej Mel Baru"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mesej Mel"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Gubah mesej mel baru"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder Baru"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Penapis Mel"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Wujudkan kalendar baru"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Menyemak Khidmat"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Sedang disambungkan ke pelayan..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Pengenalan"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14459,12 +14950,12 @@ msgstr ""
 "bawah tidak perlu diisi, melainkan anda ingin memasukkan maklumat ini dalam "
 "e-mel yang anda hantar."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Menerima Mel"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14472,15 +14963,15 @@ msgstr ""
 "Sila masukkan maklumat tentang pelayan mel masuk anda di bawah. Jika anda "
 "tidak pasti, tanya pentadbir sistem anda atau Penyedia Khidmat Internet."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Sila pilih opsyen berikut"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Menghantar Mel"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14488,11 +14979,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Pengurusan Akaun"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14506,14 +14997,6 @@ msgstr ""
 "ini dalam ruang di bawah. Nama ini akan digunakan untuk tujuan paparan "
 "sahaja."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Menyemak Khidmat"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Sedang disambungkan ke pelayan..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14834,7 +15317,8 @@ msgid "Execute Command..."
 msgstr "Laksanakan Arahan..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Le_bar -tetap:"
 
 #: mail/mail-config.glade.h:82
@@ -15165,355 +15649,460 @@ msgstr "warna"
 msgid "description"
 msgstr "huraian"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
+msgid "Invalid authentication"
+msgstr "Pengesahan"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Pelayan SMTP %s tidak menyokong jenis pengesahan yang diminta %s "
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Adakah anda pasti ingin menghapuskan akaun ini?"
+#. 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-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Adakah anda pasti ingin membuka semua %d mesej dalam tetingkap yang "
-"berasingan?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "Adakah anda pasti ingin menghantar semula semua %d mesej?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Keluarkan secara kekal semua mesej yang dihapuskan daripada semua folder"
+"Anda menghantar mesej berformat HTML. Sila pastikan bahawa\n"
+"penerima berikut mahu dan boleh menerima mel HTML:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Adakah anda pasti ingin menghantar semula semua %d mesej?"
+msgid "_Send"
+msgstr "Hantarkan"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Adakah anda pasti ingin menghantar semula semua %d mesej?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Adakah anda pasti ingin menghantar semula semua %d mesej?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Tidak dapat menyalin folder: %s"
+msgid "Use default drafts folder?"
+msgstr "Membuka folder tugas piawai"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Tidak boleh mewujudkan folder: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Tidak dapat membuka folder draf bagi akaun ini.\n"
+"Adakah anda ingin membuka folder draf piawai?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Tidak dapat mewujudkan direktori sementara: %s"
+msgid "Use _Default"
+msgstr "Piawai"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Tidak dapat mewujudkan direktori\n"
-"%s\n"
-"Ralat: %s"
+"Adakah anda pasti ingin membuka semua %d mesej dalam tetingkap yang "
+"berasingan?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Tidak dapat menghapuskan folder:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
+msgid "_Expunge"
+msgstr "B_uang"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Folder `%s' tidak wujud."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr ""
+"Keluarkan secara kekal semua mesej yang dihapuskan daripada semua folder"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Tidak dapat mengalihkan folder: %s"
+msgid "_Empty Trash"
+msgstr "Kosongkan _Sampah"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Tidak dapat membuka folder sumber: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Anda mempunyai mesej yang belum dihantar, anda tetap ingin keluar?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Tidak dapat membuka folder sumber: %s"
+msgid "Error while {0}."
+msgstr ""
+"Ralat semasa '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Tidak dapat membuka mesej"
+msgid "Error while performing operation."
+msgstr ""
+"Ralat semasa melakukan pengendalian:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
+msgid "Enter password."
+msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Ralat ketika memuatkan maklumat penapis:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Tidak dapat mewujudkan direktori '%s': %s."
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Tidak dapat menyimpan dalam `%s'\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Tambahkan Tandatangan"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Tidak dapat mewujudkan direktori\n"
+"%s\n"
+"Ralat: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Tidak dapat menyimpan fail tandatangan: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Hapuskan \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Hapuskan kenalan yang dipilih"
+msgid "Cannot create temporary save directory."
+msgstr "Tidak dapat mewujudkan direktori sementara: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Buang perubahan"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Adakah anda ingin menyimpan perubahan?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Jangan hapuskan"
+msgid "File exists but cannot overwrite it."
+msgstr "Fail wujud, tulis ganti?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Masukkan Kata Laluan"
+msgid "File exists but is not a regular file."
+msgstr "Fail '%s' tidak wujud atau bukan fail biasa."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Ralat ketika memuatkan maklumat penapis:\n"
+"Tidak dapat menghapuskan folder:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Ralat semasa melakukan pengendalian:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Tidak dapat menghapuskan folder: %s: Folder tersebut tidak ada"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Ralat semasa '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Fail wujud, tulis ganti?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Tidak dapat menamakan semula folder: %s: Folder tersebut tidak ada"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Fail '%s' tidak wujud atau bukan fail biasa."
+msgid "Delete \"{0}\"?"
+msgstr "Hapuskan \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
+"Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "Folder bernama \"%s\" telah wujud. Sila gunakan nama yang lain."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Pengesahan"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Tidak dapat mengalihkan folder: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Tidak dapat membuka folder sumber: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Tidak dapat membuka mesej"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Tidak dapat menyalin folder: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Anda menghantar mesej berformat HTML. Sila pastikan bahawa\n"
-"penerima berikut mahu dan boleh menerima mel HTML:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Tidak boleh mewujudkan folder: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr ""
-"Anda pasti ingin menghapuskan folder \"%s\" dan semua subfolder dalamnya?"
+msgid "Cannot open source \"{1}\""
+msgstr "Tidak dapat membuka folder sumber: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Anda tidak mengisi semua maklumat yang diperlukan."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Anda tidak boleh mewujudkan dua akaun dengan nama yang sama."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Hapuskan kenalan yang dipilih"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Adakah anda pasti ingin menghapuskan akaun ini?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"VFolder berikut:\n"
-"%sMenggunakan folder yang dikeluarkan:\n"
-"    '%s'\n"
-"Dan telah dikemaskinikan."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Jangan hapuskan"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"VFolder berikut:\n"
-"%sMenggunakan folder yang dikeluarkan:\n"
-"    '%s'\n"
-"Dan telah dikemaskinikan."
+msgid "Could not save signature file."
+msgstr "Tidak dapat menyimpan fail tandatangan: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Tambahkan Tandatangan"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Buang perubahan"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "Pelayan SMTP %s tidak menyokong jenis pengesahan yang diminta %s "
+msgid "Do you wish to save your changes?"
+msgstr "Adakah anda ingin menyimpan perubahan?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15521,85 +16110,97 @@ msgstr ""
 "\n"
 "Adakah anda ingin menyimpan perubahan yang dilakukan?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Tidak dapat membuka folder draf bagi akaun ini.\n"
-"Adakah anda ingin membuka folder draf piawai?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Piawai"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Buang perubahan"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Membuka folder tugas piawai"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Anda tidak mengisi semua maklumat yang diperlukan."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Anda mempunyai mesej yang belum dihantar, anda tetap ingin keluar?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Anda tidak boleh mewujudkan dua akaun dengan nama yang sama."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Folder `%s' tidak wujud."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Buang perubahan"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Kosongkan _Sampah"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"VFolder berikut:\n"
+"%sMenggunakan folder yang dikeluarkan:\n"
+"    '%s'\n"
+"Dan telah dikemaskinikan."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "B_uang"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Hantarkan"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"VFolder berikut:\n"
+"%sMenggunakan folder yang dikeluarkan:\n"
+"    '%s'\n"
+"Dan telah dikemaskinikan."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Tulis ganti"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s berdenting"
@@ -15608,20 +16209,20 @@ msgstr "%s berdenting"
 msgid "Working"
 msgstr "Berfungsi"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Menapis Folder"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Mengambil Mel"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Gagal menggunakan penapis luaran: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15630,115 +16231,115 @@ msgstr ""
 "Gagal untuk menambah ke %s: %s\n"
 "Sebagai ganti menambah ke folder 'Hantar' setempat."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Gagal untuk menambah ke folder 'Hantar' setempat: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Menghantar mesej %d daripada %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Gagal menyahkod mesej."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Selesai."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Menyimpan mesej ke folder"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mengalihkan mesej ke %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Menyalin mesej ke %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Mengimbas folder dalam \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Mesej yang disampaikan"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Membuka folder %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Membuka simpanan %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Mengeluarkan folder %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Menyimpan folder '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Memuatkan semula folder"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Membuang folder"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Mengosongkan tong sampah dalam '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Folder Setempat"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Mendapatkan semula mesej %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15747,7 +16348,7 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15756,11 +16357,11 @@ msgstr ""
 "Ralat ketika menyimpan mesej ke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Menyimpan lampiran"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15769,17 +16370,17 @@ msgstr ""
 "Tidak dapat mewujudkan fail output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Tidak dapat menulis data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Terputus daripada %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Disambungkan semula ke %s"
@@ -15844,24 +16445,24 @@ msgstr "Sedang mengemaskinikan..."
 msgid "Waiting..."
 msgstr "Sedang menunggu..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Pengguna membatalkan pengendalian."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Masukkan Kata Laluan bagi %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Masukkan Kata Laluan"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Ingat kata laluan ini"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Ingat kata laluan ini bagi sesi seterusnya"
 
@@ -15903,89 +16504,94 @@ msgstr "Mesej yang disampaikan"
 msgid "Invalid folder: `%s'"
 msgstr "Membuka folder %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Menyediakan vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Mengemaskinikan vfolder bagi uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Mengemaskinikan vfolder bagi uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolder"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Edit vFolder"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "VFolder Baru"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Belum dilihat"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Dilihat"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Dijawab"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Pelbagai Mesej yang Belum Dilihat"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Pelbagai Mesej"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Paling rendah"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lebih rendah"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Lebih tinggi"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr " Paling tinggi"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Hari ini %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Semalam %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Menjana senarai mesej"
 
@@ -16017,43 +16623,43 @@ msgstr "Diterima"
 msgid "Size"
 msgstr "Saiz"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Panggil"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Jangan Sampaikan"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Susulan"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Untuk Pengetahuan Anda"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Sampaikan"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Maklum Balas Tidak Perlu"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Balas"
 
-#: mail/message-tag-followup.c:70 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 "Balas kepada Semua"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Kaji semula"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Tandakan untuk membuat Susulan"
 
@@ -16098,20 +16704,6 @@ msgstr "_Langgan"
 msgid "_Unsubscribe"
 msgstr "_Batalkan langganan"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Cangkerang Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Komponen Ujian Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16119,111 +16711,55 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Namakan semula kumpulan jalan pintas ini"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Sembunyikan bar jalan pintas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Keutamaan Piawai:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Keutamaan Piawai:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Antara muka konfigurasi Mel Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Tandakan lampiran yang akan ditunjukkan dalam talian secara piawai."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Membuka folder tugas piawai"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Membuka folder tugas piawai"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Membuka folder tugas piawai"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Membuka folder tugas piawai"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Toggle sama ada ingin menunjukkan bar jalan pintas atau tidak"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-mel"
@@ -16232,6 +16768,32 @@ msgstr "E-mel"
 msgid "Brought to you by"
 msgstr "Dibawa kepada anda oleh"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Ralat tak diketahui"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Argumen tak sah"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Tidak dapat mendaftarkan dalam OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Ralat generik"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Tak Berjudul)"
@@ -16371,11 +16933,11 @@ msgstr "Gagal melaksanakan gpg."
 msgid "_Import"
 msgstr "_Import"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Sedang menutup sambungan..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Seting Evolution"
 
@@ -16417,11 +16979,35 @@ msgstr "Nama folder tidak boleh mengandungi aksara \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' dan '..' ialah nama folder simpanan."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mel ke %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Ralat ketika melaksanakan %s."
@@ -16435,14 +17021,15 @@ msgid "Bug buddy could not be run."
 msgstr "Kawan pepijat tidak dapat dijalankan."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Tentang Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Bekerja Dalam Talian"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Bekerja Luar Talian"
 
@@ -16450,48 +17037,6 @@ msgstr "_Bekerja Luar Talian"
 msgid "Work Offline"
 msgstr "Bekerja Luar Talian"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution adalah dalam proses menjadi luar talian."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Argumen tak sah"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Tidak dapat mendaftarkan dalam OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Pangkalan Data Konfigurasi tidak dijumpai"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Ralat generik"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kotak semak"
@@ -16565,6 +17110,43 @@ msgstr "Sambungan Aktif"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik OK untuk menutup sambungan ini dan pergi ke luar talian"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendar:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kenalan: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Mel:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Tugas:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Jenis _folder:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Buka Folder Pengguna Lain"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Akaun:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Nama Folder:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Pengguna:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pembantu Persediaan Evolution"
@@ -16607,6 +17189,20 @@ msgstr ""
 "\n"
 "Klik butang \"Guna\" untuk menyimpan seting anda. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Cangkerang Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Komponen Ujian Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klik \"Import\" untuk mula mengimport fail ke dalam Evolution. "
@@ -16671,13 +17267,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution boleh mengimport data daripada fail berikut:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16709,58 +17305,49 @@ msgstr ""
 "Kami harap anda memperoleh hasil daripada usaha gigih kami, dan kami\n"
 "tidak sabar menunggu sumbangan anda!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Terima kasih\n"
 "Pasukan Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Jangan beritahu saya lagi"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Tidak dapat mencapai cangkerang Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Tidak dapat memulakan cangkerang Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Mulakan dalam mod luar talian"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Mulakan dalam mod dalam talian"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Tamatkan semua komponen Evolution secara paksa"
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Peningkatan paksa fail konfigurasi daripada Evolution 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Hantarkan output penyahpijatan bagi semua komponen ke fail."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16769,14 +17356,80 @@ msgstr ""
 "%s: --dalam talian dan --luar talian tidak dapat digunakan bersama.\n"
 "  Gunakan %s --bantuan untuk keterangan lanjut.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Tidak dapat mencapai cangkerang Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Pembantu Akaun Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Nama Sijil"
 
@@ -17008,12 +17661,6 @@ msgstr "Anda mempunyai sijil pada fail yang mengecam orang-orang ini:"
 msgid "Your Certificates"
 msgstr "Sijil Anda"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID Kenalan telah wujud"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17234,6 +17881,12 @@ msgstr "ID Unik"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID Kenalan telah wujud"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17275,12 +17928,12 @@ msgstr "Tajuk piawai bagi mesej."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Tidak dapat melaksanakan '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Menamatkan %s (%s)\n"
@@ -17344,7 +17997,8 @@ msgid "Select all contacts"
 msgstr "Pilih semua kenalan"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Hantarkan mesej kepada kenalan yang dipilih."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17376,8 +18030,8 @@ msgstr "Lihat kenalan semasa"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Tindakan"
@@ -17395,7 +18049,8 @@ msgid "_Preview Pane"
 msgstr "_Pralihat Anak Tetingkap"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Simpan sebagai VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17523,11 +18178,21 @@ msgstr "Lihat kenalan semasa"
 msgid "Week"
 msgstr "Minggu"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Minggu Bekerja"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Temu janji"
 
+#: 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 "T_utup"
+
 #: 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
@@ -17847,6 +18512,16 @@ msgstr "_Songsangkan Pemilihan"
 msgid "_Threaded Message List"
 msgstr "_Senarai Mesej yang Disambungkan"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Tutup"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18092,7 +18767,8 @@ msgid "Open the selected message in a new window"
 msgstr "Buka mesej yang dipilih dalam tetingkap baru"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Buka mesej yang dipilih dalam penggubah untuk menghantarnya semula"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18207,58 +18883,46 @@ msgstr "VFolder bagi _Tajuk"
 msgid "_Attached"
 msgstr "_Dilampirkan"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Salin ke Folder"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Wujudkan Penapis Daripada Mesej"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Pergi Ke"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Dalam Talian"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Lebih Besar"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Paparan Mesej"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Alihkan ke Folder"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Mesej Seterusnya"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Paparan Normal"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Buka Mesej"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Mesej Sebelumnya"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Disebut"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Hantar semula..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Alatan"
@@ -18267,16 +18931,6 @@ msgstr "_Alatan"
 msgid "_Undelete"
 msgstr "_Batalkan hapus"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Tutup"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Lampirkan"
@@ -18673,6 +19327,11 @@ msgstr "Keutamaan Mel"
 msgid "_Send / Receive"
 msgstr "_Hantar / Terima"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Cari Sekarang"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Mengikut _Syarikat"
@@ -18740,10 +19399,6 @@ msgstr "_Tarikh Genap Tempoh:"
 msgid "With _Status"
 msgstr "Set Status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tugas"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18902,6 +19557,34 @@ msgstr "Lain..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Ralat Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Mel Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Maklumat Mesyuarat"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Ringkasan Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Mesej Dihantar dan Didraf"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19021,6 +19704,35 @@ msgstr "Teks"
 msgid "Find _Now"
 msgstr "Cari Sekarang"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 telah wujud\n"
+"Adakah anda ingin menulis gantinya?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Tidak dapat menyimpan dalam `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Tidak dapat menyimpan dalam `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19031,9 +19743,132 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% siap)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Pelihat folder Buku Alamat Evolution"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Buku Alamat"
+#~ msgid "Address 2:"
+#~ msgstr "Alamat _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Pemandang Kalendar Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Pemandang Tugas Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Tidak dapat memulakan gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Tidak dapat membuka folder dalam '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI yang akan dipaparkan oleh kalendar"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Jenis pandangan yang akan ditunjukkan"
+
+#~ msgid "Display a message"
+#~ msgstr "Paparkan mesej"
+
+#~ msgid "Alerts"
+#~ msgstr "Berjaga-jaga"
+
+#~ msgid "Time"
+#~ msgstr "Masa"
+
+#~ msgid "_General"
+#~ msgstr "_Am"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Pilih pengimport"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalendar"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Senarai Tugas"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Fail kalendar tidak dapat dikemaskinikan!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI bagi folder tugas akan memaparkan"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Tidak dapat memuatkan tugas dalam `%s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Pemandang folder Mel Evolution"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder bagi Pen_ghantar"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Penapis bagi Peng_hantar"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Gagal untuk cache %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Gagal untuk cache %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Gagal menyelesaikan hos `%s': %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI bagi kenalan yang akan dipaparkan oleh kawalan"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Namakan semula kumpulan jalan pintas ini"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Sembunyikan bar jalan pintas"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Membuka folder tugas piawai"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Membuka folder tugas piawai"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Membuka folder tugas piawai"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Membuka folder tugas piawai"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Toggle sama ada ingin menunjukkan bar folder atau tidak"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Toggle sama ada ingin menunjukkan bar jalan pintas atau tidak"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Tidak dapat memulakan cangkerang Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Hantar semula..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19215,9 +20050,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "S_pouse:"
 #~ msgstr "P_asangan:"
 
-#~ msgid "_Add"
-#~ msgstr "_Tambah"
-
 #~ msgid "_Business:"
 #~ msgstr "_Perniagaan:"
 
@@ -19339,15 +20171,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Tarikh genap tempoh adalah sebelum tarikh mula!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Tarikh Mula:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Tarikh Genap Tempoh:"
-
-#~ msgid "Priority:"
-#~ msgstr "Keutamaan:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19379,13 +20202,6 @@ msgstr "%s (%d%% siap)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Tidak dapat menyalin penghurai fail: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19543,10 +20359,6 @@ msgstr "%s (%d%% siap)"
 #~ msgstr "Pralihat kalendar yang akan dicetak"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Masukkan Kata Laluan bagi %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Senarai Tugas"
 
@@ -19605,30 +20417,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Tidak dapat mencari folder kongsi yang ditetapkan."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendar:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Mel:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Tugas:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Jenis _folder:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Buka Folder Pengguna Lain"
-
-#~ msgid "_Account:"
-#~ msgstr "_Akaun:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Nama Folder:"
-
-#~ msgid "_User:"
-#~ msgstr "_Pengguna:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Wujudkan mesyuarat baru"
@@ -19936,9 +20724,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Keluar dari Pembantu"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Sambungan berikut aktif sekarang:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Mencari Kenalan"
 
@@ -20171,9 +20956,6 @@ msgstr "%s (%d%% siap)"
 #~ msgstr ""
 #~ "Mesej ini ditandatangani secara digital dan tidak dapat dibuktikan sah."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Ralat Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20303,18 +21085,6 @@ msgstr "%s (%d%% siap)"
 #~ msgstr "<b>Opsyen kalendar</b>"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Peringatan"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Mula:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Opsyen kalendar</b>"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Pengelasan"
 
@@ -21476,9 +22246,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Buat konfigurasi Ringkasan Evolution di sini"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Ringkasan Evolution"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Komponen Ringkasan Evolution"
 
@@ -21881,9 +22648,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Asia"
 #~ msgstr "Asia"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22937,9 +23701,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -23003,9 +23764,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25988,9 +26746,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28798,9 +29553,6 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Shown"
 #~ msgstr "Ditunjukkan"
 
-#~ msgid "No tasks"
-#~ msgstr "Tiada tugas"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Tiada Huraian)"
 
@@ -29923,8 +30675,5 @@ msgstr "%s (%d%% siap)"
 #~ msgid "Delete news feed"
 #~ msgstr "Hapuskan suapan berita"
 
-#~ msgid "_Mail"
-#~ msgstr "_Mel"
-
 #~ msgid "_Weather"
 #~ msgstr "_Cuaca"
diff --git a/po/nl.po b/po/nl.po
index 9b713587aa..0059fcdf3a 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -20,7 +20,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -36,6 +36,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution adresboek"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "contacten kop: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution minikaart"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "huidige adresboek map"
@@ -56,14 +64,6 @@ msgstr " kaarten"
 msgid " card"
 msgstr " kaart"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "contacten kop: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution minikaart"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Standaard sync-adres:"
@@ -78,65 +78,20 @@ msgstr "Kon adresboek niet laden"
 msgid "Could not read pilot's Address application block"
 msgstr "Kon de adresgegevens niet uit de pilot lezen"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Auto-afmaken"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certificaten"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Hier kunt u auto-afmaken instellen"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adresboek"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adresboek adrespopup"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adresboek adresweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adresboek kaartweergave"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution adresboekcomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adresboek mapweergave"
-
-# vertaling van control hier?
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime certificaatbeheer controle"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonieme verbinding met LDAP server wordt opgezet"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution configuratie voor mapinstellingen"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Fout bij het aanmelden.\n"
 
-# Fout in het Engels: Manager ipv Manage
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Uw S/Mime certificaten hier beheren"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -178,42 +133,46 @@ msgstr "Contacten: "
 msgid "Create a new contacts group"
 msgstr "Maakt een nieuwe snelkoppelingsgroep aan"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: addressbook/gui/component/addressbook-config.c:483
 msgid "Failed to connect to LDAP server"
 msgstr "Kan geen verbinding krijgen met LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Fout bij het aanmelden bij de LDAP server"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Kan geen query uitvoeren op de Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "De server antwoordde zonder ondersteunde zoekbasis"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Deze server ondersteunt geen LDAPv3 schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Fout bij het laden van schema informatie"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Het antwoord van de server bevatte geen geldige schema informatie"
 
 # Of: bezig met overzetten
 #: addressbook/gui/component/addressbook-migrate.c:68
-#: calendar/gui/migration.c:137 mail/em-migrate.c:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Nu aan het overzetten ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "`%s' wordt overgezet:"
@@ -221,8 +180,8 @@ msgstr "`%s' wordt overgezet:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Op deze computer"
 
@@ -230,7 +189,7 @@ msgstr "Op deze computer"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Persoonlijk"
@@ -296,20 +255,42 @@ msgstr ""
 "\n"
 "Een ogeblik geduld. Evolution zal nu uw mappen overzetten..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonieme verbinding met LDAP server wordt opgezet"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
+"Adresboek '%s' zal worden verwijderd. Weet u zeker dat u wilt doorgaan?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Fout bij het aanmelden.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Nieuw adresboek"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sVoer uw wachtwoord in voor %s (gebruiker %s)"
+#: 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
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "Verwijderen"
+
+#: addressbook/gui/component/addressbook-view.c:763
+#: calendar/gui/calendar-component.c:431 calendar/gui/tasks-component.c:367
+msgid "Properties..."
+msgstr "Eigenschappen..."
+
+#. 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
+#: 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 "Adresboek"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -331,6 +312,63 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI voor de laatst gebruikte map in de slecteer namen dialoog"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Auto-afmaken"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certificaten"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Hier kunt u auto-afmaken instellen"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adresboek"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adresboek adrespopup"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adresboek adresweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adresboek kaartweergave"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution adresboekcomponent"
+
+# vertaling van control hier?
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime certificaatbeheer controle"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution configuratie voor mapinstellingen"
+
+# Fout in het Engels: Manager ipv Manage
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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"
@@ -352,6 +390,7 @@ msgstr "Ondersteunde bases _weergeven"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -423,7 +462,7 @@ msgstr "Toevoegen aan contacten"
 msgid "Address Book Properties"
 msgstr "Adresboek eigenschappen"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Altijd"
@@ -438,106 +477,96 @@ msgid "Basic"
 msgstr "Basis"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Kleuren"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Bezig met verbinden"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Unieke _naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Unieke _naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-mail adres:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-mail adres:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Ondersteunde zoekbases"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Algemeen"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nooit"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Één"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Kies een kleur"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Zoek_gebied: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Zoek basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Zoek basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Zoek_gebied: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Zoeken"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -546,7 +575,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -562,7 +591,7 @@ 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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -575,19 +604,19 @@ msgstr ""
 "u\n"
 "veiligheidsrisico's loopt."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Ondersteunde zoekbases"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -599,7 +628,7 @@ msgstr ""
 "beginnen. Als u hier niets invult, zal de zoekopdracht aan het begin van de "
 "boom starten."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -613,7 +642,7 @@ msgstr ""
 "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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -621,7 +650,7 @@ msgstr ""
 "Dit is de volledige naam van uw LDAP-server. Bijvoorbeeld \"ldap.mijnbedrijf."
 "nl\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -630,7 +659,7 @@ 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:63
+#: 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 "
@@ -639,7 +668,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -648,7 +677,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -659,128 +688,135 @@ msgstr ""
 "is een lijst met standaardpoorten gegeven. Vraag aan uw systeembeheerder\n"
 "welke poort u moet invullen."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tijdsformaat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "Gebruik _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Unieke naam (DN) wordt gebruikt"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "E-mail adres wordt gebruikt"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Indien mogelijk"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Toevoegen aan contacten"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Downloadlimiet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-mail adres:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "In_logmethode:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Naam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Poortnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioriteit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Zoek_basis:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Servernaam:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_Server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuten):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Beveiligde verbinding (SSL) gebruiken:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kaarten"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "Algemeen-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minuten"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "Zoeken-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution adresboek naamselectie-interface"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Alle verwijderen"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Verwijderen"
 
+#: 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 "Naam"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Alle verwijderen"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Contactenlijst weergeven"
@@ -803,22 +839,15 @@ msgstr "Toevoegen aan contacten"
 msgid "Unnamed Contact"
 msgstr "Ander contact"
 
-#: 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
-msgid "Name"
-msgstr "Naam"
-
 #: 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
 msgid "Source"
 msgstr "Bron"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution adresboek naamselectie-interface"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -887,142 +916,142 @@ msgid "<b>Work</b>"
 msgstr "Werkweek"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adres _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Verjaardag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Ge_boortedatum:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "K_alender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Plaats:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Opdracht:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Contacten bewerken"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Afd_eling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "V_rij/Bezet URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Volledige _naam..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Thuis"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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 "_Functie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Lokatie: "
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-mailadres"
 
 # beheerder
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Manager"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Bijnaam:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Aa_ntekeningen:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Overige"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postbus:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1050,9 +1079,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Werk"
@@ -1085,23 +1114,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Weet u zeker dat u deze\n"
+"contacten wilt verwijderen?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Weet u zeker dat u dit\n"
+"contact wilt verwijderen?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Adres"
 
 #: 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Bewerkbaar"
 
@@ -2073,91 +2118,109 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Dienst"
-
-#: 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
-msgid "Location"
-msgstr "Lokatie"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Gebruikersnaam"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Bron boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Doel boek"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Is nieuw contact"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Beschrijfbare velden"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Veranderd"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Categoriebewerker niet beschikbaar."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Dit contact behoort tot de categoriëen:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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:1836
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "De volgende verbindingen zijn op 't moment actief:"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Kon geen widget vinden voor een veld: `%s'"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Dienst"
+
+#: 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
+msgid "Location"
+msgstr "Lokatie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Gebruikersnaam"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact snel toevoegen"
@@ -2175,22 +2238,6 @@ msgstr "_Volledige naam:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Weet u zeker dat u deze\n"
-"contacten wilt verwijderen?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Weet u zeker dat u dit\n"
-"contact wilt verwijderen?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2336,8 +2383,8 @@ msgstr "Contactlijstbewerker"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Boek"
 
@@ -2398,6 +2445,432 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Uitgebreid zoeken"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(kaart)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "kaart"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Lijstleden"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisatie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Positie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Video conferentie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefoon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "fax"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "werk"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+# mobieltje? mobiele? pocket?
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiele telefoon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "persoonlijk"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Opmerkingen"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Functie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Homepage"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Succes"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Opslagplaats offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Adresboek bestaat niet"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "Nieuwe contactenlijst"
+
+#. 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
+msgid "Permission denied"
+msgstr "Operatie niet toegestaan"
+
+# contact niet gevonden?
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kaart niet gevonden"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Kaart-ID bestaat reeds"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protocol niet ondersteund"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Geannuleerd"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Kan bron niet openen"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Aanmelding mislukt"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Aanmelding is vereist"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr "TLS is niet beschikbaar"
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Een dergelijk bericht bestaat niet"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Onbekende fout"
+
+#: 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 ""
+"Wij konden dit adresboek niet openen.  Controleer of het pad bestaat\n"
+"en of u het mag benaderen."
+
+#: 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 ""
+"Wij konden het adresboek niet openen.  Dit kan komen doordat\n"
+"u een ongeldige URI heeft opgegeven of doordat de LDAP server\n"
+"onbereikbaar is."
+
+#: 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 ""
+"Deze versie van Evolution heeft geen LDAP supportmeegecompileerd.  Als u "
+"LDAP wilt gebruiken in Evolutionmoet u het programma vanuit de CVS sources "
+"meecompilerennadat u OpenLDAP van onderstaande link heeft opgehaald."
+
+#: 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 ""
+"Kan het adresboek niet openen.  Dit kan komen doordatu een ongeldige URI "
+"heeft opgegeven of dat de serveronbereikbaar is."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Kan het adresboek niet openen"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"Er zijn meer resultaten gevonden dan weergegeven kunnen\n"
+"worden. Probeer uw opdracht specifieker te maken of verhoog\n"
+"de limiet voor resultaten in de voorkeuren van het adresboek."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Deze zoekopdracht duurt langer dan de ingestelde limiet.\n"
+"Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
+"bij de instellingen van de adresboekserver."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Het backend van dit adresboek kon uw opdracht niet verwerken."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Het backend van dit adresboek weigerde uw zoekopdracht te verwerken."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+msgid "This query did not complete successfully."
+msgstr "De zoekopdracht is niet succesvol beeïndigd"
+
+#: addressbook/gui/widgets/eab-gui-util.c:206
+msgid "Do you want to save changes?"
+msgstr "Wilt u de wijzingen opslaan?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:208
+msgid "_Discard"
+msgstr "_Verwerpen"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+msgid "Error adding list"
+msgstr "Fout bij toevoegen lijst"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Fout bij toevoegen kaart"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Fout bij aanpassen ljist"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Fout bij aanpassen van kaart"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Fout bij verwijderen lijst"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Fout bij verwijderen kaart"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"Bij het openen van %d kaarten worden %d nieuwe vensters geopend.\n"
+"Wilt u deze kaarten werkelijk allemaal openen?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s bestaat reeds.\n"
+"Wilt u het overschrijven?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+msgid "Overwrite"
+msgstr "Overschrijven"
+
+#: addressbook/gui/widgets/eab-gui-util.c:400
+#, c-format
+msgid "Error saving %s: %s"
+msgstr "Fout bij opslaan %s: %s"
+
+#. This is a filename. Translators take note.
+#: addressbook/gui/widgets/eab-gui-util.c:437
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lijst"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Verplaats kaart naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Kopieer kaart naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Verplaats kaarten naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Kopieer kaarten naar"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Selecteer doel adresboek"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Meerdere Vkaarten"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "Vkaart voor %s"
+
+#.
+#. * 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 "(geen)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primaire e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Kies een actie"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Nieuw contact maken \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Voeg adres toe aan bestand contact \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Adresboek wordt benaderd..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Contactinformatie bewerken"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "E-mailadres samenvoegen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "en één andere kaart."
+msgstr[1] "en %d andere kaarten."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Volledige VCard tonen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Compacte VCard tonen"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Opslaan in het adresboek"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Geen contacten"
@@ -2412,8 +2885,8 @@ msgstr[1] "%d contacten"
 #: 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Zoekopdracht"
 
@@ -2467,9 +2940,10 @@ msgstr "Adresboek"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Opslaan als VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2534,7 +3008,7 @@ msgid "Cut"
 msgstr "Knippen"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2545,18 +3019,8 @@ msgstr "Kopiëren"
 msgid "Paste"
 msgstr "Plakken"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Verwijderen"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Huidige weergave"
 
@@ -2573,7 +3037,7 @@ msgstr ""
 "gebruiken."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Elke categorie"
@@ -2614,21 +3078,6 @@ msgstr "Categorieën"
 msgid "Company Phone"
 msgstr "Bedrijfstelefoon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-mail 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Achternaam"
@@ -2666,30 +3115,14 @@ msgstr "Journaal"
 msgid "Manager"
 msgstr "Manager"
 
-# mobieltje? mobiele? pocket?
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiele telefoon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Bijnaam"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Opmerkingen"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kantoor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisatie"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Andere Fax"
@@ -2742,21 +3175,29 @@ msgstr "Unit"
 msgid "Web Site"
 msgstr "Website"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Breedte"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Hoogte"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Heeft focus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Geselecteerd"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Heeft cursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Veld"
@@ -2773,10 +3214,6 @@ msgstr "Tekst model"
 msgid "Max field name length"
 msgstr "Maximale veldnaam lengte"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolombreedte"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2805,405 +3242,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Geselecteerd"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Heeft cursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(kaart)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "kaart"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Lijstleden"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Positie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Video conferentie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefoon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "fax"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "werk"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "persoonlijk"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Functie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Homepage"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Succes"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Opslagplaats offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Adresboek bestaat niet"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "Nieuwe contactenlijst"
-
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "Operatie niet toegestaan"
-
-# contact niet gevonden?
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kaart niet gevonden"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Kaart-ID bestaat reeds"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protocol niet ondersteund"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Geannuleerd"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Kan bron niet openen"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Aanmelding mislukt"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Aanmelding is vereist"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS is niet beschikbaar"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Een dergelijk bericht bestaat niet"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Onbekende fout"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Wij konden dit adresboek niet openen.  Controleer of het pad bestaat\n"
-"en of u het mag benaderen."
-
-#: 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 LDAP server is unreachable."
-msgstr ""
-"Wij konden het adresboek niet openen.  Dit kan komen doordat\n"
-"u een ongeldige URI heeft opgegeven of doordat de LDAP server\n"
-"onbereikbaar is."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"Deze versie van Evolution heeft geen LDAP supportmeegecompileerd.  Als u "
-"LDAP wilt gebruiken in Evolutionmoet u het programma vanuit de CVS sources "
-"meecompilerennadat u OpenLDAP van onderstaande link heeft opgehaald."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Kan het adresboek niet openen.  Dit kan komen doordatu een ongeldige URI "
-"heeft opgegeven of dat de serveronbereikbaar is."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Kan het adresboek niet openen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Er zijn meer resultaten gevonden dan weergegeven kunnen\n"
-"worden. Probeer uw opdracht specifieker te maken of verhoog\n"
-"de limiet voor resultaten in de voorkeuren van het adresboek."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Deze zoekopdracht duurt langer dan de ingestelde limiet.\n"
-"Wees specifieker bij uw zoekopdracht of verhoog de limiet\n"
-"bij de instellingen van de adresboekserver."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Het backend van dit adresboek kon uw opdracht niet verwerken."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Het backend van dit adresboek weigerde uw zoekopdracht te verwerken."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "De zoekopdracht is niet succesvol beeïndigd"
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Wilt u de wijzingen opslaan?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Verwerpen"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Fout bij toevoegen lijst"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Fout bij toevoegen kaart"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Fout bij aanpassen ljist"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Fout bij aanpassen van kaart"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Fout bij verwijderen lijst"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Fout bij verwijderen kaart"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Bij het openen van %d kaarten worden %d nieuwe vensters geopend.\n"
-"Wilt u deze kaarten werkelijk allemaal openen?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s bestaat reeds.\n"
-"Wilt u het overschrijven?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Overschrijven"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Fout bij opslaan %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lijst"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Verplaats kaart naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Kopieer kaart naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Verplaats kaarten naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Kopieer kaarten naar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Selecteer doel adresboek"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Meerdere Vkaarten"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "Vkaart voor %s"
-
-#.
-#. * 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 "(geen)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primaire e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Kies een actie"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Nieuw contact maken \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Voeg adres toe aan bestand contact \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Adresboek wordt benaderd..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Contactinformatie bewerken"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-mailadres samenvoegen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "en één andere kaart."
-msgstr[1] "en %d andere kaarten."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Volledige VCard tonen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Compacte VCard tonen"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Opslaan in het adresboek"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolombreedte"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3247,11 +3288,6 @@ msgstr "Evolution VCard import assistent"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Envelop afdrukken"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Druk contacten af"
@@ -3261,6 +3297,11 @@ msgstr "Druk contacten af"
 msgid "Print contact"
 msgstr "Druk kaart af"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Envelop afdrukken"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 punts Tahoma"
@@ -3445,16 +3486,6 @@ msgstr "Kaart print test"
 msgid "This should test the contact print code"
 msgstr "Dit zou de kaart print code moeten testen"
 
-#: 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
-msgid "Can not open file"
-msgstr "Kan bestand niet openen"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Kan URI niet laden"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Specificeer het uitvoer bestand inplaats van de standaard uitvoer"
@@ -3513,6 +3544,16 @@ msgstr "In normale mode zou er geen grootte optie hoeven te zijn."
 msgid "Impossible internal error."
 msgstr "Onmogelijke interne fout."
 
+#: 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
+msgid "Can not open file"
+msgstr "Kan bestand niet openen"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Kan URI niet laden"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fout bij laden standaard adresboek."
@@ -3525,11 +3566,12 @@ msgstr "Invoer Bestand"
 msgid "No filename provided."
 msgstr "Geen bestandsnaam opgegeven."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Lijst van onbenoemden"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Wachtwoord invoeren"
 
@@ -3561,118 +3603,55 @@ msgstr "Standaard prioriteit:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kon actielijstgegevens niet uit de pilot lezen"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender en Taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalenders"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender en taken"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution kalenderconfiguratie"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution kalender planingsberichtenweergave"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution kalenderweergave"
-
-# of: kalender-/taakbeheer
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender- / taakbeheer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution taakbeheer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalender component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution taken-component"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Taken"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalender alarmweergave"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Bezig met starten:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Einde:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm op %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Sl_uiten"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "S_luimeren"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Sluimertijd (minuten)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Afspraak bewerken"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "S_luimeren"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Openen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Negeren"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Allemaal verbergen"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Geen beschrijving beschikbaar."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3685,12 +3664,12 @@ msgstr ""
 "Begint om %s\n"
 "Eindigt op %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Waarschuwing"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3702,7 +3681,7 @@ msgstr ""
 "u dit ingesteld. Evolution zal in plaats daarvan een\n"
 "normaal dialoogvenster weergeven als herinnering."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3719,19 +3698,19 @@ msgstr ""
 "\n"
 "Weet u zeker dat dit programma gestart moet worden?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Dit bericht niet meer weergeven voor dit programma."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalender alarmweergave"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kon bonobo niet initialiseren"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Kon Gnome-vfs niet initialiseren"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Creëeren van de alarmnotificatie-dienst is mislukt:"
 
@@ -3840,56 +3819,42 @@ msgid "Weekday the week starts on"
 msgstr "Weekdag waarmee de week begint"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Vraag om bevestiging bij het wissen van afspraken"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Vr_aag om bevestiging bij het legen van mappen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Verbergen van voltooide taken"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Instellen standaard herinnering bij gebeurtenissen"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Toon de tijd in 24 uurs formaat in plaats van het gebruik van am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Week_nummers tonen in datum navigatie"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Samenvatting bevat"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Omschrijving bevat"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Commentaar bevat"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Lokatie bevat"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Niet passend"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3898,122 +3863,132 @@ msgstr ""
 "Deze bewerking zal alle taken die ouder zijn de gespecificeerde tijd "
 "permanent  verwijderen. Als u doorgaat zult u ze niet meer kunnen herstellen."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Verwijderen van items ouder dan"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dagen"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Agenda '%s' wordt verwijderd. Weet u zeker dat u door wilt gaan?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Nieuwe agenda"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Eigenschappen..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Kalender wordt geladen..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Kan de agenda '%s' niet openen voor het creëren van gebeurtenissen en "
 "afspraken"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 "Er is geen agenda beschikbaar voor het creëren van gebeurtenissen en "
 "bijeenkomsten"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalenders"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Afspraak"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Maak een nieuwe afspraak"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nieuwe vergadering"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Ver_gadering"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Maak een nieuw bijeenkomstverzoek"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Nieuwe dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Dag-omvattende afspraak"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Maak een nieuwe dagomvattende afspraak"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Nieuwe kalender"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Maak een nieuwe agenda aan"
 
@@ -4043,15 +4018,35 @@ msgstr "Week weergave"
 msgid "Month View"
 msgstr "Maand weergave"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Samenvatting bevat"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Omschrijving bevat"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Commentaar bevat"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Lokatie bevat"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Niet passend"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fout bij openen van de kalender"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Methode niet ondersteund tijdens het openen van de kalender"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Toegang geweigerd bij openen van de kalender"
 
@@ -4060,19 +4055,6 @@ msgstr "Toegang geweigerd bij openen van de kalender"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Kon de map in `%s' niet openen"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "De URI die de kalender zal tonen"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Het type weergaven"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Geluid Alarm Opties"
@@ -4138,7 +4120,7 @@ msgstr "nogmaals"
 msgid "hours"
 msgstr "uren"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Actie/Sensor"
 
@@ -4157,14 +4139,14 @@ msgstr "Algemeen"
 msgid "Date/Time:"
 msgstr "Datum/Tijd"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Een bericht tonen"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Speel een geluid af"
 
+#: 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 "Herinneringen"
@@ -4179,6 +4161,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:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Samenvatting:"
@@ -4218,10 +4201,106 @@ msgstr "minuten"
 msgid "start of appointment"
 msgstr "begin van afspraak"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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:178
+#, 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:193
+#, 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:265
+#, 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:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"De groep '%s' is op afstand. U dient een lokatie op te geven waar de lokale "
+"kalender vandaan gehaald dient te worden"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Nieuwe kalender toevoegen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Takenlijst-groep"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Nieuwe kalender toevoegen"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "weken"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Ingeschakeld"
 
@@ -4235,19 +4314,19 @@ msgstr "Niet verwijderen"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Uitzetten"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aanzetten"
 
@@ -4272,162 +4351,176 @@ msgid "60 minutes"
 msgstr "60 minuten"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Waarschuwingen"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Begint:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Herinneringen"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Kalenderinformatie"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Dan</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Werkweek"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- en Taakinstellingen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Kleur voor taken die te laat zijn"
 
-#: 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 "Kleur voor taken voor vandaag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Dag _eindigd:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dagen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Weergave"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Aanzetten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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:563
 msgid "Friday"
 msgstr "Vrijdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Uren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuten"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Maandag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Z_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Zaterdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Laat herinnering zien"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Week_nummers tonen in datum navigator"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Zondag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "T_aken die vandaag verlopen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "D_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Takenlijst"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Donderdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Tijd"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Tijd_zone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Tijdsformaat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Dinsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "W_eek begint:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Woensdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Werkweek"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Werkdagen:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12-uurs (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-uurs"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "URL _toevoegen"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Vr_aag om bevestiging bij het wissen van items"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Weekeinden comprimeren in maand weergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Dag begint:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Weergave"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4437,141 +4530,46 @@ msgstr "_Weergave"
 msgid "_Edit"
 msgstr "Be_werken"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Vrij/Bezet publicatie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Vrij"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Algemeen"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Verberg voltooide _taken na"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Maa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Verl_open taken:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Zat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Eindtijden van afspraken tonen in week- en maandweergave"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Tijd_verdeling:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Din"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Woe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "voor het begin van elke afspraak"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, 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:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"De groep '%s' is op afstand. U dient een lokatie op te geven waar de lokale "
-"kalender vandaan gehaald dient te worden"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Nieuwe kalender toevoegen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Takenlijst-groep"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalender eigenschappen"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Nieuwe kalender toevoegen"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "weken"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4655,81 +4653,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s U heeft niet veranderd, de editor verversen?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Verificatiefout: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " tot "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Voltooid"
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Voltooid"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Verloopt "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Verloopdatum "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Kon object niet vernieuwen"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Afspraak Bewerken"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Afspraak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Taak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagboekelement - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Geen samenvatting"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Opslaan als..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "De gemaakte veranderingen aan dit item worden verworpen indien een "
 "bijwerking via e-mail arriveerd"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Kan huidige niet gebruiken!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Verificatiefout: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " tot "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Voltooid"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Verloopt "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Verloopdatum "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Kan bron niet openen"
@@ -4852,27 +4850,27 @@ msgstr "Overdragen aan:"
 msgid "Enter Delegate"
 msgstr "Gemachtigde invoeren"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Afspraak"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Herinnering"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Herhaling"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Bijeenkomstplannen"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Vergadering"
 
@@ -4884,7 +4882,7 @@ msgstr "Gebeurtenis zonder start datum"
 msgid "Event with no end date"
 msgstr "Gebeurtenis zonder eind datum"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Begindatum is ongeldig"
 
@@ -4970,10 +4968,10 @@ msgstr "_Begintijd:"
 #. 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4992,15 +4990,15 @@ msgstr "Er moet een organisator ingesteld worden."
 msgid "At least one attendee is required."
 msgstr "Er is minstens één aanwezige nodig."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Overdragen aan..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5277,24 +5275,19 @@ msgstr "Veranderingen verwerpen"
 msgid "Save Event"
 msgstr "Gebeurtenis opslaan"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Selecteer bron"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Selecteer doel %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalender"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Doel map:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "takenlijst"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Takenlijst"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5322,38 +5315,44 @@ msgid "% _Complete"
 msgstr "% _Voltooid:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Voltooid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Hoog"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "In behandeling"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Laag"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normaal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Niet gestart"
 
@@ -5389,11 +5388,11 @@ msgstr "Homepage:"
 msgid "Assignment"
 msgstr "Opdracht"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Voltooiingsdatum is incorrect"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan taken in '%s' niet openen."
@@ -5402,8 +5401,9 @@ msgstr "Kan taken in '%s' niet openen."
 msgid "Con_fidential"
 msgstr "Vertrouwelijk"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Omschrijving:"
@@ -5547,101 +5547,54 @@ msgstr "%s bij %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s voor een onbekend triggertype"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Openbaar"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privé"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Vertrouwelijk"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Einddatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Begindatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Samenvatting"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Vrij"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Bezig"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Klik hier om %s te openen"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Naamloos"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Begindatum:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Verloopdatum:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"De geografische positie moet ingevoerd worden in het formaat: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioriteit:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nee"
+# , fuzzy
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Homepage:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Onbekend"
+#: 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 "Openbaar"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Herhalend"
+#: 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 "Privé"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Toegewezen"
+#: 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 "Vertrouwelijk"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5687,17 +5640,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Vrij"
+
+#: 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 "Bezig"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Geselecteerde objecten verwijderen"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Openen"
 
@@ -5706,41 +5668,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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ëren"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Plakken"
 
@@ -5795,74 +5758,153 @@ msgstr "Prioriteit"
 msgid "Start date"
 msgstr "Begindatum"
 
+#: 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 "Samenvatting"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Taken Sorteren"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nieuwe _Afspraak..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Gebeurtenis voor de hele dag"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nieuwe bijeenkomst"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nieuwe taak"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Selec_teer vandaag"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Selecteer dag..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiceer Beschikbaarheidsinformatie"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Naar agenda kopiëren..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Naar agenda _verplaatsen..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Bijeenkomst Plannen..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Doorsturen als iKalender"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Verwijder deze Gebeurtenis"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Verwijder alle Gebeurtenissen"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Ga Naar _Vandaag"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Ga Naar Datum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Instellingen..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Einddatum"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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: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-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 "Onbekend"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Herhalend"
+
+#: calendar/gui/e-cal-model.c:913
+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:168 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
+msgid "No"
+msgstr "Nee"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"De geografische positie moet ingevoerd worden in het formaat: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5886,36 +5928,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minuten delingen"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minuten delingen"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6024,10 +6066,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Geen</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6057,7 +6095,7 @@ msgstr "Verversen"
 #: 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6270,63 +6308,59 @@ msgstr "De bijlage bevat geen geldig kalenderbericht"
 msgid "The attachment has no viewable calendar items"
 msgstr "De bijlage heeft geen bekijkbaar kalenderobject"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Update Voltooid\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Object kan niet worden gevonden\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Bezoekerstatus ververst\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Aanwezigheidstatus kon niet worden bijgewerkt!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Verwijderen Voltooid"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Item Verzonden!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Dit item kon niet verzonden worden!\n"
 
@@ -6443,28 +6477,6 @@ msgstr "Overgedragen"
 msgid "In Process"
 msgstr "In uitvoer"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afwezig"
@@ -6525,7 +6537,34 @@ msgstr "Aanvang _bijeenkomst:"
 msgid "Meeting _end time:"
 msgstr "_Einde bijeenkomst:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B, %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.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 %d-%m-%Y"
+
+#. 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 "%d-%m-%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Voer uw wachtwoord in voor %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6534,24 +6573,19 @@ msgstr ""
 "Fout bij %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"De achterliggende takenlijst voor\n"
-"%s\n"
-" is vastgelopen."
+msgid "The task backend for '%s' has crashed."
+msgstr "De achterliggende takenlijst voor '%s' is vastgelopen."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Bezig met openen taken op %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6560,51 +6594,106 @@ msgstr ""
 "Fout bij openen %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Taken laden"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Bezig met afronden van taken..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Geselecteerde objecten worden verwijderd..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Bezig met schrappen"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Taken"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Bezig met het laden van afspraken uit %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Bezig met het laden van taken uit %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Bezig met openen van %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr "De achterligende agenda voor '%s' is vastgelopen."
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "De achterliggende takenlijst voor '%s' is vastgelopen."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Legen"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender en Taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Configureer uw tijdzone, kalender en taaklijst hier "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender en taken"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution kalenderconfiguratie"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution kalender planingsberichtenweergave"
+
+# of: kalender-/taakbeheer
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution kalender- / taakbeheer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalender component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution taken-component"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalenders"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Taken"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6748,6 +6837,23 @@ msgstr "Verjaardagen & gedenkdagen"
 msgid "On The Web"
 msgstr "Op het web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Kan de agenda '%s' niet openen."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Kan taken in '%s' niet openen."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1e"
@@ -6967,7 +7073,7 @@ msgid "Contacts: "
 msgstr "Contacten: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Afdrukvoorbeeld"
 
@@ -6979,70 +7085,80 @@ msgstr "Item afdrukken"
 msgid "Print Setup"
 msgstr "Printerinstellingen"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Nieuwe takenlijst"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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: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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Taken laden"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 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:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nieuwe Taak"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Taak"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nieuwsgroepen"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Takenlijst-groep"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Nieuwe taak aanmaken"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "De URI van de te tonen takenmap"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kon de taken in `%s' niet laden"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7054,11 +7170,11 @@ msgstr ""
 "\n"
 "De taken echt verwijderen?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Taken afdrukken"
 
@@ -8706,7 +8822,7 @@ msgstr "Kopieër de inhoud van de map lokaal voor offline gebruik"
 msgid "Downloading new messages for offline mode"
 msgstr "Bezig met binnenhalen van berichten voor offline gebruik"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Map '%s' wordt voorbereid voor offline gebruik"
@@ -8799,33 +8915,6 @@ msgstr "Ongeldige argumenten voor (gebruiker)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fout bij uitvoeren filterzoekactie: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan zoekexpressie niet interpreteren: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fout bij uitvoeren zoekexpressie: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Bezig met zoeken naar onbekende koptekst: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8857,7 +8946,52 @@ msgstr "Bezig met leren van troep en/of geen troep bericht(en)"
 msgid "Filtering new message(s)"
 msgstr "Bezig met filteren van nieuwe berichten."
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Kan zoekexpressie niet interpreteren: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Fout bij uitvoeren zoekexpressie: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(past-allen) vereist enkelvoudig booleaans resultaat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Bezig met zoeken naar onbekende koptekst: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8868,15 +9002,15 @@ msgstr ""
 "\n"
 "%s "
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Interpretatie van de gpg userid hint is mislukt."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Fout tijdens het verwerken van de gpg wachtwoord aanvraag."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8885,30 +9019,30 @@ msgstr ""
 "U heeft een wachtwoord nodig om de sleutel voor\n"
 "gebruiker \"%s\" te mogen gebruiken"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Geannuleerd."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Ontgrendelen van de geheime sleutel is mislukt: 3 onjuiste wachtzinnen "
 "gegeven."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Onverwacht antwoord van GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Kan dit bericht niet versleutelen: er zijn geen geldige ontvangers opgegeven."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8919,82 +9053,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s mislukt: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ondertekeningsdata niet genereren: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Kon gpg niet starten: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Kon gpg niet starten."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Kan ondertekening niet verifiëren: Onjuist bericht formaat"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ondertekening niet verifiëren: kan geen tijdelijk bestand maken: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kan versleutelingsdata niet genereren: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Dit berichtdeel is digitaal ondertekend"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Versleutelde inhoud"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Kan de inhoud van het bericht niet ontleden"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kon de 'locking helper pipe' niet maken: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kon locking helper niet forken: %s"
-
-#: 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 "Kon '%s' niet vergrendelen: protocolfout met vergrendelaar"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kon niet vergrendelen: '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9017,6 +9131,26 @@ msgstr "Verkrijgen van vergrendeling met fcntl(2) mislukt: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Verkrijgen van vergrendeling met flock(2) mislukt: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kon de 'locking helper pipe' niet maken: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kon locking helper niet forken: %s"
+
+#: 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 "Kon '%s' niet vergrendelen: protocolfout met vergrendelaar"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kon niet vergrendelen: '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9271,7 +9405,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Fout aanmeldingsantwoord van server."
 
@@ -9477,7 +9611,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Encry_ptie certificaat:"
 
 #: camel/camel-smime-context.c:360
@@ -9494,7 +9628,7 @@ msgstr "Kon geen S/MIME decode context maken"
 msgid "Failed to add data to CMS encoder"
 msgstr "Fout bij toevoegen aan lokale `Verzonden'-map: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Fout bij het aanmelden.\n"
@@ -9560,99 +9694,99 @@ msgstr "Kan de map niet aanmaken: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Kan bericht: %s niet verkrijgen: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Certificaatondertekening-fout"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Geldige handtekening"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Ondertekenaar: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "DATA-commando mislukt"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Kon certificaat voor \"%s\" niet vinden."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Vinden van een algemeen bulkalgoritme is mislukt."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Regel aanmaken van bericht"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Kon geen S/MIME decode context maken"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Kon de gebruikersnaam niet naar de server versturen"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Opdracht niet geïmplementeerd"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9669,16 +9803,26 @@ msgstr "Kan map `%s' niet aanmaken: map bestaat reeds"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan map niet maken: Ongeldige bewerking op deze opslag"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Kan map `%s' niet aanmaken: map bestaat reeds"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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:811
 msgid "Trash"
 msgstr "Prullenbak"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Troep"
@@ -9799,7 +9943,7 @@ msgstr "Sleutelgebruik ondersteunt geen ondertekenen van certificaten"
 msgid "Error in application verification"
 msgstr "Fout bij toepassingsverificatie"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9812,11 +9956,11 @@ msgstr ""
 "Vingerafdruk:        %s\n"
 "Handtekening:        %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOED"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "SLECHT"
 
@@ -9840,7 +9984,7 @@ msgstr ""
 "Wilt u het alsnog accepteren?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9855,7 +9999,7 @@ msgstr ""
 "\n"
 "Wilt u dit accepteren?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9864,7 +10008,7 @@ msgstr ""
 "Certificaatprobleem: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9873,7 +10017,7 @@ msgstr ""
 "Slechte certificaatomgeving: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9882,7 +10026,7 @@ msgstr ""
 "Certificaat verlopen op: %s\n"
 "Eigenaar: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9896,17 +10040,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "kon URL %s niet verwerken"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fout bij opslaan van `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Dergelijk bericht %s bestaat niet in %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 
@@ -9915,11 +10059,6 @@ msgstr "Kan berichten niet naar een VMap verplaatsen of kopiëren"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kon map: %s niet verwijderen: map bestaat niet"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9934,10 +10073,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan berichten niet kopieëren naar troep map"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Zoeken naar nieuwe e-mail"
 
 #: 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 "Controleer op nieuwe berichten in alle mappen"
@@ -9968,6 +10109,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Voor benadering van Novell Groupwise servers"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9988,26 +10130,321 @@ msgstr ""
 msgid "Checklist"
 msgstr "Aftekenlijst"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Onverwacht antwoord van IMAP-server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet selecteren: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: 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 "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr "Kreeg BYE antwoord"
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Kan map niet verkrijgen `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan map niet verkrijgen `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan bericht niet toevoegen aan mh map %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Kan bericht %s uit folder %s niet verkrijgen\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 ""
+"Kan bericht %s uit folder %s niet verkrijgen\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 "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
+
+#: 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 "Mappen"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Laat alleen de aangemelde mappen zien"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Overschrijf servergegeven mappen naamruimte"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Naamruimte:"
+
+#: 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 "Voor het lezen en opslaan van post op IMAP servers."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Deze optie zal bij het verbinden met de IMAP-server het wachtwoord versturen "
+"als platte tekst."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, 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: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/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 "Kon niet verbinden met %s (poort %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 "SSL is niet beschikbaar"
+
+#: 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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Verbinding geannuleerd"
+
+#: 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 ""
+"Fout bij opzetten van beveiligde verbinding met IMAP-server %s: De server \n"
+"ondersteund geen 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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Onbekende fout"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Authenticatie met de IMAP-server %s met het authenticatie mechanisme %s is "
+"mislukt"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVoer het IMAP wachtwoord in voor %s op host %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "De mapnaam \"%s\" is ongeldig omdat deze het teken \"%c\" bevat"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet aanmaken: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan de map `%s' niet aanmaken: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan de map %s niet verwijderen: Speciale map"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan de map `%s' niet verwijderen: Ongeldige mailbox naam"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Opdracht:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan map niet aanmaken: `%s': %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Onverwacht antwoord van IMAP-server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Geen taken"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operatie geannuleerd"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server verbrak onverwacht de verbinding: %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:1089
-msgid "Unknown error"
-msgstr "Onbekende fout"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10052,21 +10489,21 @@ msgstr "Kon directory %s niet maken: %s"
 msgid "Could not load summary for %s"
 msgstr "Kon samenvatting voor %s niet laden"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Map is vernietigd en opnieuw gemaakt op de server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Bezig met zoeken naar veranderde berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ophalen van bericht mislukt: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10082,25 +10519,25 @@ msgstr ""
 "Kan bericht niet verkrijgen: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Een dergelijk bericht bestaat niet"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Dit bericht is nu niet beschikbaar"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Ophalen van samenvattingsinformatie van nieuwe berichten"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Kon bericht inhoud niet vinden in FETCH-antwoord."
 
@@ -10139,23 +10576,6 @@ msgstr "Gebruik een aangepast commando om met de server te verbinden"
 msgid "Command:"
 msgstr "Opdracht:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mappen"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Laat alleen de aangemelde mappen zien"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Overschrijf servergegeven mappen naamruimte"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Naamruimte:"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Pas filters toe op alle nieuwe berichten in de INBOX op deze server"
@@ -10176,85 +10596,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-dienst voor %s op %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Kon niet verbinden met %s (poort %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: 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/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Verbinding geannuleerd"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-onderhandelingen mislukt"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "U heeft geen wachtwoord ingevoerd"
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10265,25 +10643,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Map `%s' bestaat niet."
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "De mapnaam \"%s\" is ongeldig omdat deze het teken \"%c\" bevat"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "De map kan geen submappen bevatten"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10291,7 +10662,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Onbekende oudermap: %s"
@@ -10400,58 +10771,58 @@ msgstr ""
 "bufferbestanden.\n"
 "Kan ook gebruikt worden om een Elm, Pine of Mutt map in te lezen."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Opslaglocatie %s is geen absoluut pad"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Opslag `%s' is geen normale directory"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Kan map niet verkrijgen: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokale opslaglocaties hebben geen postbus-in"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokaal postbusbestand %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kon de naam van map %s niet wijzigen naar %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kon '%s' niet hernoemen: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kon samenvattingsbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kon indexbestand van map `%s' niet verwijderen: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10517,7 +10888,7 @@ msgstr "Kon map `%s' niet verwijderen: %s"
 msgid "not a maildir directory"
 msgstr "geen maildir-directory"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10848,7 +11219,7 @@ 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:258
+#: 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
@@ -10857,8 +11228,8 @@ msgid "User cancelled"
 msgstr "Gebruiker geannuleerd"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10867,48 +11238,48 @@ msgstr "Gebruiker geannuleerd"
 msgid "Cannot get message %s: %s"
 msgstr "Kan bericht: %s niet verkrijgen: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Interne foute: uid in ongeldig formaat: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Het kopieëren van berichten vanuit een NNTP folder is onmogelijk!"
 
@@ -11037,7 +11408,8 @@ msgid "Could not get group: %s"
 msgstr "Kon de groep: %s niet verkrijgen"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Kan berichten niet verkrijgen: ongespecificeerde fout"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11090,8 +11462,8 @@ msgstr "Geen bericht met uid %s"
 msgid "Retrieving POP message %d"
 msgstr "POP-bericht %d wordt opgehaald"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Onbekende reden"
 
@@ -11537,7 +11909,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "bijlage"
 
@@ -11581,6 +11953,105 @@ msgstr "MIME type:"
 msgid "Suggest automatic display of attachment"
 msgstr "Probeer bijlage automatisch weer te geven"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Kan uitgaand bericht niet ondertekenen: Geen ondertekeningscertificaat voor "
+"van account"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Kan uitgaand bericht niet versleutelen: Geen encryptie certificaat "
+"ingesteldvoor account afzender"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Kan bestand niet openen"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kon bericht niet van editor halen"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Naamloos Bericht"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Bestand openen"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatisch gegenereerd"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Handtekening:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> Bestand bijgevoegd"
+msgstr[1] "<b>%d</b> Bestanden bijgevoegd"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Verberg bijl_agen-balk (drop bijlagen hier)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Toon bijl_agen-balk (drop bijlagen hier)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Stel een nieuw bericht op"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Kon het venster Opstellen niet aanmaken:\n"
+"Kan adresselectie niet activeren."
+
+#: 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 ""
+"Kon het venster voor het opstellen van het bericht niet maken:\n"
+"Niet in staat de HTML bewerkingscomponent te activeren.\n"
+"Controleer alstublieft de geïnstalleerde versie  van\n"
+"gtkhtml en libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Kon het venster voor het opstellen van het bericht niet maken:\n"
+"Niet in staat de HTML editor component te activeren."
+
+# # Het origineel heeft <b> in plaats van </b>
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Dit is een berichtinhoud anders dan tekst en kan daarom niet bewerk "
+"worden.)</b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Doel van bericht"
@@ -11661,213 +12132,135 @@ msgstr "Klik hier om een map te selecteren waarnaar gepost moet worden"
 msgid "Attach file(s)"
 msgstr "Bestand(en) bijvoegen"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Kan uitgaand bericht niet ondertekenen: Geen ondertekeningscertificaat voor "
-"van account"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Kan uitgaand bericht niet versleutelen: Geen encryptie certificaat "
-"ingesteldvoor account afzender"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Kan bestand niet openen"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Kon bericht niet van editor halen"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Naamloos Bericht"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Bestand openen"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatisch gegenereerd"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Handtekening:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> Bestand bijgevoegd"
-msgstr[1] "<b>%d</b> Bestanden bijgevoegd"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Verberg bijl_agen-balk (drop bijlagen hier)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Toon bijl_agen-balk (drop bijlagen hier)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Stel een nieuw bericht op"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Voeg een bestand bij het bericht"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Kon het venster Opstellen niet aanmaken:\n"
-"Kan adresselectie niet activeren."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Kon het venster voor het opstellen van het bericht niet maken:\n"
-"Niet in staat de HTML bewerkingscomponent te activeren.\n"
-"Controleer alstublieft de geïnstalleerde versie  van\n"
-"gtkhtml en libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Kon het venster voor het opstellen van het bericht niet maken:\n"
-"Niet in staat de HTML editor component te activeren."
 
-# # Het origineel heeft <b> in plaats van </b>
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Dit is een berichtinhoud anders dan tekst en kan daarom niet bewerk "
-"worden.)</b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Weet u zeker dat u deze naamloze afspraak wilt verwijderen?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Ongelezen"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Wilt u de wijzingen opslaan?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Kon de pijp niet maken: %s"
+msgid "Don't Recover"
+msgstr "Niet verwijderen"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kon handtekening-bestand niet opslaan: %s"
+msgid "Recover"
+msgstr "Verwijderen"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kon handtekening-bestand niet opslaan: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Veranderingen verwerpen"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Wilt u de wijzingen opslaan?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Fout bij opslaan van snelkoppelingen."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Niet verwijderen"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Waarschuwing: Veranderd Bericht"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Fout bij opslaan van snelkoppelingen."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Weet u zeker dat u deze naamloze afspraak wilt verwijderen?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Verwijderen"
+msgid "Discard Changes"
+msgstr "Veranderingen verwerpen"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Bericht opslaan..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Kon de pijp niet maken: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Ongelezen"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Kon handtekening-bestand niet opslaan: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Waarschuwing: Veranderd Bericht"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Voeg een bestand bij het bericht"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "U dient een account in te stellen voordat u post kunt versturen."
 
@@ -12001,7 +12394,8 @@ msgstr ""
 "Er bestaat al een bestand met die naam.\n"
 "Overschrijven?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Bestand overschrijven?"
 
@@ -12177,81 +12571,97 @@ msgstr "Selecteer een tijd om mee te vergelijken"
 msgid "_Filter Rules"
 msgstr "_Filter regels"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Fout in reguliere expressie '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Het bestand '%s' bestaat niet of is geen normaal bestand"
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Vergadering Update"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "U dient een datum te kiezen."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Unieke _naam:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-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."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "verplaatsen map %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Het bestand '%s' bestaat niet of is geen normaal bestand"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Opdracht"
+msgid "Missing folder."
+msgstr "verplaatsen map %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "U moet een map geven."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Geen server geselecteerd"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Fout in reguliere expressie '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "U dient een datum te kiezen."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Opdracht"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "U moet deze filter een naam geven."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "U moet deze vfolder een naam geven."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "U dient een bestandsnaam te geven."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "U moet een map geven."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Geen server geselecteerd"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12263,64 +12673,11 @@ msgstr "Kies een bestand"
 msgid "<b>Then</b>"
 msgstr "<b>Dan</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Map selecteren"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Belangrijk"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Te doen"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Later"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Regel naam:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Naamloos"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Als</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Acties uitvoeren"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "als aan alle criteria wordt voldaan"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "als aan een van de criteria wordt voldaan"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "inkomend"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "uitgaand"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12409,6 +12766,75 @@ msgstr "met alle lokale folders"
 msgid "years"
 msgstr "jaren"
 
+#: 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
+msgid "Important"
+msgstr "Belangrijk"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "Te doen"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Later"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Regel naam:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Als</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "als aan alle criteria wordt voldaan"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "als aan een van de criteria wordt voldaan"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Acties uitvoeren"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Overgedragen"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Geadresseerden"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Antwoorden aan %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Insluiten:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "inkomend"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "uitgaand"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12538,7 +12964,7 @@ msgstr "Is niet gemarkeerd"
 msgid "Junk Test"
 msgstr "Troep test"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Label"
@@ -12575,7 +13001,7 @@ msgstr "Naar programma doorsluizen"
 msgid "Play Sound"
 msgstr "Geluid afspelen"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Gelezen"
 
@@ -12644,9 +13070,9 @@ msgstr "begint met"
 msgid "Stop Processing"
 msgstr "Stop met Verwerken"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12707,104 +13133,59 @@ msgstr "Onderwerp bevat niet"
 msgid "Virtual _Folders"
 msgstr "Virtuele mappen"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Toevoegen"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VMap-bron"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Bericht opstellen - Voorkeuren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
-"berichten instellen."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Hier kunt u uw e-mail accounts instellen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution e-mail accountconfiguratie"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-mailcomponent"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution nieuw bericht opstellen"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution configuratie voor opstellen van nieuw bericht"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution postmap-weergave"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-mail voorkeuren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-mail accounts"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-mailvoorkeuren"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Standaard]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Accountnaam"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protocol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Naamloos"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Taal / Talen"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "Handtekening script toevoegen"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Handtekening(en)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------Doorgestuurd bericht-------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "Op %a %d-%m-%Y, te %H:%M uur schreef %%s:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "_VMap van zoekopdracht maken..."
 
@@ -12838,277 +13219,447 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Map_naam:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VMappen"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "UNMATCHED"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Bezig met laden..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "verplaatsen map %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Bezig met kopieëren van map %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Berichten worden verplaatst naar map %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Berichten worden gekopieërd naar map %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan bericht(en) niet droppen in hoogste nivo opslag."
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Verplaatsen"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Annuleer Taak"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Map selecteren"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopiëren"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Bezig met aanmaken map `%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Map aanmaken"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "De \"%s\" map hernoemen naar:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Map hernoemen"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "Beel_d"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Open in _Nieuw Venster"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Verplaatsen"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Nieuwe map..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Hernoemen"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Eigenschappen..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr "VMappen"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "UNMATCHED"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Inbox"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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:508
+#: mail/mail-component.c:551
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "B_ewerk als Nieuw Bericht..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Af_drukken"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Afzender beantwoorden"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Lijst beantwoorden"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Iedereen beantwoorden"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Doorsturen"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Vervolg_acties..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Als voltooid markeren"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Markering wissen"
 
-#: mail/em-folder-view.c:787 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 "Als gelezen mar_keren"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Als o_ngelezen markeren"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Als belan_grijk markeren"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Als _onbelangrijk markeren"
 
-#: mail/em-folder-view.c:791 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 "Als troep markeren"
 
-#: mail/em-folder-view.c:792 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 "Als niet-troep markeren"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Herstellen"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Naar map _verplaatsen..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Naar map _kopiëren..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Afzender aan adresboe_k toevoegen"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Filters _toepassen"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "Troep f_ilteren"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Regel aanmaken van bericht"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VMap op _Onderwerp"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VMap op afze_nder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VMap op _Geadresseerden"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VMap op Mailing_Lijst"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VMap op draad"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter op Onderwerp"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter op afzen_der"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter op Geadresseerden"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter op _Mailinglijst"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filter op draad"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Standaard"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Bericht afdrukken"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "Verwijzing _kopiëren"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klik hier om mail te versturen naar %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Van"
+
+#: 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 "Antwoordadres"
+
+#: 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 "Aan"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr "Nieuwsgroepen"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Klik hier om %s te openen"
+msgid "%s attachment"
+msgstr "%s bijlage"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kon S/MIME bericht niet verwerken: onbekende fout"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Encryptie type voor multipart/encrypted wordt niet ondersteund"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Handtekening in niet ondersteund formaat"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Fout bij het verifiëren van ondertekening"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Onbekende fout bij het verifiëren van ondertekening"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
-msgid "Matches: %d"
-msgstr "Klopt: %d"
+msgid "Retrieving `%s'"
+msgstr "Bezig met ophalen `%s'"
 
 # Niet ondertekend of positief getal?
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Niet getekend"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Geldige handtekening"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Ongeldige handtekening"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Geldige handtekening, kan afzender niet verifiëren"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Niet versleuteld"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Versleuteld, zwak"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Versleuteld"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Versleuteld, sterk"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Misvormd extern-berichtgedeelte"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Verwijzing naar FTP site (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Verwijzing naar lokaal bestand (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Verwijzing naar externe gegevens (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Bezig met opmaken van bericht"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "E-mailprogramma"
+
+# a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
+
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr "Klopt: %d"
+
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13116,11 +13667,7 @@ msgstr ""
 "Dit bericht is niet ondertekend, Er kan niet worden aangetoond dat het "
 "authentiek is."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Geldige handtekening"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13128,11 +13675,7 @@ msgstr ""
 "Dit bericht is geldig en is ondertekend, de afzender van dit bericht is zeer "
 "waarschijnlijk degene die hij claimt te zijn."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Ongeldige handtekening"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13140,11 +13683,11 @@ msgstr ""
 "De handtekening van dit bericht kan niet worden geverifieerd, het is "
 "onderweg mogelijk gewijzigd."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Geldige handtekening, kan afzender niet verifiëren"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13152,11 +13695,7 @@ msgstr ""
 "Dit bericht is ondertekend met een geldige handtekening maar de afzender van "
 "het bericht kan niet worden geverifieerd."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Niet versleuteld"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13165,11 +13704,7 @@ msgstr ""
 "Dit bericht is niet versleuteld.  De inhoud kan mogelijk bekeken worden "
 "tijdens de wegdie het bericht op het internet aflegd."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Versleuteld, zwak"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13179,11 +13714,7 @@ msgstr ""
 "moeilijk maar niet onmogelijk voor een buitenstaander om de inhoud van dit "
 "bericht te bekijken in een redelijke tijd."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Versleuteld"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13191,11 +13722,7 @@ msgstr ""
 "Dit bericht is versleuteld.  His is moeilijk voor een buitenstaander om de "
 "inhoud van het bericht te bekijken."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Versleuteld, sterk"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13205,180 +13732,61 @@ msgstr ""
 "moelijklijk voor een buitenstaander ome de inhoud van het bericht te "
 "bekijken in een redelijke tijd."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "Certificaat _weergeven"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Dit certificaat is niet weer te geven"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Afgerond op %B %d, %Y, %l:%M %p"
 
 # overtijd
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Te laat:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "op %B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "In bericht weerge_ven"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Verbergen"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Pagina %d van %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Bezig met ophalen `%s'"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Misvormd extern-berichtgedeelte"
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Verwijzing naar FTP site (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Verwijzing naar lokaal bestand (%s) geldig bij site \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Verwijzing naar lokaal bestand (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Verwijzing naar externe gegevens (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Verwijzing naar onbekende externe gegevens (\"%s\" type)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Bezig met opmaken van bericht"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Van"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Antwoordadres"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Aan"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "E-mailprogramma"
-
-# a = afgekorte weeknaam, R = 24h tijd, Z is tijdzone
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Nieuwsgroepen"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s bijlage"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kon S/MIME bericht niet verwerken: onbekende fout"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Encryptie type voor multipart/encrypted wordt niet ondersteund"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kon MIME bericht niet verwerken. Onbewerkte weergave."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Handtekening in niet ondersteund formaat"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Fout bij het verifiëren van ondertekening"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Onbekende fout bij het verifiëren van ondertekening"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (ingebouwd)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Elke keer"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Een keer per dag"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Een keer per week"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Een keer per maand"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13390,25 +13798,55 @@ msgstr ""
 "\n"
 "Een ogenblik geduld, uw mappen worden door Evolution gemigreerd..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "De migratie van pop3 uid caches is mislukt: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kan map niet aanmaken: `%s': %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Het migreren van map uitklap status is mislukt: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Kan bestandsbeschrijving niet kopëren: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Kon groepslijstbestand voor %s niet opslaan: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Identificatie op POP-server %s mislukt: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Aanmaken van map `'%s' mislukt: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Kan opslag `%s' niet openen: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Aanmaken van map `'%s' mislukt: %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Kon uitvoerbestand niet maken: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13419,91 +13857,77 @@ msgstr "Opslaan als..."
 msgid "untitled_image.%s"
 msgstr "untitled_image.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Als _achtergrond instellen"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Afzender beantwoorden"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "Verwijzing in browser _openen"
 
 # verzenden naar...
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "_Bericht sturen aan..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Aan adresboek _toevoegen"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Openen in %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 "Deze opslag ondersteund geen inschrijvingen, of deze mogelijkheid is "
 "uitgeschakeld."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Geabonneerd"
 
-#: mail/em-subscribe-editor.c:637 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 "Map"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Selecteer een server"
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Geen server geselecteerd"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Dit bericht niet meer weergeven."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filters"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------Doorgestuurd bericht-------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "Op %a %d-%m-%Y, te %H:%M uur schreef %%s:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "bericht"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Bericht opslaan..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Adres toevoegen"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Berichten van %s"
@@ -13521,11 +13945,13 @@ msgid "Check incoming mail being junk"
 msgstr "Controleer binnenkomende mail op troep"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Citaat accent kleur"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Citaat accent kleur."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13633,14 +14059,20 @@ msgid "Last time empty trash was run"
 msgstr "De laatste keer dat de prullenbak geleegd was"
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Lijst met labels en de bijpassende kleuren"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Lijst met accounts"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Lijst met accounts"
+
+#: 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."
@@ -13649,30 +14081,35 @@ msgstr ""
 "bestaat uit tekenreeksen die overeenkomen met subdirectories relatief aan /"
 "apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lijst van aangepaste koppen en of ze ingeschakeld zijn."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Lijst met labels die bij het mail onderdeel van Evolution bekend zijn. De "
 "lijst bestaat uit tekenreeksen met naam:kleur waar kleur gebruik maakt van "
 "de HTML hex codering."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lijst met mime-types die voor bonobo component weergave gecheckt moeten "
 "worden"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Laad afbeeldingen voor HTML berichten over http"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13683,95 +14120,95 @@ msgstr ""
 "afbeeldingen als de afzender in het adresboek staat 2 - Altijd afbeeldingen "
 "laden via het internet"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Filter acties bijhouden"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Filter acties bijhouden in het gespecificeerde log bestand."
 
 # Logbestand waarin filteracties worden gelogt
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Logbestand voor filteracties"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Logbestand voor filteracties"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Markeer als gelezen na een bepaalde timeout"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Markeer als gelezen ne een bepaalde tijd."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Markeer citaten in het bericht \"Voorbeeld\""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Markeer citaten in het bericht \"Voorbeeld\"."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Standaardhoogte berichtvenster"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Standaardbreedte berichtvenster"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Berichtweergave stijl (normaal, volledige koppen, bron)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 "Minimum aantal dagen tussen het legen van de prullenbak bij het afsluiten"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minimum tijd tussen het legen van de prullenbak bij afsluiten, in dagen."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Nieuwe Mail Notificatie geluids bestand"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Nieuwe Mail Notificatie type"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Bericht bij een leeg onderwerp"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Waarschuw de gebruiker wanneer hij of zij een map probeert op te ruimen."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Waarschuw de gebruiker als hij of zij probeert om een bericht zonder "
 "onderwerp te versturen."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Waarschuw als de gebruiker opruimt"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Waarschuw als de gebruiker enkel Bcc invuld"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13779,35 +14216,27 @@ msgstr ""
 "Waarschuwen wanneer HTML berichten verstuurd worden naar contacten die dat "
 "niet willen."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Waarschuwen wanneer berichten worden verstuurd zonder Aan of Cc-ontvangers"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Waarschuw als de gebruiker ongewenste HTML probeert te versturen"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Herkennen en vervangen van links in de text."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Herken smileys in de text en vervang deze met afbeeldingen."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Test inkomende mail op troep"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Standaard HTML e-mail versturen"
@@ -13856,7 +14285,8 @@ msgid "Spell check inline"
 msgstr "Spellings controle in bericht"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+#, fuzzy
+msgid "Subscribe dialog default height"
 msgstr "Standaardhoogte inschrijf dialoog"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -14003,33 +14433,66 @@ msgstr "port voor het starten van gebruikersmode spamd"
 msgid "spamd port"
 msgstr "spamd poort"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-import"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape mail-import"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Bericht opstellen - Voorkeuren"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importeerassistent"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Hier kunt u uw e-mailvoorkeuren instellen, inclusief beveiliging en weergave."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution pine-import"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Hier kunt u uw spellingscontrole, onderschiften en het opstellen van nieuwe "
+"berichten instellen."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-import"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Hier kunt u uw e-mail accounts instellen"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-mail"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution e-mail accountconfiguratie"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution e-mailcomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution nieuw bericht opstellen"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution configuratie voor opstellen van nieuw bericht"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-mail voorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-mail accounts"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "E-mailvoorkeuren"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Post:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14037,15 +14500,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Een ogenblik geduld aub"
 
@@ -14074,18 +14537,46 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importeren `%s'"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Bezig met Importeren mailbox"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape mail-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importeerassistent"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution pine-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-import"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s wordt doorzocht"
@@ -14095,7 +14586,7 @@ msgstr "%s wordt doorzocht"
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteitsfilter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14120,7 +14611,7 @@ msgstr ""
 "de resulterende filters om er zeker van te zijn dat alles\n"
 "nog werkt zoals bedoeld is."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14132,7 +14623,7 @@ msgstr ""
 "mogelijkheid. Deze worden niet ondersteund door\n"
 "Evolution. Deze filters wordengenegeerd."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14146,23 +14637,23 @@ msgstr ""
 "zijn omgezet naar filters die kijken of de berichtinhoud\n"
 "de tekenreeks bevat."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importeert uw oude Netscape informatie"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importeren Netscape informatie"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Instellingen"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-mail filters"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14195,124 +14686,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Accountbeheer"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Sleutel overeenkomst"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "Computernaam:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Gebruikers_naam:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Pad:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Post versturen naar %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Onderwerp is %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Post ophalen van %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailinglijst"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Antwoorden aan %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Filterregel Toevoegen"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d geselecteerd"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d niet verzonden"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d dag"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d verzonden"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d niet verzonden"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totaal"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d totaal, %d ongelezen"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d geselecteerd"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nieuw Bericht"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Bericht"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Een nieuwe e-mail opstellen"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nieuwe berichten map"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "Mail _Map"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Maak een berichten map aan"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "De URI van de mail bron die de weergave zal tonen"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Dienst wordt gecontroleerd"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Verbinden met server..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identiteit"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14322,12 +14825,12 @@ msgstr ""
 "worden ingevuld, tenzij u wilt dat deze informatie wordt meegezonden bij de "
 "berichten die u verzendt."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "E-mail ontvangen"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14336,15 +14839,15 @@ msgstr ""
 "niet weet wat voor servertype u gebruikt, neem dan contact op met uw "
 "systeembeheerder of met uw internet-provider."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Maak uw keuze uit de volgende mogelijkheden"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "E-mail versturen"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14353,11 +14856,11 @@ msgstr ""
 "niet weet wat voor servertype u gebruikt, neem dan contact op met uw "
 "systeembeheerder of met uw internet-provider."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Accountbeheer"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14371,14 +14874,6 @@ msgstr ""
 "mailaccount. Geef een naam aan dit account in de ruimte hieronder. Deze naam "
 "is alleen nodig voor de lijstweergave."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Dienst wordt gecontroleerd"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Verbinden met server..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "Control_eren op ondersteunde types "
@@ -14674,7 +15169,8 @@ msgid "Execute Command..."
 msgstr "Opdracht Uitvoeren..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Vaste breedte:"
 
 #: mail/mail-config.glade.h:82
@@ -14986,353 +15482,458 @@ msgstr "kleur"
 msgid "description"
 msgstr "omschrijving"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Een map genaamd \"%s\" bestaat reeds. Gebruik een andere naam."
+msgid "Invalid authentication"
+msgstr "Aanmelding"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Weet u zeker dat u deze account wilt verwijderen?"
+#. 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-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "Weet u zeker dat alle %d berichten wilt herversturen?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Alle verwijderde berichten permanent uit alle mappen verwijderen"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"U verstuurt een HTML-geformatteerd bericht. Controleer alstublieft dat\n"
+"de ontvangers HTML e-mail kunnen en willen ontvangen:\n"
+"%sToch verzenden?"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
+msgid "_Send"
+msgstr "Verzenden"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Weet u zeker dat alle %d berichten wilt herversturen?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan map niet kopiëren: %s"
+msgid "Use default drafts folder?"
+msgstr "Pad naar de standaart contacten map"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan de map niet aanmaken: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Kan de drafts map voor die account niet openen.\n"
+"Wilt u gebruik maken van de standaardmap?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Kon tijdelijke directory niet maken: %s"
+msgid "Use _Default"
+msgstr "Standaard"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Kon de directory niet aanmaken\n"
-"%s\n"
-"Fout: %s"
+"Weet u zeker dat alle %d berichten in een appart scherm wilt weergeven?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Kon map niet verwijderen:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan lokale map %s niet verwijderen."
+msgid "_Expunge"
+msgstr "Ops_chonen"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Kan `%s' map niet verkrijgen: map bestaat niet."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Alle verwijderde berichten permanent uit alle mappen verwijderen"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kan map niet verplaatsen: %s"
+msgid "_Empty Trash"
+msgstr "_Prullenbak legen"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Kan bron niet openen"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Er staan nog berichten in de wachtrij. Wilt u toch afsluiten?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Kan bron niet openen"
+msgid "Error while {0}."
+msgstr ""
+"Fout tijdens '%s':\n"
+"%s"
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan bericht niet opnemen"
+msgid "Error while performing operation."
+msgstr ""
+"Fout tijden het uitvoeren van bewerking:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan lokale map %s niet hernoemmen."
+msgid "Enter password."
+msgstr "Wachtwoord invoeren"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Fout bij het laden van filterinformatie:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kan directory `%s' niet maken: %s."
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Kan niet opslaan als '%s'\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Handtekening script toevoegen"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Kon de directory niet aanmaken\n"
+"%s\n"
+"Fout: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Kon handtekening-bestand niet opslaan: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "\"%s\" verwijderen"
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Verwijder geselecteerde contacten"
+msgid "Cannot create temporary save directory."
+msgstr "Kon tijdelijke directory niet maken: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Veranderingen ongedaan maken"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Wilt u de wijzingen opslaan?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Niet verwijderen"
+msgid "File exists but cannot overwrite it."
+msgstr "Bestand bestaat reeds, overschrijven?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Wachtwoord invoeren"
+msgid "File exists but is not a regular file."
+msgstr "Het bestand '%s' bestaat niet of is geen normaal bestand"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Fout bij het laden van filterinformatie:\n"
+"Kon map niet verwijderen:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Fout tijden het uitvoeren van bewerking:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan lokale map %s niet verwijderen."
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Fout tijdens '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Bestand bestaat reeds, overschrijven?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan lokale map %s niet hernoemmen."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Het bestand '%s' bestaat niet of is geen normaal bestand"
+msgid "Delete \"{0}\"?"
+msgstr "\"%s\" verwijderen"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "De map \"%s\" en alle submappen echt verwijderen?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "Een map genaamd \"%s\" bestaat reeds. Gebruik een andere naam."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Aanmelding"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kan map niet verplaatsen: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Kan bron niet openen"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Kan bericht niet opnemen"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Kan map niet kopiëren: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"U verstuurt een HTML-geformatteerd bericht. Controleer alstublieft dat\n"
-"de ontvangers HTML e-mail kunnen en willen ontvangen:\n"
-"%sToch verzenden?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kan de map niet aanmaken: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "De map \"%s\" en alle submappen echt verwijderen?"
+msgid "Cannot open source \"{1}\""
+msgstr "Kan bron niet openen"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "U heeft niet alle informatie ingevuld die nodig is."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Verwijder geselecteerde contacten"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Weet u zeker dat u deze account wilt verwijderen?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"De volgende vMappen:\n"
-"%sGebruikten de verwijderde map:\n"
-"    '%s'\n"
-"En zijn aangepast."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Niet verwijderen"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"De volgende vMappen:\n"
-"%sGebruikten de verwijderde map:\n"
-"    '%s'\n"
-"En zijn aangepast."
+msgid "Could not save signature file."
+msgstr "Kon handtekening-bestand niet opslaan: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Handtekening script toevoegen"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Veranderingen ongedaan maken"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP-server %s ondersteunt het gevraagde aanmeldingstype %s niet."
+msgid "Do you wish to save your changes?"
+msgstr "Wilt u de wijzingen opslaan?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15340,85 +15941,97 @@ msgstr ""
 "\n"
 "Wilt u de wijzingen opslaan?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kan de drafts map voor die account niet openen.\n"
-"Wilt u gebruik maken van de standaardmap?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Standaard"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Veranderingen ongedaan maken"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Pad naar de standaart contacten map"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "U heeft niet alle informatie ingevuld die nodig is."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Er staan nog berichten in de wachtrij. Wilt u toch afsluiten?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "U kunt niet meerdere accounts met dezelfde naam maken."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Kan `%s' map niet verkrijgen: map bestaat niet."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Veranderingen ongedaan maken"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "_Prullenbak legen"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"De volgende vMappen:\n"
+"%sGebruikten de verwijderde map:\n"
+"    '%s'\n"
+"En zijn aangepast."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Ops_chonen"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Verzenden"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"De volgende vMappen:\n"
+"%sGebruikten de verwijderde map:\n"
+"    '%s'\n"
+"En zijn aangepast."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Overschrijven"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s wordt opgezocht"
@@ -15427,20 +16040,20 @@ msgstr "%s wordt opgezocht"
 msgid "Working"
 msgstr "Bezig"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Map wordt gefilterd"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Berichten aan het ontvangen"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Fout bij het toepassen van uitgaande filters: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15449,115 +16062,115 @@ msgstr ""
 "Toevoegen aan %s mislukt: %s\n"
 "Inplaats daarvan toevoegen aan lokale `Verzonden'-map."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Fout bij toevoegen aan lokale `Verzonden'-map: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Bericht %d van %d wordt verzonden"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Het versturen van %d van de %d berichten is mislukt"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Voltooid."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Bericht wordt opgeslagen in map"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Berichten worden verplaatst naar %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Berichten worden gekopieerd naar %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Bezig met scannen van mappen in \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Doorgestuurde berichten"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Bezig met openen map %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Bezig met openen van opslag %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "verwijderen map %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Bezig met opslaan map '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Opruimen en opslaan van account '%s'"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Bezig met opslaan account '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Map wordt ververst"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Bezig met legen map"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Prullenbak van '%s' wordt geleegd"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokale mappen"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Bezig met ophalen bericht %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Bezig met ophalen van %d bericht"
 msgstr[1] "Bezig met ophalen van %d berichten"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Bezig met het opslaan van %d bericht"
 msgstr[1] "Bezig met het opslaan van %d berichten"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15566,7 +16179,7 @@ msgstr ""
 "Kon uitvoerbestand niet maken: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15575,11 +16188,11 @@ msgstr ""
 "Fout bij opslaan berichten in: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Bezig met opslaan bijlage"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15588,17 +16201,17 @@ msgstr ""
 "Kan uitvoerbestand niet maken: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kon gegevens niet wegschrijven: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Verbreken van %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Bezig met opnieuw verbinden met %s"
@@ -15664,24 +16277,24 @@ msgstr "Aan het Actualiseren ..."
 msgid "Waiting..."
 msgstr "Aan het Wachten ..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Gebruiker heeft operatie afgebroken."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Voer uw Wachtwoord in voor %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Voer Wachtwoord in"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Onthoud dit wachtwoord"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "Dit wachtwoord onthouden tot het einde van deze sessie"
 
@@ -15722,89 +16335,94 @@ msgstr "Doorgestuurd bericht"
 msgid "Invalid folder: `%s'"
 msgstr "Ongeldige map: `%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Bezig met aanmaken vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Actualiseren vfolders voor uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Actualiseren vfolders voor uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMappen"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Bewerk VMap"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nieuwe VMap"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Ongelezen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Gelezen"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Beantwoord"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Meerdere Ongelezen Berichten"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Meerdere Berichten"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Laagste"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Laag"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Hoog"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Hoogste"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Vandaag %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Gisteren %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Bezig met genereren van berichtenlijst"
 
@@ -15836,43 +16454,43 @@ msgstr "Ontvangen"
 msgid "Size"
 msgstr "Grootte"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Bellen"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Niet doorsturen"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Vervolg"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Ter informatie"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Doorsturen"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Geen antwoord nodig"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Beantwoorden"
 
-#: mail/message-tag-followup.c:70 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 "Iedereen beantwoorden"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Beoordelen"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Vlaggen voor vervolgactie"
 
@@ -15916,52 +16534,32 @@ msgstr "Abonneren"
 msgid "_Unsubscribe"
 msgstr "Afmelden"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution shell"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution test"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution testcomponent"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Standaard snelkoppelingsgroep"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Standaard breedte van de mappenbalk"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Standaard breedte van de snelkoppelingen balk"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Standaard venster hoogte"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Standaard venster breedte"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Evolution configuratie versie"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 "ID of alias van het component dat bij het opstarten moet worden weergegeven."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -15969,7 +16567,7 @@ msgstr ""
 "Als ingesteld op true zal Evolution opstarten in offline mode in plaatsvan "
 "online mode."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -15977,62 +16575,22 @@ msgstr ""
 "Als deze optie aan staat zal het waarschuwings dialoog voor de development "
 "versie van Evolution niet worden weergegeven."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Lijst met paden voor de mappen die gesynchroniseerd dienen te worden voor "
 "offline gebruik"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Pad naar de standaard agenda map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Pad naar de standaart contacten map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Pad naar de standaard mail map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Pad naar de standaard takenlijst map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Fysieke URL naar de standaard agenda map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Fysieke URI naar de standaard contacten map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Fysieke URI naar de standaard mail map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Fysieke URI naar de standaard taken map"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Evolution opstarten in offline mode"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Toont de mappenbalk"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Toont de snelkoppelingenbalk"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "mail"
 
@@ -16040,6 +16598,32 @@ msgstr "mail"
 msgid "Brought to you by"
 msgstr "U gebracht door"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Onbekende fout"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Ongeldige argumenten"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Kan niet registreren op OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Configuratiedatabase niet gevonden"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generieke fout"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Naamloos)"
@@ -16178,11 +16762,11 @@ msgstr "Kon importeerder niet uitvoeren"
 msgid "_Import"
 msgstr "_Importeren"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Verbindeingen ophangen...."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution instellingen"
 
@@ -16224,11 +16808,34 @@ msgstr "Mapnaam mag geen \"#\" bevatten."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' en '..' zijn gereserveerde mapnamen."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution is bezig offline te gaan."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Post versturen naar %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Fout bij uitvoeren filter %s."
@@ -16242,14 +16849,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kon niet worden gestart."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Over Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Werk Online"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Offline _werken"
 
@@ -16257,50 +16865,6 @@ msgstr "Offline _werken"
 msgid "Work Offline"
 msgstr "Werk zonder netwerk"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution is bezig offline te gaan."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Waarschuwing: Evolution kon niet alle data opwaarderen van versie %d.%d.%d.\n"
-"De data is niet verwijderd, maar kan niet bekeken worden met deze versie van "
-"Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Ongeldige argumenten"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Kan niet registreren op OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Configuratiedatabase niet gevonden"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generieke fout"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Aankruisvakje"
@@ -16370,6 +16934,42 @@ msgstr "Actieve verbindingen"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klik op OK om deze verbindingen te verbreken en offline te gaan"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Contacten: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Post:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Taken:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Map_type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Map van andere gebruikers openen"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Account:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mapnaam:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Gebruiker:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Instellingen Assistent"
@@ -16412,6 +17012,18 @@ msgstr ""
 "\n"
 "Klik op \"Toepassen\" om uw instellingen op te slaan."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution shell"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution test"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution testcomponent"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16473,13 +17085,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan gegevens importeren van de volgende bestanden:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16510,57 +17122,48 @@ msgstr ""
 "ons\n"
 "harde werk en wachten in spanning op uw bijdrage!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Bedankt!\n"
 "Het Ximian Evolution team\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Dit bericht niet meer weergeven"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Kan geen toegang verkrijgen tot de Evolution shell."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Start Evolution met activatie van het gespecificeerde component"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Beginnen in offline stand"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Beginnen in online modus"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Alle onderdelen van Evolution stoppen"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Geforceerde migratie van Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Zend de debug uitvoor van alle componenten naar een bestand"
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16569,13 +17172,79 @@ msgstr ""
 "%s: --online en --offline kan niet tegelijk worden gebruikt.\n"
 "  Gebruik %s --help voor meer informatie.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell 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/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Account Assistent"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Certificaat naam"
 
@@ -16807,11 +17476,6 @@ msgstr "U hebt certificaten in uw bestand dat deze personen indentificeren."
 msgid "Your Certificates"
 msgstr "Uw certificaten"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Certificaat bestaat reeds"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
@@ -17002,6 +17666,11 @@ msgstr "Unieke ID van de persoon"
 msgid "Certificate Signature Value"
 msgstr "Certificaatondertekenings waarde"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Certificaat bestaat reeds"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 Bestand wachtwoord"
@@ -17041,12 +17710,12 @@ msgstr "Standaardonderwerp van het bericht."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kon '%s' niet uitvoeren: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s wordt afgesloten (%s)\n"
@@ -17110,7 +17779,8 @@ msgid "Select all contacts"
 msgstr "Selecteer alle contacten"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Stuur een bericht naar de geselecteerde contacten."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17141,8 +17811,8 @@ msgstr "Huidige contact weergeven"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Acties"
@@ -17160,7 +17830,8 @@ msgid "_Preview Pane"
 msgstr "Voorbeeldvenster"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Op_slaan als VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17284,10 +17955,20 @@ msgstr "Huidige afspraak weergeven"
 msgid "Week"
 msgstr "Week"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Werkweek"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Open Afspraak"
 
+#: 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 "Sl_uiten"
+
 #: 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
@@ -17608,6 +18289,16 @@ msgstr "Selectie in_verteren"
 msgid "_Threaded Message List"
 msgstr "_Berichtenlijst met discussies"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "Sl_uiten"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Afzender aan a_dresboek toevoegen"
@@ -17846,7 +18537,8 @@ msgid "Open the selected message in a new window"
 msgstr "Geselecteerde bericht openen in een nieuw venster"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 "Geselecteerde bericht openen als nieuw bericht om het opnieuw te zenden"
 
@@ -17962,58 +18654,46 @@ msgstr "VMap op _onderwerp..."
 msgid "_Attached"
 msgstr "_Bijgevoegd"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiëren naar map"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Filter maken van bericht"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Ga naar"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Ingebonden"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Groter"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Berichtweergave"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Verplaatsen naar map"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Volgend bericht"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normale weergave"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Bericht _openen"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Vo_rig bericht"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "Ge_citeerd"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Opnieuw sturen..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "E_xtra"
@@ -18022,16 +18702,6 @@ msgstr "E_xtra"
 msgid "_Undelete"
 msgstr "_Herstellen"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "Sl_uiten"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bijlage toevoegen"
@@ -18421,6 +19091,11 @@ msgstr "_Verkorte handleiding"
 msgid "_Send / Receive"
 msgstr "_Versturen & ontvangen"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Venster"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Op _bedrijf"
@@ -18485,10 +19160,6 @@ msgstr "Met _Verloopdatum"
 msgid "With _Status"
 msgstr "Met Status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Taken"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18646,6 +19317,34 @@ msgstr "Overige..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution Fout"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution e-mail"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Bijeenkomst Informatie"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution samenvatting"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Afdruk lettertypen</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Uitvouwen"
@@ -18760,6 +19459,35 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "_Nu zoeken"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 bestaat reeds.\n"
+"Wilt u het overschrijven?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Kan niet opslaan als '%s'\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Kan niet opslaan als '%s'\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18770,13 +19498,153 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% voltooid)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution adresboek mapweergave"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adres _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution kalenderweergave"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution taakbeheer"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Kon Gnome-vfs niet initialiseren"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Kon de map in `%s' niet openen"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "De URI die de kalender zal tonen"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Het type weergaven"
+
+#~ msgid "Display a message"
+#~ msgstr "Een bericht tonen"
+
+#~ msgid "Alerts"
+#~ msgstr "Waarschuwingen"
+
+#~ msgid "Time"
+#~ msgstr "Tijd"
+
+#~ msgid "_General"
+#~ msgstr "_Algemeen"
+
+#~ msgid "Select source"
+#~ msgstr "Selecteer bron"
+
+#~ msgid "calendar"
+#~ msgstr "kalender"
+
+#~ msgid "task list"
+#~ msgstr "takenlijst"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Calenderbestand kon niet bijgewerkt worden!\n"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "De achterliggende takenlijst voor\n"
+#~ "%s\n"
+#~ " is vastgelopen."
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "De URI van de te tonen takenmap"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Kon de taken in `%s' niet laden"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution postmap-weergave"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VMap op draad"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter op draad"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "De migratie van pop3 uid caches is mislukt: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Het migreren van map uitklap status is mislukt: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Kan opslag `%s' niet openen: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "De URI van de mail bron die de weergave zal tonen"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Standaard snelkoppelingsgroep"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Standaard breedte van de snelkoppelingen balk"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Pad naar de standaard agenda map"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Pad naar de standaart contacten map"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Pad naar de standaard mail map"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Pad naar de standaard takenlijst map"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Fysieke URL naar de standaard agenda map"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Fysieke URI naar de standaard contacten map"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Fysieke URI naar de standaard mail map"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Fysieke URI naar de standaard taken map"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Toont de mappenbalk"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Toont de snelkoppelingenbalk"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
 #~ msgstr ""
-#~ "Adresboek '%s' zal worden verwijderd. Weet u zeker dat u wilt doorgaan?"
+#~ "Waarschuwing: Evolution kon niet alle data opwaarderen van versie %d.%d.%"
+#~ "d.\n"
+#~ "De data is niet verwijderd, maar kan niet bekeken worden met deze versie "
+#~ "van Evolution.\n"
 
-#~ msgid "New Address Book"
-#~ msgstr "Nieuw adresboek"
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Kan de Ximian Evolution-schil niet initialiseren: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Opnieuw sturen..."
 
 #~ msgid "New Addressbook Book"
 #~ msgstr "Nieuw adresboek boek"
@@ -18956,9 +19824,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Partner:"
 
-#~ msgid "_Add"
-#~ msgstr "_Toevoegen"
-
 #~ msgid "_Business:"
 #~ msgstr "_Zakelijk:"
 
@@ -19083,18 +19948,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Afrondingsdatum is voor begindatum!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Begindatum:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Verloopdatum:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioriteit:"
-
-#~ msgid "Enter the password for %s"
-#~ msgstr "Voer uw wachtwoord in voor %s"
-
 #~ msgid "New task list"
 #~ msgstr "Nieuwe takenlijst"
 
@@ -19135,13 +19988,6 @@ msgstr "%s (%d%% voltooid)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan bestandsbeschrijving niet kopëren: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19314,33 +20160,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Kan de gegeven gedeelde map niet vinden."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alender:"
-
-#~ msgid "_Contacts:"
-#~ msgstr "_Contacten: "
-
-#~ msgid "_Mail:"
-#~ msgstr "_Post:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Taken:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Map_type:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Map van andere gebruikers openen"
-
-#~ msgid "_Account:"
-#~ msgstr "_Account:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mapnaam:"
-
-#~ msgid "_User:"
-#~ msgstr "_Gebruiker:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Maak een nieuw venster"
 
@@ -19362,82 +20181,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "De weergave wanneer de agenda begint"
 
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Onverwacht antwoord van IMAP-server %s: %s"
-
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Kan de map `%s' niet selecteren: Ongeldige mailbox naam"
-
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Kan de map `%s' niet selecteren: Ongelidg commando"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "De verbinding is onverwacht verbroken door de IMAP-server %s: %s"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Kreeg BYE antwoord"
-
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "Fout bij opzetten van beveiligde verbinding met IMAP-server %s: De "
-#~ "server \n"
-#~ "ondersteund geen STARTTLS"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Authenticatie met de IMAP-server %s met het authenticatie mechanisme %s "
-#~ "is mislukt"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sVoer het IMAP wachtwoord in voor %s op host %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Authenticatie op IMAP-server %s middels %s mislukt"
-
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Kan de map `%s' niet aanmaken: Ongeldige mailbox naam"
-
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Kan de map `%s' niet aanmaken: Ongeldig commando"
-
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Kan de map %s niet verwijderen: Speciale map"
-
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Kan de map `%s' niet verwijderen: Ongeldige mailbox naam"
-
-#, fuzzy
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Kan map `%s' niet verwijderen: Ongeldig commando"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr "Kon map: %s niet verwijderen: Ongeldige bewerking"
-
-#, fuzzy
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Kan map niet aanmaken: `%s': %s"
-
-#, fuzzy
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr "Kon de naam van de map: %s niet wijzigen: ongeldige bewerking"
-
-#, fuzzy
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Kan map niet aanmaken: `%s': %s"
-
-#, fuzzy
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Onverwacht antwoord van IMAP-server: %s"
-
-#, fuzzy
-#~ msgid "No data"
-#~ msgstr "Geen taken"
-
 #~ msgid "<b>Filter Rules</b>"
 #~ msgstr "<b>Filter regels</b>"
 
@@ -19458,9 +20201,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "_minute(s)"
 #~ msgstr "minuten"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "De volgende verbindingen zijn op 't moment actief:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Zoek naar Contacten"
 
@@ -19994,9 +20734,6 @@ msgstr "%s (%d%% voltooid)"
 #~ "Dit bericht is digitaal ondertekend, maar er kan niet worden aangetoond "
 #~ "dat het authentiek is."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution Fout"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20108,18 +20845,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgstr "Kalenderinformatie"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Herinneringen"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Begint:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Kalenderinformatie"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Classificatie"
 
@@ -20834,9 +21559,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "No cards"
 #~ msgstr "Geen kaarten"
 
-#~ msgid "%d cards"
-#~ msgstr "%d kaarten"
-
 #~ 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,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"
 
@@ -21172,9 +21894,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Hier kunt u het uiterlijk van de Evolution samenvatting instellen"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolution samenvatting"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolution samenvatting-component"
 
@@ -21574,9 +22293,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Asia"
 #~ msgstr "Azië"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22627,9 +23343,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22693,9 +23406,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25678,9 +26388,6 @@ msgstr "%s (%d%% voltooid)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfork"
 
diff --git a/po/nn.po b/po/nn.po
index 98e11cc584..cc9c59f555 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -7,7 +7,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: nn\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -24,6 +24,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution adressebok"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontaktar: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution alarm"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -48,16 +58,6 @@ msgstr "kort"
 msgid " card"
 msgstr "kort"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontaktar: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution alarm"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Standard synkroniseringsaddresse:"
@@ -72,64 +72,21 @@ msgstr "Klarte ikkje å lasta adressebok"
 msgid "Could not read pilot's Address application block"
 msgstr "Klarte ikkje å lese addresseblokka i programmet til piloten"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autofullføring"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Set opp autofullføring her"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution adressebok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution adressebok adressedialog"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution adressebok adressevisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution adressebok kortvisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution adressebok-komponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution adressebok mappevisar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime-sertifikatstyring"
+# TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Hentar data frå LDAP-tenar anonymt"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution oppsettkontroll for mappeinnstillingar"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Kan ikkje autentisera.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sSkriv inn passord for %s (brukar %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -170,41 +127,45 @@ msgstr "_Kontaktar: "
 msgid "Create a new contacts group"
 msgstr "Lagar ei ny snarveggruppe"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Feil ved henting av skjemainformasjon"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Overfører ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Overfører «%s»:"
@@ -212,8 +173,8 @@ msgstr "Overfører «%s»:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "På denne datamaskina"
 
@@ -221,7 +182,7 @@ msgstr "På denne datamaskina"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personleg"
@@ -287,21 +248,43 @@ msgstr ""
 "\n"
 "Ha tolmod medan Evolution overfører mappene dine ..."
 
-# TRN: Må finna betre ord for «aksessera». Kanskje dette duger?
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Hentar data frå LDAP-tenar anonymt"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Kan ikkje autentisera.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Ny adressebok"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sSkriv inn passord for %s (brukar %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -322,6 +305,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresse til mappa som vart sist brukt i vel namn-dialogen"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autofullføring"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Set opp autofullføring her"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution adressebok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution adressebok adressedialog"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution adressebok adressevisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution adressebok kortvisar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution adressebok-komponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime-sertifikatstyring"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution oppsettkontroll for mappeinnstillingar"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  V_is støtta basar "
@@ -343,6 +381,7 @@ msgstr "  V_is støtta basar "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -415,7 +454,7 @@ msgstr "_Kontaktar: "
 msgid "Address Book Properties"
 msgstr "Addressebokeigenskapar"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Alltid"
@@ -430,108 +469,98 @@ msgid "Basic"
 msgstr "Enkel"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "F_argar"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Koplar til"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Støtta søkebasar"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmennt"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Aldri"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Ein"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Vel ein farge"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Sø_keområde: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Søker"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -540,7 +569,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -555,7 +584,7 @@ msgstr ""
 "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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -567,19 +596,19 @@ msgstr ""
 "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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Under"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Støtta søkebasar"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -590,7 +619,7 @@ msgstr ""
 "starta. Dersom du let denne stå blank, vil søka byrja ved rota på "
 "katalogtreet."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -604,13 +633,13 @@ msgstr ""
 "Dersom du vel «one», vil berre oppføringane eitt nivå under søkebasen din "
 "brukast.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -621,7 +650,7 @@ msgstr ""
 "dette talet\n"
 "for høgt vil få adresseboka di til å gå sakte."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -631,7 +660,7 @@ msgstr ""
 "at å setja dette til «e-post-adresse» krev at anonym tilgang til LDAP-"
 "tenaren."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -640,7 +669,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -651,128 +680,135 @@ msgstr ""
 "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:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Bruker distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Brukar e-post adresse"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Når det er mogleg"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktar: "
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Grense for ne_dlasting:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Metode for å logga inn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritet:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Søkebase:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Tenarnamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_kvar"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Tid før avbrot (minutt):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Br_uk sikker tilknytning (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "tilkopling-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "almennt-fane"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minutt"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "søke-fane"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Grensesnitt for val av namn i Evolution adressebok"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Fjern alle"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Fjern"
 
+#: 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 "Namn"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Fjern alle"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Vis kontaktliste"
@@ -795,22 +831,15 @@ msgstr "Legg til kontakter"
 msgid "Unnamed Contact"
 msgstr "Kontakt utan namn"
 
-#: 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
-msgid "Name"
-msgstr "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
 msgid "Source"
 msgstr "Kjelde"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Grensesnitt for val av namn i Evolution adressebok"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -877,142 +906,142 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresse _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Bryllupsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Fødselsdag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Vevlogg"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Poststad:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Kommando:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "A_vdeling:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Ledig/Oppteken URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Fullt _namn ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Heim"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-postadresse:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Sjef"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Kalle_namn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "M_erknadar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Anna"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postboks:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1040,9 +1069,9 @@ msgstr "Nettside:"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Arbeid"
@@ -1075,23 +1104,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Er du sikker på at du vil\n"
+"sletta desse kontaktane?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Er du sikker på at du vil\n"
+" slette denne kontakta?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Kan redigerast"
 
@@ -2072,94 +2117,112 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-# TRN: «Send» betre enn «post»?
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Teneste"
-
-#: 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 "Plassering"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Brukarnamn"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Gruppe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Kjeldebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Skrivbare felt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Endra"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten høyrer til desse kategoriane:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Slett dei valde kontaktane"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Desse tilkoplingane er aktive:"
+
+#: 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»"
 
+# TRN: «Send» betre enn «post»?
+#: 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
+msgid "Service"
+msgstr "Teneste"
+
+#: 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 "Plassering"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Brukarnamn"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Ny kontakt - raskt"
@@ -2177,22 +2240,6 @@ msgstr "_Fullt namn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Er du sikker på at du vil\n"
-"sletta desse kontaktane?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Er du sikker på at du vil\n"
-" slette denne kontakta?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresse _2:"
@@ -2341,8 +2388,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
@@ -2403,6 +2450,441 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Listemedlemmar"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisasjon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Skildring"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Gruppe"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Bil-telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Arbeid"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Vevlogg"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Personleg"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Merknad"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Jobbtittel:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Heimeside"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Vellukka"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Fråkopla lager"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Nekta tilgang"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Fann ikkje kontakt"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+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
+msgid "Protocol not supported"
+msgstr "Protokollen er ikkje støtta"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Avbroten"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Klarte ikkje opna kjelde"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Autentisering feila"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Treng autentisering"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Ingen slik melding"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Anna feil"
+
+# TRN. «Aksessera». Blæ.
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Det var fleire treff på dette søket enn tenaren er satt opp\n"
+"til å returnera, eller fleire treff enn Evolution er satt opp\n"
+"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
+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 ""
+"Dette søket tok lengre tid å utføra enn tenaren tillet eller tidsgrensa\n"
+"du har satt for denne adresseboka. Gjer søket ditt meir presist eller\n"
+"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
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+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
+msgid "Error adding contact"
+msgstr "Feil når kontakt vart lagt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Feil ved endring av liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Feil ved endring av kontakt"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Feil ved fjerning av kontakt"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"Å 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s eksisterar allereide\n"
+"Vil du skrive over?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Flytt kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Kopiér kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Flytt kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Kopiér kontakt til"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Vel kontaktar frå adresseboka"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Fleire VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard for %s"
+
+#.
+#. * 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 "(ingen)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primær e-post"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Vel ei handling"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Lag ny kontakt «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Legg til addresser for eksisterande kontakt «%s»"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Spør adresseboka ..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Rediger kontaktinformasjon"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Flett e-postadresser"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "og ein annan kontakt."
+msgstr[1] "og ein annan kontakt."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Vis fullt VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Vis kompakt VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Lagra i addressebok"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Ingen kontaktar"
@@ -2417,8 +2899,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Spør"
 
@@ -2473,9 +2955,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Lagra som VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2543,7 +3026,7 @@ msgid "Cut"
 msgstr "Klipp ut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2554,18 +3037,8 @@ msgstr "Kopier"
 msgid "Paste"
 msgstr "Lim inn"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Slett"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktiv vising"
 
@@ -2581,7 +3054,7 @@ msgstr ""
 "har krasja. Du må starta Evolution på nytt for å bruka han igjen."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Einkvar kategori"
@@ -2622,21 +3095,6 @@ msgstr "Kategoriar"
 msgid "Company Phone"
 msgstr "Firmatelefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Etternamn"
@@ -2673,29 +3131,14 @@ msgstr "Journal"
 msgid "Manager"
 msgstr "Sjef"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Kallenamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Merknad"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisasjon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alternativ faks"
@@ -2748,21 +3191,29 @@ msgstr "Eining"
 msgid "Web Site"
 msgstr "Nettstad"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Breidd"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Høgd"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Har fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Vald"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markør"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Felt"
@@ -2779,10 +3230,6 @@ msgstr "Tekstmodell"
 msgid "Max field name length"
 msgstr "Største lengd på feltnamn"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolonnebreidd"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2811,415 +3258,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Vald"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markør"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Listemedlemmar"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Skildring"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Gruppe"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Bil-telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Arbeid"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Vevlogg"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Personleg"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Jobbtittel:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Heimeside"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Vellukka"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Fråkopla lager"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adresseboka finst ikkje"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Nekta tilgang"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Fann ikkje kontakt"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-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:60
-msgid "Protocol not supported"
-msgstr "Protokollen er ikkje støtta"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Avbroten"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Klarte ikkje opna kjelde"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Autentisering feila"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Treng autentisering"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Ingen slik melding"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Anna feil"
-
-# TRN. «Aksessera». Blæ.
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Ikkje i stand å opna adresseboka"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Det var fleire treff på dette søket enn tenaren er satt opp\n"
-"til å returnera, eller fleire treff enn Evolution er satt opp\n"
-"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:167
-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 ""
-"Dette søket tok lengre tid å utføra enn tenaren tillet eller tidsgrensa\n"
-"du har satt for denne adresseboka. Gjer søket ditt meir presist eller\n"
-"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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Vil du lagra endringane?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Forkast"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Feil ved tillegging av liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Feil når kontakt vart lagt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Feil ved endring av liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Feil ved endring av kontakt"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Feil ved fjerning av liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Feil ved fjerning av kontakt"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Å 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s eksisterar allereide\n"
-"Vil du skrive over?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Skriv over"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Flytt kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Kopiér kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Flytt kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Kopiér kontakt til"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Vel kontaktar frå adresseboka"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Fleire VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard for %s"
-
-#.
-#. * 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 "(ingen)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primær e-post"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Vel ei handling"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Lag ny kontakt «%s»"
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Legg til addresser for eksisterande kontakt «%s»"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Spør adresseboka ..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Rediger kontaktinformasjon"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Flett e-postadresser"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "og ein annan kontakt."
-msgstr[1] "og ein annan kontakt."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Vis fullt VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Vis kompakt VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Lagra i addressebok"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolonnebreidd"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3266,11 +3307,6 @@ msgstr "Evolution vCalendar-import"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Skriv ut konvolutt"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Skriv ut kontaktar"
@@ -3280,6 +3316,11 @@ msgstr "Skriv ut kontaktar"
 msgid "Print contact"
 msgstr "Skriv ut kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Skriv ut konvolutt"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3464,16 +3505,6 @@ msgstr ""
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Spesifiser utfil som skal brukast i staden for standard ut."
@@ -3530,6 +3561,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Feil ved lasting av standard addressebok."
@@ -3542,11 +3583,12 @@ msgstr "Inndata fil"
 msgid "No filename provided."
 msgstr "Filnamn ikkje oppgjeve."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Liste utan namn"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Skriv inn passord"
 
@@ -3578,118 +3620,55 @@ msgstr "Standard prioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunne ikkje lesa applikasjonsblokka for hugseliste i piloten"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalenderar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Set opp tidssone, kalender og oppgåveliste her"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution kalender og oppgåver"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Oppsettkontroll for Evolution kalender"
-
-#: 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 "Evolution kalendervisar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution kalender-/oppgåve-redigering"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution oppgåvevisar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution kalenderkomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution oppgåvekomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Oppgåver"
-
-# TRN: Påminning om ein alarm? Rare greier.
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution kalender alarmpåminningsteneste"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Slutt:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm på %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Lukk"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Utse_tt"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Tid alarmen skal utsetjast (minutt):"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "R_edigér avtale"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Utse_tt"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Opna"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Inga skildring tilgjengeleg"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3702,12 +3681,12 @@ msgstr ""
 "Startar %s\n"
 "Sluttar %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Åtvaring"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3719,7 +3698,7 @@ msgstr ""
 "senda ein e-post. Evolution vil visa ein normal\n"
 "påminnar-dialogboks i staden."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3736,19 +3715,20 @@ msgstr ""
 "\n"
 "Er du sikker på at du vil køyra dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ikkje spør om dette programmet fleire gongar."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+# TRN: Påminning om ein alarm? Rare greier.
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution kalender alarmpåminningsteneste"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kan ikkje initialisera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Klarte ikkje å initialisere gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Kan ikkje laga factory for alarmtenesta"
 
@@ -3857,57 +3837,42 @@ msgid "Weekday the week starts on"
 msgstr "Vekedag veka byrjar på"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Om det skal spørjast etter stadfesting når avtalar vert sletta"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Om det skal spørjast etter stadfesting når mapper vert tømde"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Om utførte oppgåver skal gøymast"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Om hendingar skal ha ei standardpåminning"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Om tider skal visast i 24-timarsformat i staden for 12-timars"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om vekenummer skal visast i minikalenderen"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Samandrag inneheld"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Skildring inneheld"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Merknad inneheld"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Skildring inneheld"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Ikkje truffe"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3917,119 +3882,129 @@ msgstr ""
 "tidslengda. Dersom du held fram, vil du ikkje kunna gjenoppretta desse "
 "hendingane."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Fjern hendingar eldre enn"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dagar"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%d. %a %b"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 "%d. %a %b %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 "Kalenderen «%s» vil verta fjerna. Er du sikker på at du vil halda fram?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Eigenskapar ..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Lastar melding ..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalenderar"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Ny avtale"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "A_vtale"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Lag ein ny avtale"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Møt_e"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Lag ein ny møteførespurnad"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Avtale for heile _dagen"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Lag ein ny avtale for heile dagen"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Ny kalender"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alender"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Lag ein ny kalender"
 
@@ -4059,15 +4034,36 @@ msgstr "Vekesvising"
 msgid "Month View"
 msgstr "Månadsvising"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Samandrag inneheld"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Skildring inneheld"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Merknad inneheld"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Skildring inneheld"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Ikkje truffe"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Feil under opning av kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikkje støtta når kalenderen vert opna"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Nekta tilgang til å opna kalenderen"
 
@@ -4076,19 +4072,6 @@ msgstr "Nekta tilgang til å opna kalenderen"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Kan ikkje opna mappa i «%s»"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI-en som kalenderen skal visa"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Typen vising som skal brukast"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Val for lydlarm"
@@ -4155,7 +4138,7 @@ msgstr "gongar kvar(t)"
 msgid "hours"
 msgstr "timar"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4174,14 +4157,14 @@ msgstr "Enkel"
 msgid "Date/Time:"
 msgstr "Dato/tid:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Vis ei melding"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Spel ein lyd"
 
+#: 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 "Påminningar"
@@ -4196,6 +4179,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
 msgid "Summary:"
 msgstr "Samandrag:"
@@ -4234,10 +4218,104 @@ msgstr "minutt"
 msgid "start of appointment"
 msgstr "byrjing på avtale"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Kjeldeadressa «%s» er ikkje velforma."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr "Gruppa «%s» er ekstern. Du må oppgje ei adresse å henta kalenderen frå"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Legg til ny kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Oppgåvelistegruppe"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Legg til ny kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Type:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "veker"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "På"
 
@@ -4251,19 +4329,19 @@ msgstr "Ikkje fjern"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Skru av"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Skru på"
 
@@ -4288,162 +4366,176 @@ msgid "60 minutes"
 msgstr "60 minutt"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Åtvaringar"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Skal vera ferdig:</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Skal vera ferdig:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "   Alternativ for oppgåveliste</b>                <b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Skal vera ferdig:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Skal vera ferdig:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Innstillingar for kalender og oppgåver"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Farge for oppgåver som har gått over tida"
 
-#: 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 "Farge for oppgåver som skal vera ferdige i dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Dag_en sluttar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dagar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Vis"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "S_lå på"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minutt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Su_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Laurdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Vis ei påminning"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Vis veke_nummer i datonavigatøren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Søndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "_Oppgåver som skal vera ferdige i dag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "T_or"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Oppgåveliste"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Tid_ssone:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Tysdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Veka byrjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Arbeidsveke"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Arbeidsdagar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 timers (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 timar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Legg til adresse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Be om stadfesting når oppføringar vert sletta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Komprimer helger i månadsvising"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Dagen byrjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Vis"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4453,139 +4545,46 @@ msgstr "_Vis"
 msgid "_Edit"
 msgstr "R_edigér"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_offentleggjering av ledig/oppteken-tid"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Generelt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Gøym fullførte oppgåver etter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Oppgåver som har gått over tida:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Lau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Vis sluttidspunkt for avtalar i veke- og månadsvising"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Oppdeling a_v tid:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "T_ys"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "før kvar avtale"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Kjeldeadressa «%s» er ikkje velforma."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr "Gruppa «%s» er ekstern. Du må oppgje ei adresse å henta kalenderen frå"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Legg til ny kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Oppgåvelistegruppe"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Kalendereigenskapar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Legg til ny kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Type:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "veker"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4669,81 +4668,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Du har ikkje gjort nokon endringar. Oppdater redigering?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfeil: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " til "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Ferdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Ferdig "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Ferdig"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Ferdig"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Kan ikkje oppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Redigér avtale"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Oppgåve - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Journaloppføring - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Ikkje noko samandrag"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lagra som ..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Endringar som vert gjort i denne oppføringa kan verta forkasta dersom det "
 "kjem ei oppdatering"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Kan ikkje bruka noverande versjon!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfeil: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " til "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Ferdig "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Ferdig"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Ferdig"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Klarte ikkje opna kjelde"
@@ -4864,27 +4863,27 @@ msgstr "Delegér til:"
 msgid "Enter Delegate"
 msgstr "Tast inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Påminning"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Repetering"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Møte"
 
@@ -4897,7 +4896,7 @@ msgstr "Forfallsdato er før startdato"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Startdato er feil"
 
@@ -4983,10 +4982,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5005,15 +5004,15 @@ msgstr "Det må vera ein organisator."
 msgid "At least one attendee is required."
 msgstr "Det må vera minst ein deltakar."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegér til ..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5287,27 +5286,19 @@ msgstr "_Forkast endringar"
 msgid "Save Event"
 msgstr "Lagra hending"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Vel importerar"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Vel målkjelde"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalender"
+msgid "_Destination"
+msgstr "Målet er skrivebeskytta"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Ny oppgåveliste"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Oppgåveliste"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5336,38 +5327,44 @@ msgid "% _Complete"
 msgstr "% _ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Ferdig"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Høg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Under arbeid"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Lav"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Vanleg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Ikkje starta"
 
@@ -5403,11 +5400,11 @@ msgstr "_Nettsideaddresse:"
 msgid "Assignment"
 msgstr "Tildeling"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Forfallsdato er feil"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ikkje i stand å opna oppgåver i «%s»."
@@ -5416,8 +5413,9 @@ msgstr "Ikkje i stand å opna oppgåver i «%s»."
 msgid "Con_fidential"
 msgstr "Kon_fidensielt"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Skildring:"
@@ -5563,102 +5561,53 @@ msgstr "%s %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for ein ukjent utløysartype"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Offentleg"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Konfidensiell"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Dato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Start-dato"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Samandrag"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Oppteke"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Klikk for å opna %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Utan tittel"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Startdato:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Forfallsdato:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiske posisjonen må skrivast inn på formatet: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Prioritet:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nei"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Nettsideaddresse:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Ukjend"
+#: 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 "Offentleg"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Repeterande"
+#: 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 "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Tildelt"
+#: 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 "Konfidensiell"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5704,17 +5653,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+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:399
+msgid "Busy"
+msgstr "Oppteke"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Slettar valde objekt"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Opna"
 
@@ -5723,41 +5681,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -5815,78 +5774,158 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Start-dato"
 
+#: 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 "Samandrag"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Sortér oppgåver"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Ny _avtale ..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Ny h_eildagshending"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vel _tråd"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Vel ..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/oppteken-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopier til mappe ..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Flytt til _mappe ..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Set opp møte ..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Send vidare som iCalendar ..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendinga"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendingane"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Gå _til idag"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Gå til dato ..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Innstillingar ..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Dato"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Ukjend"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Repeterande"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nei"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: 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 ""
+"Den geografiske posisjonen må skrivast inn på formatet: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5911,36 +5950,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutt oppdeling"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutt oppdeling"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6049,10 +6088,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6082,7 +6117,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6296,63 +6331,59 @@ msgstr "Vedlegg inneheld ikkje ei gyldig kalendermelding."
 msgid "The attachment has no viewable calendar items"
 msgstr "Vedlegget inneheld ingen kalendervedlegg som let seg visa."
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderfila kan ikkje oppdaterast!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Oppdateringa er ferdig\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet er ugyldig og kan ikkje oppdaterast\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Fann ikkje objekt.\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Deltakarstatus oppdatert\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Deltakarstatus kan ikkje oppdaterast!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Fjerning ferdig"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Oppføring sendt!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Oppføringen kan ikkje sendast!\n"
 
@@ -6469,28 +6500,6 @@ msgstr "Delegert"
 msgid "In Process"
 msgstr "Under prossering"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ute av kontoret"
@@ -6551,7 +6560,34 @@ msgstr "Tida møtet _startar:"
 msgid "Meeting _end time:"
 msgstr "Møt_e slutttid:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d. %B, %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Skriv inn passordet for %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6560,21 +6596,19 @@ msgstr ""
 "Feil på %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Opnar oppgåver på %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6583,51 +6617,105 @@ msgstr ""
 "Feil under opning av %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Fullfører oppgåver ..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Slettar valde objekt ..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Tømer"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Oppgåver"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Avtale - %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Lastar oppgåver"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Opnar %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Tømmer"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Set opp tidssone, kalender og oppgåveliste her"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolution kalender og oppgåver"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Oppsettkontroll for Evolution kalender"
+
+#: 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 "Evolution kalender-/oppgåve-redigering"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution kalenderkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Evolution oppgåvekomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalenderar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Oppgåver"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6765,6 +6853,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Kan ikkje opna kalenderen «%s»."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Ikkje i stand å opna oppgåver i «%s»."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6984,7 +7089,7 @@ msgid "Contacts: "
 msgstr "Kontaktar: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Førehandsvising av utskrift"
 
@@ -6996,67 +7101,77 @@ msgstr "Skriv ut element"
 msgid "Print Setup"
 msgstr "Utskriftoppsett"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Ny oppgåveliste"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Sletta"
+msgstr[1] "Sletta"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Lastar oppgåver"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Oppgåve"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Opprett ei ny oppgåve"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Ny oppgåve"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Oppgåvelistegruppe"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Opprett ei ny oppgåve"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Adressa til oppgåvemappa som skal visast"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kan ikkje lasta oppgåvene i «%s»"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7068,11 +7183,11 @@ msgstr ""
 "\n"
 "Vil du sletta desse oppgåvene?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ikkje spør igjen"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Skriv ut oppgåver"
 
@@ -8718,7 +8833,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Gjer mappa «%s» klar for fråkopla bruk"
@@ -8812,33 +8927,6 @@ msgstr "Ugyldige argument til (brukar-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Feil under køyring av filtersøk: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan ikkje tolka søkeuttrykket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Feil under køyring av søkeuttrykket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8870,7 +8958,50 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Filtrerer nye meldingar"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Kan ikkje tolka søkeuttrykket: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Feil under køyring av søkeuttrykket: %s:\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8881,43 +9012,43 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbroten."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventa svar frå GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
 # TRN: Denne bør skrivast om.
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8929,63 +9060,83 @@ msgstr ""
 "%s"
 
 # TRN: Sjå førre.
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Kan ikkje køyra gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Feil under køyring av gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Kan ikkje stadfesta signaturen på meldinga: Feil format på meldinga"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan ikkje stadfesta signaturen på meldinga: Kan ikkje laga mellombels fil: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Klarte ikkje å laga krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Kryptert innhald"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunne ikkje motta fil"
 
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#, c-format
+msgid "Could not create lock file for %s: %s"
+msgstr "Kan ikkje laga låsfil for %s: %s"
+
+#: camel/camel-lock.c:154
+#, c-format
+msgid "Timed out trying to get lock file on %s. Try again later."
+msgstr ""
+
+#: camel/camel-lock.c:209
+#, c-format
+msgid "Failed to get lock using fcntl(2): %s"
+msgstr ""
+
+#: camel/camel-lock.c:272
+#, c-format
+msgid "Failed to get lock using flock(2): %s"
+msgstr ""
+
 #: camel/camel-lock-client.c:100
 #, c-format
 msgid "Cannot build locking helper pipe: %s"
@@ -9007,26 +9158,6 @@ msgstr ""
 msgid "Could not lock '%s'"
 msgstr "Kan ikkje låsa «%s»"
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
-#, c-format
-msgid "Could not create lock file for %s: %s"
-msgstr "Kan ikkje laga låsfil for %s: %s"
-
-#: camel/camel-lock.c:154
-#, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
-msgstr ""
-
-#: camel/camel-lock.c:209
-#, c-format
-msgid "Failed to get lock using fcntl(2): %s"
-msgstr ""
-
-#: camel/camel-lock.c:272
-#, c-format
-msgid "Failed to get lock using flock(2): %s"
-msgstr ""
-
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9264,7 +9395,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9464,7 +9595,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Sertifikat-ID:"
 
 #: camel/camel-smime-context.c:360
@@ -9481,7 +9612,7 @@ msgstr "Kan ikkje låsa mappa «%s»: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Kan ikkje leggja til i lokal «Sendt»-mappe: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Kan ikkje autentisera.\n"
@@ -9551,97 +9682,97 @@ msgstr "Kan ikkje laga mappa: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Kan ikkje henta melding %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Signaturfil:"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Legg til kriterium"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Tenar: %s, Type: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP-kommando feila: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "_Lag regel frå melding"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Kan ikkje låsa mappa «%s»: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Klarte ikkje å kople til LDAP-tenar"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9659,16 +9790,26 @@ msgstr "Kan ikkje laga mappa: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Klarar ikkje å opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Papirkorg"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9793,7 +9934,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9802,11 +9943,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9830,7 +9971,7 @@ msgstr ""
 "Vil du akseptera likevel?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9845,28 +9986,28 @@ msgstr ""
 "\n"
 "Vil du akseptere likevel?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9878,17 +10019,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Klarter ikkje å tolke URL frå «%s»"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Feil ved lagring av «%s»: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Inga slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Berre sjekk for ny e-post."
@@ -9898,11 +10039,6 @@ msgstr "Berre sjekk for ny e-post."
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9919,10 +10055,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Ser etter ny e-post"
 
 #: 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 "Sjå etter ny e-post i alle mappene"
@@ -9957,6 +10095,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9977,26 +10116,323 @@ msgstr ""
 msgid "Checklist"
 msgstr "liste"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Uventa svar frå IMAP-tenaren: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan ikkje henta mappa: %s: %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
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: 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 "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan ikkje henta mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan ikkje henta melding: %s frå mappa «%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 ""
+"Kan ikkje henta melding: %s frå mappa «%s»\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan ikkje leggja til melding i mh-mappe: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan ikkje leggja til melding i mh-mappe: %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 ""
+"Kan ikkje henta melding: %s frå mappa «%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 ""
+"Kan ikkje henta melding: %s frå mappa «%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 ""
+"Kan ikkje henta melding: %s frå mappa «%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 ""
+"Kan ikkje henta melding: %s frå mappa «%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 "Mapper"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Vis kun abbonerte mapper"
+
+#: 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 "Namnerom"
+
+#: 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 "For lesing og lagring av e-post på IMAP-tenarar."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-teneste 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: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/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 "Klarte ikkje å kople til %s (port %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Tilknytning avbroten"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Ukjend feil"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kan ikkje kopla til POP-tenaren %s: Den etterpsurde autentiseringsmetoden er "
+"ikkje støtta."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sSkriv inn SMTP-passordet for %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Autentisering mot POP-tenaren «%s» feila: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappenamnet «%s» er ugyldig, avdi det inneheld teiknet «%c»"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Kommando:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje sletta mappe: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan ikkje byta namn på mappa: %s: Ugyldig operasjon"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Kan ikkje laga mappa: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Uventa svar frå IMAP-tenaren: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Ingen data gjevne"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 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:1089
-msgid "Unknown error"
-msgstr "Ukjend feil"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10041,21 +10477,21 @@ msgstr "Kan ikkje laga mappa %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Kan ikkje lasta samandrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappa vart øydelagt og laga på nytt på tenaren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Leitar etter endra meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikkje henta melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10071,25 +10507,25 @@ msgstr ""
 "Klarar ikkje å hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Hentar samandrag om nye meldingar"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Fann ikkje meldingskropp i svar på FETCH."
 
@@ -10131,23 +10567,6 @@ msgstr "Klarte ikkje å kople til LDAP-tenar"
 msgid "Command:"
 msgstr "Kommando:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Vis kun abbonerte mapper"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namnerom"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bruk filter på nye meldingar i INBOX på denne tenaren"
@@ -10170,86 +10589,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-tenar %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-teneste for %s på %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Klarte ikkje å kople til %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS er ikkje tilgjengeleg"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Tilknytning avbroten"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL forhandlinga feila"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Du tasta ikkje inn eit passord."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10259,25 +10635,18 @@ msgstr ""
 "Ikkje i stand til å autentisere mot IMAP-tenar.\n"
 "%s\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappa «%s» finst ikkje"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappenamnet «%s» er ugyldig, avdi det inneheld teiknet «%c»"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Foreldermappa kan ikkje ha undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10285,7 +10654,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjend opphavsmappe: %s"
@@ -10394,58 +10763,58 @@ msgstr ""
 "i mbox-format. Kan også brukast til å lesa eit tre av mapper av Elm-, Pine- "
 "og Mutt-type."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrota %s er ikkje ein absolutt sti"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrota %s er ikkje ein vanleg katalog"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Kan ikkje henta mappa: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokale lager har ikkje innboks."
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal maldingsfil %s "
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kan ikkje endra namnet på mappa «%s» til «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kan ikkje endra namnet på «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kan ikkje sletta samandragsfila for mappa «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kan ikkje sletta mappeindeksfila «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10511,7 +10880,7 @@ msgstr "Kan ikkje sletta mappa «%s»: %s"
 msgid "not a maildir directory"
 msgstr "ikkje ein maildir-katalog"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10848,7 +11217,7 @@ msgid "Server rejected username/password"
 msgstr "Tenaren avslo brukarnamnet"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10858,8 +11227,8 @@ msgid "User cancelled"
 msgstr "Operasjonen vart avbroten"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10868,48 +11237,48 @@ msgstr "Operasjonen vart avbroten"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikkje henta melding %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Feil under automatisk lagring av meldinga: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Kan ikkje lukka mellombels mappe: %s"
@@ -11028,7 +11397,7 @@ msgstr "Kan ikkje henta gruppa: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Kunne ikkje senda meldinga: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11083,8 +11452,8 @@ msgstr "Inga melding med uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Hentar POP-melding %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Kjende program"
@@ -11541,7 +11910,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -11589,6 +11958,93 @@ msgstr "MIME-type:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+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 "Kan ikkje opna fil"
+
+#: composer/e-msg-composer.c:1291
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "Kunne ikkje motta fil"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Fleire meldingar"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Opna fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: 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.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 "Skriv ei melding"
+
+#: 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
+#, fuzzy
+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 "Kan ikkje laga nytt vindauge.\n"
+
+#: composer/e-msg-composer.c:3279
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr "Kan ikkje laga nytt vindauge.\n"
+
+#: 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
 #, fuzzy
 msgid "Posting destination"
@@ -11674,203 +12130,135 @@ msgstr "<klikk her for å velje mappe>"
 msgid "Attach file(s)"
 msgstr "Legg ved fil"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Kan ikkje opna fil"
-
-#: composer/e-msg-composer.c:1281
-#, fuzzy
-msgid "Unable to retrieve message from editor"
-msgstr "Kunne ikkje motta fil"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Fleire meldingar"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Opna fil"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Kunne ikkje lagra melding(ar)."
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087
-#, fuzzy
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Skriv ei melding"
-
-#: composer/e-msg-composer.c:3137
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"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:3165
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-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 "Kan ikkje laga nytt vindauge.\n"
+msgid "Unfinished messages found"
+msgstr "Neste _ulesne melding"
 
-#: composer/e-msg-composer.c:3269
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr "Kan ikkje laga nytt vindauge.\n"
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vil du lagra endringane?"
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+"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.in.h:1
-msgid "${1}"
-msgstr ""
+#: composer/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Ikkje fjern"
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Fjern"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+#, fuzzy
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Kan ikkje lagra signaturfil: %s"
+
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+#, fuzzy
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Feil ved lagring av snavegar."
+
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Åtvaring: Melding er endra"
+
+#. 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 "Er du sikker på at du vil sletta denne avtalen utan tittel?"
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "Kan ikkje laga røyr: %s"
-
-#: composer/mail-composer-errors.xml.in.h:8
-#, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kan ikkje lagra signaturfil: %s"
-
-#: composer/mail-composer-errors.xml.in.h:9
-#, fuzzy
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Kan ikkje lagra signaturfil: %s"
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
 msgid "Discard Changes"
 msgstr "_Forkast endringar"
 
-#: composer/mail-composer-errors.xml.in.h:12
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vil du lagra endringane?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ikkje fjern"
+msgid "Save Message"
+msgstr "Lagra melding ..."
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Feil ved lagring av snavegar."
+msgid "Could not create message."
+msgstr "Kan ikkje laga røyr: %s"
 
-#: composer/mail-composer-errors.xml.in.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+#. 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/mail-composer-errors.xml.in.h:16
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Recover"
-msgstr "Fjern"
-
-#: composer/mail-composer-errors.xml.in.h:17
-#, fuzzy
-msgid "Save Message"
-msgstr "Lagra melding ..."
+msgid "Could not read signature file \"{0}\"."
+msgstr "Kan ikkje lagra signaturfil: %s"
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:20
-#, fuzzy
-msgid "Unfinished messages found"
-msgstr "Neste _ulesne melding"
-
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Åtvaring: Melding er endra"
-
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Kunne ikkje lagra melding(ar)."
-
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12002,7 +12390,8 @@ msgstr ""
 "Ei fil med det namnet finst alt.\n"
 "Vil du skrive over den?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Skriv over fil?"
 
@@ -12182,84 +12571,100 @@ msgstr "Vel ei biletefil"
 msgid "_Filter Rules"
 msgstr "Filter-reglar"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Feil i det regulære uttrykket «%s»:\n"
-"%s"
+msgid "Missing date."
+msgstr "Møteoppdatering"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Du har gløymt å velje ein dato."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Fila «%s» finst ikkje, eller er ikkje ei vanleg fil."
+msgid "Missing file name."
+msgstr "Distinguished _name:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Møteoppdatering"
+msgid "You must specify a file name."
+msgstr "Stilnamn:"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "Distinguished _name:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Fila «%s» finst ikkje, eller er ikkje ei vanleg fil."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Fjernar mappe %s"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Tildeling"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "Stilnamn:"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Ingen tenar har vorte vald"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Feil i det regulære uttrykket «%s»:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Du har gløymt å velje ein dato."
+msgid "Missing name."
+msgstr "Tildeling"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Du gi dette filteret eit namn."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Du må gje denne mappa eit namn."
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Stilnamn:"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "Stilnamn:"
+msgid "No sources selected."
+msgstr "Ingen tenar har vorte vald"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12273,66 +12678,11 @@ msgstr "Vel ei handling:"
 msgid "<b>Then</b>"
 msgstr "<b>Skal vera ferdig:</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Vel mappe"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Viktig"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Hugseliste"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Seinare"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Regelnamn: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Utan tittel"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Skal vera ferdig:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Utfør handlingar"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "inkomande"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "Utgåande"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12422,6 +12772,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Seinare"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Regelnamn: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Skal vera ferdig:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Utfør handlingar"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegert"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Mottakarar"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Svart til"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Inkluder:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "inkomande"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "Utgåande"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -12558,7 +12979,7 @@ msgstr "er ikkje flagga"
 msgid "Junk Test"
 msgstr "Juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12599,7 +13020,7 @@ msgstr "Avslutt programmet"
 msgid "Play Sound"
 msgstr "Spel lyd:"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Lesen"
 
@@ -12670,9 +13091,9 @@ msgstr "byrjar med"
 msgid "Stop Processing"
 msgstr "Stopp prosessering"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12735,104 +13156,64 @@ msgstr "Emne inneheld ikkje"
 msgid "Virtual _Folders"
 msgstr "Virtuelle mapper"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Legg til"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "vMappe-kjelde"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigerarinstillingar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Set opp e-postkontoar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution oppsettkontroll for e-postkontoar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution e-postkomponent"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution e-postredigerar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution oppsettkontroll for e-postredigerar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-post-mappevisar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-postinnstillingskontroll"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-postkontoar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-postinnstillingar"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 #, fuzzy
 msgid "[Default]"
 msgstr "[Forvald]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 #, fuzzy
 msgid "Unnamed"
 msgstr "Namnlaus"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_HTML-signatur:"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signatur(ar)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Vidaresendt melding"
+
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Lag _virtuell mappe frå søk ..."
 
@@ -12870,557 +13251,581 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Oppgje kor mappa skal lagast:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Lag ei ny mappe"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_namn:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "vMapper"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Innboks"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Lastar ..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Berre sjekk for ny e-post."
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "_Flytt"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Avbryt oppgåve"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vel mappe"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopier"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Lag ei ny mappe"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endra namn på mappa «%s» til:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Endra namn på mappa"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Visning"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Opna i _nytt vindauge"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "_Flytt"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Ny mappe"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Gje nytt namn"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "vMapper"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Innboks"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding .."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _liste"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Vidaresend"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "_Følg opp ..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "_Merk som ferdig"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Fjern merke"
 
-#: mail/em-folder-view.c:787 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 "Mar_ker som lesen"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Marker som ikkje vi_ktig"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marker som _ulesen"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marker som v_iktig"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Angra sletting"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Flytt til _mappe ..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopier til mappe ..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "_Legg til avsendar i adresseboka"
 
 # TRN: «Bruk» rett? Kva med «Køyr» eller «Filtrer»?
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "_Bruk filter"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filter-reglar"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Lag regel frå melding"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "vMappe på _emne"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "vMappe på avse_dar"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "vMappe på mottaka_r"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "vMappe på e-post_liste"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "vMappe på avse_dar"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrér på _emne"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrér på avsen_dar:"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på _mottakarar"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på _e-postliste"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtrér på avsen_dar:"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Forvald"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopier lenkjeadresse"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Trykk her for å leggje til ei oppgåve"
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %s"
-msgstr "Klikk for å opna %s"
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Treff:"
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Tildelt"
+#: 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 "Frå"
 
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-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 "Svar-til"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Legg til kriterium"
+#: 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 "Til"
 
-#: mail/em-format-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-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-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Legg til kriterium"
+#: 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-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-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 "Dato"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s vedlegg"
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Avbroten"
-
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunne ikkje senda meldinga: %s"
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Encrypted"
-msgstr "Kryptert"
+msgid "Unsupported signature format"
+msgstr "Ustøtta skjema"
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan ikkje dekryptera sertifikatsignaturen."
 
-#: mail/em-format-html-display.c:658
-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.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Hentar melding %s"
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
-msgid "_View Certificate"
-msgstr "_Sertifikat-ID:"
+msgid "Unsigned"
+msgstr "Tildelt"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Denne meldinga er ikkje tilgjengeleg."
+msgid "Valid signature"
+msgstr "Legg til kriterium"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%d. %b %k:%M"
+msgid "Invalid signature"
+msgstr "Legg til kriterium"
 
-#: mail/em-format-html-display.c:1010
-#, fuzzy
-msgid "Overdue:"
-msgstr "&Syntaksmerkingsmodusar"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%d. %b %k:%M"
+msgid "Unencrypted"
+msgstr "Avbroten"
 
-#: mail/em-format-html-display.c:1083
-#, fuzzy
-msgid "_View Inline"
-msgstr "Vis innvevd"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
-msgid "_Hide"
-msgstr "_Gøym"
-
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "Side %d av %d"
+msgid "Encrypted"
+msgstr "Kryptert"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Hentar melding %s"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "Flyttar melding"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Frå"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Svar-til"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Til"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc:"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dato"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Treff:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s vedlegg"
+#: 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 ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunne ikkje senda meldinga: %s"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1339
+#: mail/em-format-html-display.c:653
+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."
+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."
+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 ""
+
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Ustøtta skjema"
+msgid "_View Certificate"
+msgstr "_Sertifikat-ID:"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+msgid "This certificate is not viewable"
+msgstr "Denne meldinga er ikkje tilgjengeleg."
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Kan ikkje dekryptera sertifikatsignaturen."
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%d. %b %k:%M"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "Overdue:"
+msgstr "&Syntaksmerkingsmodusar"
+
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%d. %b %k:%M"
+
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "Vis innvevd"
+
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "_Gøym"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr "Side %d av %d"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Kvart år"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Kvar veke"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "kvar månad"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13428,25 +13833,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Kan ikkje leggja %s i mellomlageret: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Kan ikkje leggja %s i mellomlageret: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Kan ikkje kopiera fildeskriptor: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Klarte ikkje å slå opp verten «%s»: %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Kan ikkje oppretta røyr til «%s»: %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13457,99 +13892,83 @@ msgstr "Lagra som ..."
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bruk til _bakgrunn"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Sva_r til avsendar"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Opna ved innsetjing"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Sender ei melding til ein nettverksspelar"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Legg til adressebok"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Opna i %s ..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Denne tenaren stør ikkje LDAPv3 skjemainformasjon"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonnér"
 
-#: mail/em-subscribe-editor.c:637 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 "Mappe"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Velj ein tenar"
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Ingen tenar har vorte vald"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ikkje vis denne meldinga att"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Vidaresendt melding"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "På %a, %d/%m/%Y klokka %H:%M, skreiv %%s:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Melding"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Lagra melding ..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Melding frå %s"
@@ -13569,11 +13988,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13687,134 +14106,143 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "E-postkontoar"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "E-postkontoar"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Loggfør filterhandlingar til:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Standard prioritet:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Påminning ved ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Påminning ved ny e-post"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -13822,33 +14250,25 @@ msgid ""
 msgstr ""
 "S_pør ved sending av HTML-meldingar til kontaktar som ikkje vil ha slike"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13902,8 +14322,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Standard prioritet:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14045,33 +14466,63 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importér"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm-importerar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail-importerar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Redigerarinstillingar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4-importerar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Set opp e-postinnstillingar, inkludert tryggleik og meldingsvising"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine-importerar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Set opp stavekontroll, signaturar og meldingsredigeraren"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox-importerar"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Set opp e-postkontoar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution e-post"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution oppsettkontroll for e-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution e-postkomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution e-postredigerar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution oppsettkontroll for e-postredigerar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-postinnstillingskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-postkontoar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "E-postinnstillingar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_E-post:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14079,15 +14530,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vent litt"
 
@@ -14119,19 +14570,47 @@ msgid "Select folder to import into"
 msgstr "Vel importerar"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importerar"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importerer filer"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox-importerar"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Søker gjennom %s"
@@ -14141,7 +14620,7 @@ msgstr "Søker gjennom %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter: «%s»"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14167,7 +14646,7 @@ msgstr ""
 "prioritetar. Kontroller dei importerte filtera for å vera\n"
 "sikker på at alt virkar som før."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14179,7 +14658,7 @@ msgstr ""
 "som ikkje er støtta i Evolution. Desse filtera\n"
 "vil bli forkasta."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14194,24 +14673,24 @@ msgstr ""
 "å testa om den gjevne strengen er ein del av\n"
 "meldingskroppen eller ikkje."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerer gamle Netscape-data"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importerer gamle Netscape-data"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-postfilter"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14245,166 +14724,178 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontohandtering"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Vert:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Br_ukarnamn:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Sti:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "E-post til %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Emne er %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Melding frå %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, fuzzy, c-format
 msgid "%s mailing list"
 msgstr "%s e-postliste"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Svart til"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Legg til filter-regel"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Sletta"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d dagar"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d sekund"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d sekund"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d kontaktar"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Sletta"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Ny e-postmelding"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_E-post"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Skriv ein e-post"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny vMappe"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-postfilter"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Lag ein ny kalender"
 
-#: mail/mail-component.c:871
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sjekkar teneste"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
 #, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI-en som kalenderen skal visa"
+msgid "Connecting to server..."
+msgstr " Koplar til tenar ..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Mottak av e-post"
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Sender e-post"
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14413,15 +14904,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Sjekkar teneste"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-#, fuzzy
-msgid "Connecting to server..."
-msgstr " Koplar til tenar ..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14732,7 +15214,8 @@ msgid "Execute Command..."
 msgstr "Køyr autorun.sh"
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Fast _breidd:"
 
 #: mail/mail-config.glade.h:82
@@ -15053,429 +15536,546 @@ msgstr "farge"
 msgid "description"
 msgstr "skildring"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+msgid "Invalid authentication"
+msgstr "Autentisering"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
+"SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Er du sikker på at du vil sletta denne kontoen?"
-
-#: mail/mail-errors.xml.in.h:4
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Fjern alle sletta meldingar frå denne mappa for godt"
+#. 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-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Fjern alle sletta meldingar frå alle mapper"
+"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-errors.xml.in.h:6
+#. 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 "Er du sikker på at du vil fjerna denne adressa?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Du sender ei HTML-formatert melding. Pass på at dei følgjande mottakarane\n"
+"er i stand til å lesa HTML-e-post, og faktisk vil ha slik post:\n"
+
+#: 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 "Send"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 ""
 "Er du sikker på at du vil\n"
 " slette denne kontakta?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Spø_r ved sending av melding som berre har mottakarar i Bcc-feltet"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikkje kopiera mappe: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan ikkje laga mappa: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Klarte ikkje å lage mellombels katalog: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Kan ikkje laga katalogen «%s»: %s"
+msgid "Use default drafts folder?"
+msgstr "Opnar standard oppgåvemappe"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Kan ikkje sletta mappa:\n"
-"%s"
+"Kan ikkje opna kladd-mappa til denne kontoen.\n"
+"Vil du bruka standard-kladdmappa?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
+msgid "Use _Default"
+msgstr "Forvald"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Mappa «%s» eksisterar ikkje."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Fjern alle sletta meldingar frå denne mappa for godt"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kan ikkje flytta mappe: %s"
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Klarte ikkje opna kjelde"
+msgid "_Expunge"
+msgstr "_Tøm"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Klarte ikkje opna kjelde"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Fjern alle sletta meldingar frå alle mapper"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan ikkje opna melding"
+msgid "_Empty Trash"
+msgstr "Tøm _papirkorga"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Kan ikkje laga katalogen «%s»: %s"
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Klarte ikkje å lagra til «%s»\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_HTML-signatur:"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Kan ikkje lagra signaturfil: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Slett «%s»"
+msgid "Error while {0}."
+msgstr ""
+"Feil ved «%s»:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Slett dei valde kontaktane"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "_Forkast endringar"
+msgid "Error while performing operation."
+msgstr ""
+"Feil ved lesing av fil:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Vil du lagra endringane?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ikkje slett"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Skriv inn passord"
 
 # TRN: Dårleg.
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Feil ved lesing av filterinformasjon:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Feil ved lesing av fil:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Feil ved «%s»:\n"
-"%s"
+"Klarte ikkje å lagra til «%s»\n"
+" %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Kan ikkje laga katalogen «%s»: %s"
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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
 msgid "File exists but cannot overwrite it."
 msgstr "Fila eksisterar, skriv over?"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Fila «%s» finst ikkje, eller er ikkje ei vanleg fil."
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
+"Kan ikkje sletta mappa:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan ikkje sletta mappa: %s: Mappa finst ikkje"
 
-#: mail/mail-errors.xml.in.h:46
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autentisering"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan ikkje endra namn på mappa: %s: Mappa finst ikkje"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Slett «%s»"
+
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Verkeleg sletta mappa «%s»?"
 
-#: mail/mail-errors.xml.in.h:49
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 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."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. 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-errors.xml.in.h:51
+#. mail:no-rename-folder-exists secondary
+#: mail/mail-errors.xml.h:130 mail/mail-errors.xml.h:192
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "A folder named \"{1}\" already exists. Please use a different name."
+msgstr "Ei mappe som har namnet «%s» finst allereie. Bruk eit anna namn."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
-"Du sender ei HTML-formatert melding. Pass på at dei følgjande mottakarane\n"
-"er i stand til å lesa HTML-e-post, og faktisk vil ha slik post:\n"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Verkeleg sletta mappa «%s»?"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kan ikkje flytta mappe: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
+#. 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 "Klarte ikkje opna kjelde"
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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: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 "Kan ikkje opna melding"
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr " s."
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Kan ikkje kopiera mappe: %s"
 
-#: mail/mail-errors.xml.in.h:56
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr " s."
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kan ikkje laga mappa: %s: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "Klarte ikkje opna kjelde"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Du kan ikkje opprette to kontoar med det same namnet."
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+msgid "Delete account?"
+msgstr "Slett dei valde kontaktane"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Er du sikker på at du vil sletta denne kontoen?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"SMTP-tenaren «%s» støttar ikkje den etterspurde autentiseringstypen %s."
 
-#: mail/mail-errors.xml.in.h:62
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ikkje slett"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
+msgid "Could not save signature file."
+msgstr "Kan ikkje lagra signaturfil: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
-"Dette er siste trekk.\n"
-"Vil du leggja til fleire trekk?"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_HTML-signatur:"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
-"Kan ikkje opna kladd-mappa til denne kontoen.\n"
-"Vil du bruka standard-kladdmappa?"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
 #, fuzzy
-msgid "Use _Default"
-msgstr "Forvald"
+msgid "Discard changed?"
+msgstr "_Forkast endringar"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Opnar standard oppgåvemappe"
+msgid "Do you wish to save your changes?"
+msgstr "Vil du lagra endringane?"
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Du har ikkje fyllt ut all den påkrevde informasjonen."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Dette er siste trekk.\n"
+"Vil du leggja til fleire trekk?"
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Du kan ikkje opprette to kontoar med det same namnet."
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+#, fuzzy
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Mappa «%s» eksisterar ikkje."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Tøm _papirkorga"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr " s."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Tøm"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Send"
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr " s."
 
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. 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-errors.xml.in.h:77
-msgid "{0}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Skriv over"
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Send"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -15484,136 +16084,136 @@ msgstr "Pingar %s"
 msgid "Working"
 msgstr "Arbeidar"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Les mapper"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Hentar e-post"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Sender melding %d av %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Feila på melding %d av %d"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Ferdig."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Lagrar meldingar i mappe"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meldingar til %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierer meldingar til %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Leitar gjennom mapper i «%s»"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Vidaresendt melding"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Opnar lager %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Fjernar mappe %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Friskar opp mappe"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Tømer mappe"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tømer papirkorga i «%s»"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokale mapper"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hentar melding %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15622,7 +16222,7 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15631,11 +16231,11 @@ msgstr ""
 "Feil ved lagring av meldingar til: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Lagrar vedlegg"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15644,17 +16244,17 @@ msgstr ""
 "Kan ikkje laga utdatafil: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Klarte ikkje å skrive data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Koplar frå %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Koplar til %s på nytt"
@@ -15720,25 +16320,25 @@ msgstr "Oppdaterar ..."
 msgid "Waiting..."
 msgstr "Ventar ..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Brukar avbraut operasjonen."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Tast inn passord for %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Tast inn passord"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Fjern denne oppføringa"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15781,89 +16381,94 @@ msgstr "Vidaresendt melding"
 msgid "Invalid folder: `%s'"
 msgstr "Opnar mappe %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Set opp vMappe: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Lagrar mappe «%s»"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Lagrar mappe «%s»"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Rediger vMappe"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Ny vMappe"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Ulesen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Svara"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Fleire uleste meldingar"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Fleire meldingar"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lavast"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Senk"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Høgare"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Høgast"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "I dag, %l:%M:%p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "I går, %l:%M:%p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Opprettar meldingsliste"
 
@@ -15898,47 +16503,47 @@ msgstr "Mottatt"
 msgid "Size"
 msgstr "Storleik"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 #, fuzzy
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Gå framover"
 
-#: 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
 #, fuzzy
 msgid "For Your Information"
 msgstr "Tenarinformasjon"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vidaresend"
 
-#: 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:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svar"
 
-#: mail/message-tag-followup.c:70 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 "Svar til alle"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 #, fuzzy
 msgid "Review"
 msgstr "Førehandsvising"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15986,131 +16591,61 @@ msgstr "_Abbonér"
 msgid "_Unsubscribe"
 msgstr "_Fjern abbonnment"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution skal"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution testkomponent"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
 msgstr "380"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
-msgid "Default shortcut group"
-msgstr "Byt namn på denne snarveggruppa"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Gøym snarveglinja"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Standard prioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Standard prioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolution grensesnitt for oppsett av e-post"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Be om at vedlegget til vanleg vert vist som ein del av meldinga."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Opnar standard oppgåvemappe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Opnar standard oppgåvemappe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Opnar standard oppgåvemappe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Opnar standard oppgåvemappe"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Avgjer om snarvegstolpen skal vise"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Avgjer om snarvegstolpen skal vise"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "e-post"
@@ -16119,6 +16654,32 @@ msgstr "e-post"
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d. %b"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Ukjend feil"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Ugyldige argument"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Kan ikkje registrera i OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Oppsettsdatabasen ikkje funnen"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generell feil"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Utan tittel)"
@@ -16260,11 +16821,11 @@ msgstr "Feil under køyring av gpg."
 msgid "_Import"
 msgstr "_Importér"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Lukkar tilkoplingar ..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution innstillingar"
 
@@ -16306,12 +16867,34 @@ msgstr "Mappenamn kan ikkje innehalda teiknet «#»."
 msgid "'.' and '..' are reserved folder names."
 msgstr "«.» og «..» er resverte mappenamn."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution held på å kopla frå."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-post til %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil ved køyring av %s."
@@ -16325,14 +16908,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug Buddy kan ikkje køyrast."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Om Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Arbeid _tilkopla"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Arbeid _fråkopla"
 
@@ -16340,46 +16924,6 @@ msgstr "Arbeid _fråkopla"
 msgid "Work Offline"
 msgstr "Arbeid fråkopla"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution held på å kopla frå."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Ugyldige argument"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Kan ikkje registrera i OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Oppsettsdatabasen ikkje funnen"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generell feil"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -16454,6 +16998,43 @@ msgstr "Aktive tilkoplingar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klikk OK for å late att desse tilknytningane og for å kople av"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontaktar: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_E-post:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Oppgåver:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Mappe_type:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Opna annan brukar si mappe"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mappenamn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "Br_ukar:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution oppsettassistent"
@@ -16495,6 +17076,20 @@ msgstr ""
 "\n"
 "Trykk på «Bruk»-knappen for å lagra innstillingane dine."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution skal"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution testkomponent"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klikk på «Importer» for å importera fila til Evolution."
@@ -16559,13 +17154,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data frå desse filene:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16597,57 +17192,48 @@ msgstr ""
 "Me vonar at du nyt resultata av det harde arbeidet vårt, og me ventar\n"
 "i spenning på dine bidrag.\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Takk frå\n"
 "Ximian Evolution-utviklarane\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ikkje sei ifrå igjen"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Startar i fråkopla modus"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Tving alle komponentane i Evolution til å avslutta"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift frå alle komponentane til ei fil."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16656,14 +17242,80 @@ msgstr ""
 "%s: «--online» og «--offline» kan ikkje brukast samstundes.\n"
 "  Bruk «%s --help» for å få meir informasjon.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Koplar til"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "KDeelop-installering"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifikat-ID:"
@@ -16914,12 +17566,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Dine sertifikat"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kort-id eksisterar allereide"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17143,6 +17789,12 @@ msgstr "Emne er %s"
 msgid "Certificate Signature Value"
 msgstr "Signaturfil:"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kort-id eksisterar allereide"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17184,12 +17836,12 @@ msgstr "Standardemne for meldinga"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kan ikkje køyra «%s»: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Avsluttar %s (%s)\n"
@@ -17254,7 +17906,8 @@ msgstr "Vel alle kontatene"
 
 # TRN: "send a mess"?
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Send ei melding til den valde kontakten."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17286,8 +17939,8 @@ msgstr "Vis den valde kontakten"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "H_andlingar"
@@ -17306,7 +17959,8 @@ msgid "_Preview Pane"
 msgstr "Førehandsvis i"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Lagra _som VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17436,11 +18090,21 @@ msgstr "Vis den valde kontakten"
 msgid "Week"
 msgstr "Veke"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Arbeidsveke"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "A_vtale"
 
+#: 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 "_Lukk"
+
 #: 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
@@ -17760,6 +18424,16 @@ msgstr "_Invertér val"
 msgid "_Threaded Message List"
 msgstr "_Tråda meldingsliste"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "L_ukk"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18032,7 +18706,8 @@ msgid "Open the selected message in a new window"
 msgstr "Opna vald melding i eit nytt vindauge"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Opna vald melding i redigeringsvindauget for å senda henne på nytt"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18159,59 +18834,46 @@ msgstr "Ingen emne"
 msgid "_Attached"
 msgstr "Lagt _ved"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiér til mappe"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Opprett filter frå melding"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Innvevd"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Meldingsvising"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Flytt til mappe"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal vising"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Opna melding"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Resend..."
-msgstr "_Omdøyp ..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Verk_tøy"
@@ -18221,16 +18883,6 @@ msgstr "Verk_tøy"
 msgid "_Undelete"
 msgstr "_Angra slett"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "L_ukk"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Legg ved"
@@ -18630,6 +19282,11 @@ msgstr "E-postinnstillingar"
 msgid "_Send / Receive"
 msgstr "_Sende / Motta"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Finn no"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
@@ -18703,10 +19360,6 @@ msgstr "Forfalls_dato:"
 msgid "With _Status"
 msgstr "Sett status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Oppgåver"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18863,6 +19516,34 @@ msgstr "Andre ..."
 msgid "..."
 msgstr "... "
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution feil"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution e-post"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Møteinformasjon"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Send meldingar"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -18988,6 +19669,35 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Finn _no"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 eksisterar allereide\n"
+"Vil du skrive over?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Klarte ikkje å lagra til «%s»\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Klarte ikkje å lagra til «%s»\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18998,15 +19708,133 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% ferdig)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution adressebok mappevisar"
+
 #, fuzzy
-#~ 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?"
+#~ msgid "Address 2:"
+#~ msgstr "Adresse _2:"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Ny adressebok"
+#~ msgid "Blog:"
+#~ msgstr "Vevlogg"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution kalendervisar"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution oppgåvevisar"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Klarte ikkje å initialisere gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Kan ikkje opna mappa i «%s»"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI-en som kalenderen skal visa"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Typen vising som skal brukast"
+
+#~ msgid "Display a message"
+#~ msgstr "Vis ei melding"
+
+#~ msgid "Alerts"
+#~ msgstr "Åtvaringar"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "_General"
+#~ msgstr "_Generelt"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Vel importerar"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalender"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Ny oppgåveliste"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalenderfila kan ikkje oppdaterast!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Adressa til oppgåvemappa som skal visast"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Kan ikkje lasta oppgåvene i «%s»"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution e-post-mappevisar"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "vMappe på avse_dar"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrér på avsen_dar:"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Kan ikkje leggja %s i mellomlageret: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Kan ikkje leggja %s i mellomlageret: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Klarte ikkje å slå opp verten «%s»: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI-en som kalenderen skal visa"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Byt namn på denne snarveggruppa"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Gøym snarveglinja"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Opnar standard oppgåvemappe"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Opnar standard oppgåvemappe"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Opnar standard oppgåvemappe"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Opnar standard oppgåvemappe"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Avgjer om snarvegstolpen skal vise"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Avgjer om snarvegstolpen skal vise"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Kan ikkje starta Ximian Evolution-skalet: %s"
+
+#, fuzzy
+#~ msgid "_Resend..."
+#~ msgstr "_Omdøyp ..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "UID til kontaktkjelda som framvisinga vil visa"
@@ -19175,9 +20003,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "S_pouse:"
 #~ msgstr "E_ktefelle:"
 
-#~ msgid "_Add"
-#~ msgstr "_Legg til"
-
 #~ msgid "_Business:"
 #~ msgstr "_Firma:"
 
@@ -19294,15 +20119,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Forfallsdato er før startdato"
 
-#~ msgid "Start Date:"
-#~ msgstr "Startdato:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Forfallsdato:"
-
-#~ msgid "Priority:"
-#~ msgstr "Prioritet:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19334,13 +20150,6 @@ msgstr "%s (%d%% ferdig)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan ikkje kopiera fildeskriptor: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19479,9 +20288,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Framvisinga som vert vist når kalenderen startar"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Skriv inn passordet for %s"
-
 #~ msgid "New task list"
 #~ msgstr "Ny oppgåveliste"
 
@@ -19538,30 +20344,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Kan ikkje finna den spesifiserte delte mappa."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alender:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_E-post:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Oppgåver:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Mappe_type:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Opna annan brukar si mappe"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mappenamn:"
-
-#~ msgid "_User:"
-#~ msgstr "Br_ukar:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Lag eit nytt vindauge"
@@ -19875,9 +20657,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Avslutt hjelpar"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Desse tilkoplingane er aktive:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Søk etter kontaktar"
 
@@ -19890,9 +20669,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Addressbook Sources"
 #~ msgstr "Addressebokkjelder"
 
-#~ msgid "No data provided"
-#~ msgstr "Ingen data gjevne"
-
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
@@ -20094,9 +20870,6 @@ msgstr "%s (%d%% ferdig)"
 #~ msgid "Session not initialised"
 #~ msgstr "Kunne ikkje initiere Bonobo"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution feil"
-
 #~ msgid ""
 #~ "Importing %s.\n"
 #~ "Starting %s"
diff --git a/po/no.po b/po/no.po
index 1d9de81693..63549c85db 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-12 13:30+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-12 15:05+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
@@ -134,15 +134,15 @@ 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"
 
-#: addressbook/gui/component/addressbook-config.c:1242
+#: 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:1263
+#: 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:1271
+#: addressbook/gui/component/addressbook-config.c:1274
 msgid "Server did not respond with valid schema information"
 msgstr "Tjener svarte ikke med gyldig schema-informasjon"
 
@@ -158,20 +158,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:438
 #: 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:243
+#: 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:446
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: 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
@@ -262,9 +258,8 @@ msgstr "Egenskaper ..."
 #. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: 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"
@@ -282,53 +277,63 @@ msgstr "Plassering av vertikalt felt i hovedvisningen"
 msgid ""
 "The number of characters that must be typed before evolution will attempt to "
 "autocomplete"
-msgstr "Antall tegn som må skrives før Evolution forsøker automatisk fullføring"
+msgstr ""
+"Antall tegn som må skrives før Evolution forsøker automatisk fullføring"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:4
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI for sist brukt mappe i dialogen for å velge navn"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autofullføring"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Sertifikater"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Konfigurer automatisk fullføring her"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Evolution adressebok"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Evolution adressebok adressedialog"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Evolution adressebok adressevisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Evolution adressebok kortvisning"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Evolution adressebok-komponent"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Kontroll for S/MIME sertifikathåndtering for Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Konfigurasjonskontroll for mappeinnstillinger i Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 msgid "Manage your S/MIME certificates here"
 msgstr "Håndter dine S/MIME-sertifikater her"
 
@@ -851,9 +856,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:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
@@ -887,7 +892,7 @@ msgid "Company:"
 msgstr "Firma:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -895,7 +900,7 @@ msgid "Contact"
 msgstr "Kontakt"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1523
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktredigering"
 
@@ -916,7 +921,7 @@ msgid "Full _Name..."
 msgstr "Fullt _navn..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Hjemme"
@@ -961,61 +966,66 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: 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:37
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Postboks:"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Personlig informasjon"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:38
+#: addressbook/gui/contact-editor/contact-editor.glade.h:39
 msgid "Profession:"
 msgstr "Yrke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:39
+#: addressbook/gui/contact-editor/contact-editor.glade.h:40
 msgid "State/Province:"
 msgstr "Stat/provins:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:40
+#: 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:41
+#: addressbook/gui/contact-editor/contact-editor.glade.h:42
 msgid "Webcam:"
 msgstr "Nettkamera:"
 
 #. red
-#: addressbook/gui/contact-editor/contact-editor.glade.h:42
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: 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-im.c:244
 #: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Arbeid"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:43
+#: addressbook/gui/contact-editor/contact-editor.glade.h:44
 msgid "Zip/Postal Code:"
 msgstr "Zip/postnummer:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:44
+#: addressbook/gui/contact-editor/contact-editor.glade.h:45
 msgid "_Categories"
 msgstr "_Kategorier"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:45
+#: addressbook/gui/contact-editor/contact-editor.glade.h:46
 msgid "_File under:"
 msgstr "_Lagre under:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:46
+#: addressbook/gui/contact-editor/contact-editor.glade.h:47
 msgid "_Where:"
 msgstr "_Hvor:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:47
+#: addressbook/gui/contact-editor/contact-editor.glade.h:48
 msgid "item7"
 msgstr "oppføring7"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:48
+#: addressbook/gui/contact-editor/contact-editor.glade.h:49
 msgid "item8"
 msgstr "oppføring8"
 
@@ -1036,13 +1046,13 @@ msgstr ""
 "slette denne kontakten?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Adresse"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2023,65 +2033,82 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Kildebok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Er ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Skrivbare felter"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Endret"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1737
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Kategori editor ikke tilgjengelig."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1745
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Denne kontakten hører til disse kategoriene:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2592
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Vennligst velg mellom følgende alternativer"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 "Kunne ikke finne widget for felt: «%s»"
@@ -2332,143 +2359,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avansert søk"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(kart)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "kart"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Listemedlemmer"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organisasjon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Stilling"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Videokonferanse"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Telefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Faks"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "arbeid"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Weblogg"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Mobiltelefon"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "personlig"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Kommentar"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Jobbtittel"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-post"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Hjemmeside"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Suksess"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Motor opptatt"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Frakoblet lager"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 msgid "Address Book does not exist"
 msgstr "Adresseboken eksisterer ikke"
 
 #. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 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:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Tilgang nektet"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Kontakt ikke funnet"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "Kontakt-ID eksisterer allerede"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protokollen er ikke støttet"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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
@@ -2481,37 +2509,37 @@ msgid "Cancelled"
 msgstr "Avbrutt"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Kunne ikke avbryte"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Autentisering feilet"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autentisering kreves"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "Ingen slik kilde"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Annen feil"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: 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."
@@ -2519,7 +2547,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:109
+#: 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."
@@ -2527,7 +2555,7 @@ 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:114
+#: 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 "
@@ -2537,7 +2565,7 @@ msgstr ""
 "ø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:123
+#: 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."
@@ -2545,11 +2573,11 @@ 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:140
+#: 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:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2557,7 +2585,7 @@ msgid ""
 "the directory server preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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"
@@ -2565,53 +2593,53 @@ msgid ""
 "preferences for this addressbook."
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 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:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 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:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "Denne spørringen ble ikke fullført."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: 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:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Forkast"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Feil under innlegging av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Feil under innlegging av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Feil ved endring av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Feil under endring av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Feil under fjerning av liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Feil under fjerning av kontakt"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2620,7 +2648,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:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2629,49 +2657,49 @@ msgstr ""
 "%s eksisterer allerede\n"
 "Vil du overskrive den?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Overskriv"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: 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:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "kort.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "liste"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Flytt kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Kopier kontakt til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Flytt kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Kopier kontakter til"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Velg mål-adressebok"
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "Flere VCard"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard for %s"
@@ -2785,13 +2813,13 @@ msgid "Email begins with"
 msgstr "E-post begynner med"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:163
-#: calendar/gui/cal-search-bar.c:58
+#: calendar/gui/cal-search-bar.c:57
 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
+#: calendar/gui/cal-search-bar.c:50
 msgid "Any field contains"
 msgstr "Et felt inneholder"
 
@@ -2816,7 +2844,8 @@ msgstr "Adressebok"
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
 #: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Lagre som VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2893,7 +2922,7 @@ msgid "Paste"
 msgstr "Lim inn"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktiv visning"
 
@@ -2911,7 +2940,7 @@ msgstr ""
 
 #. All, unmatched, separator
 #: addressbook/gui/widgets/e-addressbook-view.c:1667
-#: calendar/gui/cal-search-bar.c:365
+#: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Enhver kategori"
 
@@ -3125,17 +3154,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 ""
 
@@ -3499,24 +3528,24 @@ msgstr "R_ediger avtale"
 msgid "_Snooze"
 msgstr "Ut_sett"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Åpne"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Se bort fra"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Se bort fra alle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Ingen beskrivelse tilgjengelig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3529,12 +3558,12 @@ msgstr ""
 "Starter %s\n"
 "Slutter %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Advarsel"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3546,7 +3575,7 @@ msgstr ""
 "å sende e-post. Evolution vil vise en vanlig dialog\n"
 "for påminnelse i stedet."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3563,7 +3592,7 @@ msgstr ""
 "\n"
 "Er du sikker på at du ønsker å kjøre dette programmet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ikke spør meg om dette programmet igjen."
 
@@ -3571,15 +3600,11 @@ msgstr "Ikke spør meg om dette programmet igjen."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Tjeneste for alarm-meldinger i Evolution kalender"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunne ikke initiere Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Kunne ikke initiere gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunne ikke opprette factory for alarm-tjenesten"
 
@@ -3688,30 +3713,34 @@ msgid "Weekday the week starts on"
 msgstr "Dag uken starter på"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Om det skal spørres etter bekreftelse ved sletting av avtaler"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Om det skal spørres etter bekreftelse når mapper tømmes"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Om fullførte oppgaver skal skjules"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Im en forvalgt påminnelse skal settes for hendelser"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Om tider skal vises i 24-timers format i stedet for å bruke AM/PM"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Om ukenummer skal vises i minikalenderen"
 
-#: calendar/gui/calendar-commands.c:116 calendar/gui/calendar-component.c:552
+#: 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
@@ -3719,7 +3748,7 @@ msgstr "Om ukenummer skal vises i minikalenderen"
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3728,40 +3757,36 @@ msgstr ""
 "Denne operasjonen vil fjerne alle hendelser innen valgt tidsrom permanent. "
 "Hvis du fortsetter vil du ikke kunne gjenopprette disse hendelsene."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Slett hendelser eldre enn"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dager"
 
-#: calendar/gui/calendar-commands.c:431 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:434 calendar/gui/calendar-component.c:507
-#: calendar/gui/e-day-view.c:1589 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
@@ -3770,7 +3795,7 @@ 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:464 calendar/gui/calendar-component.c:533
+#: 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"
@@ -3801,10 +3826,12 @@ msgstr "Ingen kalender er tilgjengelig for oppretting av hendelser og møter"
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
-msgstr "Valgt kalender er skrivebeskyttet. Hendelser kan ikke opprettes. Vennligst velg en kalender du kan skrive til."
+msgstr ""
+"Valgt kalender er skrivebeskyttet. Hendelser kan ikke opprettes. Vennligst "
+"velg en kalender du kan skrive til."
 
 #: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Kalendere"
 
@@ -3882,35 +3909,35 @@ msgstr "Ukevisning"
 msgid "Month View"
 msgstr "Månedsvisning"
 
-#: calendar/gui/cal-search-bar.c:52
+#: calendar/gui/cal-search-bar.c:51
 msgid "Summary contains"
 msgstr "Sammendrag inneholder"
 
-#: calendar/gui/cal-search-bar.c:53
+#: calendar/gui/cal-search-bar.c:52
 msgid "Description contains"
 msgstr "Beskrivelse inneholder"
 
-#: calendar/gui/cal-search-bar.c:55
+#: calendar/gui/cal-search-bar.c:54
 msgid "Comment contains"
 msgstr "Kommentar inneholder"
 
-#: calendar/gui/cal-search-bar.c:57
+#: calendar/gui/cal-search-bar.c:56
 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:366 camel/camel-vee-store.c:329
 msgid "Unmatched"
 msgstr "Ingen treff"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Feil under åpning av kalenderen"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden er ikke støttet under åpning av kalender"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Tilgang nektet ved åpning av kalender"
 
@@ -3984,7 +4011,7 @@ msgstr "ekstra ganger hver"
 msgid "hours"
 msgstr "timer"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Handling/utløser"
 
@@ -4003,14 +4030,14 @@ msgstr "Grunnleggende"
 msgid "Date/Time:"
 msgstr "Dato/klokke:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Vis en melding"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Spill en lyd"
 
+#: 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 "Påminnelser"
@@ -4531,7 +4558,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:1037
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lagre som..."
@@ -4693,27 +4720,27 @@ msgstr "Deleger til:"
 msgid "Enter Delegate"
 msgstr "Skriv inn delegat"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Avtale"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Gjeninntreffelse"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Møteplanlegging"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Møte"
 
@@ -4809,17 +4836,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/e-cal-model-tasks.c:647 composer/e-msg-composer.c:2112
-#: mail/em-account-prefs.c:427 mail/em-folder-view.c:927
-#: mail/mail-account-gui.c:1559 mail/mail-account-gui.c:2038
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4845,8 +4867,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2619 mail/em-folder-view.c:918
+#: 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
 #: 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
@@ -4917,7 +4939,7 @@ msgid "_Change Organizer"
 msgstr "En_dre organisator"
 
 #: calendar/gui/dialogs/meeting-page.glade.h:6
-#: calendar/gui/e-meeting-time-sel.c:419
+#: calendar/gui/e-meeting-time-sel.c:417
 msgid "_Invite Others..."
 msgstr "_Inviter andre..."
 
@@ -5119,8 +5141,9 @@ msgid "Save Event"
 msgstr "Lagre hendelse"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Velg kilde"
+#, fuzzy
+msgid "Select destination"
+msgstr "Velg mål %s"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5165,7 +5188,7 @@ msgstr "Fullfø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:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Høy"
 
@@ -5179,14 +5202,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:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 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:927
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normal"
 
@@ -5387,12 +5410,12 @@ msgstr "%s ved %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s for en ukjent utløsertype"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2331
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Klikk for å åpne %s"
 
-#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:750
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
 msgid "Untitled"
 msgstr "Uten navn"
 
@@ -5483,7 +5506,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"
 
@@ -5496,8 +5519,8 @@ 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:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:893 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Åpne"
 
@@ -5506,41 +5529,42 @@ 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:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:895 mail/em-popup.c:692 mail/em-popup.c:808
+#: 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
 #: 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:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: 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:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2612 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lim inn"
 
@@ -5604,67 +5628,67 @@ msgstr "Sammendrag"
 msgid "Task sort"
 msgstr "Oppgavesortering"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Ny _avtale..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Ny avtale som varer h_ele dagen"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nytt møte"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Ny oppgave"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Velg i _dag"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Velg dato..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publiser ledig/opptatt-informasjon"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Kop_ier til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytt til kalender..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Sett opp møte..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Videresend som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Slett denne _hendelsen"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Slett _alle hendelser"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Gå _til i dag"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Gå til dato..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Inn_stillinger..."
 
@@ -5682,7 +5706,7 @@ msgstr "Startdato"
 #: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
+#: 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
@@ -5691,8 +5715,9 @@ msgstr "Startdato"
 #: 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:1046
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Ukjent"
 
@@ -5742,20 +5767,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"
@@ -5773,34 +5790,27 @@ msgstr ""
 "%s"
 
 #. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
+#: calendar/gui/e-day-view.c:817 calendar/gui/e-week-view.c:592
 #: calendar/gui/print.c:838
 msgid "am"
 msgstr "am"
 
 #. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
+#: calendar/gui/e-day-view.c:820 calendar/gui/e-week-view.c:595
 #: calendar/gui/print.c:840
 msgid "pm"
 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:1572 calendar/gui/e-day-view-top-item.c:690
+#: 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:1605 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"
@@ -6312,7 +6322,7 @@ msgid "Needs Action"
 msgstr "Trenger handling"
 
 #: calendar/gui/e-meeting-list-view.c:182 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-store.c:206 calendar/gui/e-meeting-time-sel.c:398
 msgid "Tentative"
 msgstr "Tentativ"
 
@@ -6325,80 +6335,76 @@ 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:440
 msgid "_Options"
 msgstr "_Alternativer"
 
-#: calendar/gui/e-meeting-time-sel.c:459
+#: calendar/gui/e-meeting-time-sel.c:457
 msgid "Show _Only Working Hours"
 msgstr "Vis k_un arbeidstid"
 
-#: calendar/gui/e-meeting-time-sel.c:469
+#: calendar/gui/e-meeting-time-sel.c:467
 msgid "Show _Zoomed Out"
 msgstr "Vis _zoomet ut"
 
-#: calendar/gui/e-meeting-time-sel.c:484
+#: calendar/gui/e-meeting-time-sel.c:482
 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
+#: calendar/gui/e-meeting-time-sel.c:547
 msgid "_All People and Resources"
 msgstr "_Alle mennesker og ressurser"
 
-#: calendar/gui/e-meeting-time-sel.c:558
+#: calendar/gui/e-meeting-time-sel.c:556
 msgid "All _People and One Resource"
 msgstr "Alle _mennesker og en ressurs"
 
-#: calendar/gui/e-meeting-time-sel.c:567
+#: calendar/gui/e-meeting-time-sel.c:565
 msgid "_Required People"
 msgstr "_Obligatoriske mennesker"
 
-#: calendar/gui/e-meeting-time-sel.c:576
+#: calendar/gui/e-meeting-time-sel.c:574
 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"
@@ -6406,10 +6412,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"
@@ -6420,7 +6422,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:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6429,19 +6431,19 @@ msgstr ""
 "Feil på «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:613 calendar/gui/gnome-cal.c:2057
+#: calendar/gui/e-tasks.c:612 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:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Åpner oppgaver på %s"
 
-#: calendar/gui/e-tasks.c:710
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6450,24 +6452,24 @@ msgstr ""
 "Feil under åpning av «%s»:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:731
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Laster oppgaver"
 
-#: calendar/gui/e-tasks.c:835
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Fullfører oppgaver..."
 
-#: calendar/gui/e-tasks.c:858
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Sletter valgte objekter..."
 
-#: calendar/gui/e-tasks.c:885
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Tømmer"
 
-#: calendar/gui/e-tasks.c:961
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
@@ -6500,37 +6502,55 @@ msgid "Purging"
 msgstr "Sletter"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Konfigurer din tidssone, kalender og oppgaveliste her "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Evolution kalender og oppgaver"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Konfigurasjonskontroll for Evolution kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visning for møteplanlegging i Evolution kalender"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Redigering av kalender/oppgaver for Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Evolution kalenderkomponent"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Evolution's Tasks component"
 msgstr "Oppgavekomponent for Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendere"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Oppgaver"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6910,7 +6930,7 @@ msgid "Contacts: "
 msgstr "Kontakter: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Forhåndsvisning av utskrift"
 
@@ -6939,7 +6959,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d oppgave"
 msgstr[1] "%d oppgaver"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:496
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -6963,7 +6983,9 @@ msgstr "Ingen kalender tilgjengelig for opppretting av oppgaver"
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
-msgstr "Valgt oppgaveliste er skrivebeskyttet. Hendelser kan ikke opprettes. Vennligst velg en oppgaveliste du kan skrive til."
+msgstr ""
+"Valgt oppgaveliste er skrivebeskyttet. Hendelser kan ikke opprettes. "
+"Vennligst velg en oppgaveliste du kan skrive til."
 
 #: calendar/gui/tasks-component.c:804
 msgid "New task"
@@ -7009,7 +7031,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"
 
@@ -8653,7 +8675,7 @@ msgstr "Kopier mappeinnhold lokalt for frakoblet operasjon"
 msgid "Downloading new messages for offline mode"
 msgstr "Laster ned nye meldinger for frakoblet modus"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Forbereder mappe «%s» på frakobling"
@@ -8777,7 +8799,7 @@ msgstr "Lærer om søppel og/eller gyldige meldinger"
 msgid "Filtering new message(s)"
 msgstr "Filtrerer ny(e) melding(er)"
 
-#: camel/camel-folder-search.c:348
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
 #, c-format
 msgid ""
 "Cannot parse search expression: %s:\n"
@@ -8786,7 +8808,7 @@ msgstr ""
 "Kan ikke tolke uttrykket: %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"
@@ -8795,16 +8817,34 @@ msgstr ""
 "Feil under kjøring av søkeuttrykket %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 "(treff-alle) krever et enkelt bolsk resultat"
 
-#: camel/camel-folder-search.c:650
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(treff-alle) krever et enkelt bolsk resultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(treff-alle) krever et enkelt bolsk resultat"
+
+#: camel/camel-folder-search.c:880
 #, c-format
 msgid "Performing query on unknown header: %s"
 msgstr "Utfører spørring på ukjent header: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8815,15 +8855,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Feil under tolking av hint for gpg brukerid."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Kunne ikke tolke forespørsel på gpg-passordfrase."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8832,27 +8872,27 @@ msgstr ""
 "Du trenger et passord for å låse opp nøkkelen for\n"
 "bruker «%s»"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbrutt."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Feil ved åpning av hemmelig nøkkel: 3 ugyldige passord oppgitt."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Uventet svar fra GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Kan ikke kryptere: Ingen gyldige mottakere spesifisert."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8863,60 +8903,60 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Feil under bruk av GPG på %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Kan ikke generere signeringsdata: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Feil ved kjøring av gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Feil ved kjøring av gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Dette er en digitalt signert meldingsdel"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Kunne ikke verifisere meldingens signatur: Ugyldig meldingsformat"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kunne ikke verifisere meldingens signatur: kunne ikke opprette midlertidig "
 "fil: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunne ikke generere krypteringsdata: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Dette er en digitalt kryptert meldingsdel"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Kryptert innhold"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Kunne ikke lese meldingsinnhold"
 
@@ -9204,7 +9244,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:1207
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Ugyldig svar på autentisering fra tjener."
 
@@ -9418,7 +9458,7 @@ msgstr "Kan ikke opprette kontekst for koding"
 msgid "Failed to add data to CMS encoder"
 msgstr "Kunne ikke legge til i lokal Sendt-mappe: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Kunne ikke kode data"
 
@@ -9481,93 +9521,93 @@ msgstr "Kan ikke opprette mappe: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Import av sertifikat feilet"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Gyldig signatur"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Signeringspart: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Dekoder feilet"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Kan ikke finne sertifikat for «%s»"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Kan ikke opprette CMS-melding"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Kan ikke opprette kontekst for koding"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Kunne ikke sende brukernavn til tjener"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Dekoder feilet, feil %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "S/MIME dekryptering: Fant ikke kryptert innhold"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "importering av nøkler: ikke implementert"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "eksportering av nøkler: ikke implementert"
 
@@ -9584,16 +9624,26 @@ msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan ikke opprette mappe: Ugyldig operasjon på dette lageret"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Kan ikke opprette mappe «%s»: mappen eksisterer"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan ikke slette mappe: %s: Ugyldig operasjon"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Papirkurv"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Søppel"
@@ -9819,12 +9869,12 @@ msgstr "Kunne ikke tolke URL «%s»"
 msgid "Error storing `%s': %s"
 msgstr "Feil ved lagring av «%s»: %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ingen slik melding %s i %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 
@@ -9833,11 +9883,6 @@ msgstr "Kan ikke kopiere eller flytte meldinger inn i en virtuell mappe"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Kan ikke slette mappe: %s: Ingen slik mappe"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kan ikke endre navn på mappe: %s: Ugyldig operasjon"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10046,21 +10091,21 @@ msgstr ""
 "passord."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, 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:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: 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/pop3/camel-pop3-store.c:175
@@ -10071,15 +10116,15 @@ 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:548
+#: 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:563
-#: camel/providers/imap/camel-imap-store.c:810
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10095,8 +10140,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:644
-#: camel/providers/imap/camel-imap-store.c:675
+#: 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 "Kunne ikke koble til IMAP-tjener %s i sikker modus: %s"
@@ -10133,9 +10178,11 @@ msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
 msgstr "Finner ikke mappe: %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:782
-#, fuzzy, c-format
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, c-format
 msgid ""
-"The folder name \"%s\" is invalid because it containes the character \"%c\""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
 msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
 
 #: camel/providers/imap4/camel-imap4-store.c:826
@@ -10209,12 +10256,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:3129
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operasjon avbrutt"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3132
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Tjener koblet fra uventet: %s"
@@ -10263,21 +10310,21 @@ msgstr "Kan ikke opprette katalog %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunne ikke laste sammendrag for %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen ble ødelagt og laget på nytt på tjeneren."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Søker etter endrede meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:1961
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan ikke hente melding: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: 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
@@ -10293,25 +10340,25 @@ msgstr ""
 "Kan ikke hente melding: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:1998
+#: 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
 msgid "No such message"
 msgstr "Ingen slik melding"
 
-#: camel/providers/imap/camel-imap-folder.c:2040
-#: camel/providers/imap/camel-imap-folder.c:2642
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Denne meldingen er ikke tilgjengelig"
 
-#: camel/providers/imap/camel-imap-folder.c:2306
-#: camel/providers/imap/camel-imap-folder.c:2376
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Henter sammendragsinformasjon for nye meldinger"
 
-#: camel/providers/imap/camel-imap-folder.c:2680
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Kunne ikke finne meldingskropp i FETCH-svar."
 
@@ -10369,43 +10416,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:645
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:676
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-forhandling feilet"
 
-#: camel/providers/imap/camel-imap-store.c:813
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1237
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1247
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1284
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Du skrev ikke inn et passord."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10416,25 +10463,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1800
-#: camel/providers/imap/camel-imap-store.c:1990
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Mappen %s eksisterer ikke"
 
-#: camel/providers/imap/camel-imap-store.c:1818
-#: camel/providers/imap/camel-imap-store.c:2196
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
-
-#: camel/providers/imap/camel-imap-store.c:1876
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Opphavsmappen tillates ikke å ha undermapper"
 
-#: camel/providers/imap/camel-imap-store.c:1931
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10442,7 +10482,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:2207
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Ukjent opphavsmappe: %s"
@@ -10549,58 +10589,58 @@ msgstr ""
 "For lesing og lagring av lokal e-post i standard eksterne mbox-filer.\n"
 "Kan også  brukes til å lagre et tre av mapper i Elm, Pine eller Mutt-stil."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagerrot %s er ikke en absolutt sti"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagerrot %s er ikke en vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Finner ikke mappe: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokalt lager har ikke en innboks"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal e-post-fil %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunne ikke endre navn på mappe %s til %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunne ikke endre navn på «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kunne ikke slette sammendragsfil for mappe «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kunne ikke slette indeksfil for mappe «%s»: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10666,7 +10706,7 @@ msgstr "Kunne ikke slette mappe «%s»: %s"
 msgid "not a maildir directory"
 msgstr "ikke en maildir katalog"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10997,7 +11037,7 @@ 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:258
+#: 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
@@ -11006,8 +11046,8 @@ msgid "User cancelled"
 msgstr "Bruker avbrøt"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11016,46 +11056,46 @@ msgstr "Bruker avbrøt"
 msgid "Cannot get message %s: %s"
 msgstr "Kan ikke hente melding %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Intern feil: uid i ugyldig format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan ikke kopiere meldinger fra en NNTP-mappe!"
 
@@ -11681,7 +11721,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "vedlegg"
 
@@ -11729,13 +11769,17 @@ msgstr "Foreslå automatisk visning av vedlegg"
 #, fuzzy
 msgid ""
 "Cannot sign outgoing message: No signing certificate set for this account"
-msgstr "Kan ikke signere utgående melding: Ingen sertifikat for signering satt for denne kontoen"
+msgstr ""
+"Kan ikke signere utgående melding: Ingen sertifikat for signering satt for "
+"denne kontoen"
 
 #: composer/e-msg-composer.c:711
 msgid ""
 "Cannot encrypt outgoing message: No encryption certificate set for this "
 "account"
-msgstr "Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for denne kontoen"
+msgstr ""
+"Kan ikke kryptere utgående melding: Sertifikat for kryptering ikke satt for "
+"denne kontoen"
 
 #: composer/e-msg-composer.c:1283
 msgid "Could not open file"
@@ -12174,16 +12218,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"
@@ -12235,31 +12275,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"
@@ -12356,7 +12388,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."
@@ -12391,7 +12422,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 "Mangler navn."
@@ -12438,7 +12468,7 @@ msgstr "Velg en fil"
 msgid "<b>Then</b>"
 msgstr "<b>Så</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
 #: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Velg mappe"
@@ -12552,31 +12582,51 @@ msgstr "Senere"
 msgid "Test"
 msgstr "Test"
 
-#: filter/filter-rule.c:746
+#: filter/filter-rule.c:790
 msgid "Rule name:"
 msgstr "Regelnavn:"
 
-#: filter/filter-rule.c:773
+#: filter/filter-rule.c:817
 msgid "<b>If</b>"
 msgstr "<b>Hvis</b> "
 
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Utfør handlinger"
-
-#: filter/filter-rule.c:808
+#: filter/filter-rule.c:854
 msgid "if all criteria are met"
 msgstr "hvis alle kriterier er møtt"
 
-#: filter/filter-rule.c:813
+#: filter/filter-rule.c:854
 msgid "if any criteria are met"
 msgstr "hvis ethvert kriterie er møtt"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Utfør handlinger"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegert"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Mottakere"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Svar til %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Inkluder:"
+
+#: filter/filter-rule.c:974
 msgid "incoming"
 msgstr "innkommende"
 
-#: filter/filter-rule.c:904
+#: filter/filter-rule.c:974
 msgid "outgoing"
 msgstr "utgående"
 
@@ -12709,7 +12759,7 @@ msgstr "er ikke merket"
 msgid "Junk Test"
 msgstr "Søppeltest"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:926
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12815,8 +12865,8 @@ msgstr "starter med"
 msgid "Stop Processing"
 msgstr "Stopp behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1533
-#: mail/em-format-quote.c:301 mail/em-mailer-prefs.c:89
+#: 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"
@@ -12878,7 +12928,11 @@ msgstr "Emne inneholder ikke"
 msgid "Virtual _Folders"
 msgstr "Virtuelle _mapper"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Legg til"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder-kilde"
 
@@ -12896,7 +12950,7 @@ msgid "Protocol"
 msgstr "Protokoll"
 
 #: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
-#: mail/mail-config.c:1061
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Uten navn"
 
@@ -12912,17 +12966,17 @@ msgstr "Legg til signaturskript"
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-composer-utils.c:883
+#: mail/em-composer-utils.c:888
 msgid "-------- Forwarded Message --------"
 msgstr "---------Videresendt melding-------"
 
-#: mail/em-composer-utils.c:1494
+#: mail/em-composer-utils.c:1499
 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:1504
+#: mail/em-composer-utils.c:1509
 msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
 msgstr "%a, %d.%m.%Y kl. %H.%M %%+05d, skrev %%s:"
 
@@ -12960,94 +13014,119 @@ 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:2344
-#: mail/mail-component.c:696
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Spesifiser hvor mappen skal opprettes:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Opprett mappe"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mappe_navn:"
 
-#: mail/em-folder-tree.c:937
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Flytter mappe %s"
 
-#: mail/em-folder-tree.c:939
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopierer mappe %s"
 
-#: mail/em-folder-tree.c:946
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flytter meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:948
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierer meldinger til mappe %s"
 
-#: mail/em-folder-tree.c:964
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Kan ikke slippe melding(er) toppnivå for lageret"
 
-#: mail/em-folder-tree.c:2118 mail/em-folder-tree.c:2131
-#: mail/em-folder-view.c:797 mail/em-folder-view.c:811
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Flytt"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Avbryt oppgave"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Velg mappe"
 
-#: mail/em-folder-tree.c:2158
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopier"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Oppretter mappe «%s»"
 
-#: mail/em-folder-tree.c:2344 mail/mail-component.c:696
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Opprett mappe"
 
-#: mail/em-folder-tree.c:2536
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Endre navn på mappe «%s» til:"
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Endre navn på mappe"
 
-#: mail/em-folder-tree.c:2607 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Vis"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Åpne i _nytt vindu"
 
-#: mail/em-folder-tree.c:2613
-msgid "_Move"
-msgstr "_Flytt"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Ny mappe..."
 
-#: mail/em-folder-tree.c:2620
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "End_re navn"
 
-#: mail/em-folder-tree.c:2623 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "Egenska_per..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "VFoldere"
 
@@ -13065,303 +13144,305 @@ msgstr "Innboks"
 msgid "Loading..."
 msgstr "Laster..."
 
-#: mail/em-folder-view.c:413 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: 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:504
-#: mail/mail-component.c:547
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 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:894 mail/em-popup.c:691
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "R_ediger som ny melding..."
 
-#: mail/em-folder-view.c:896
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "S_kriv ut"
 
-#: mail/em-folder-view.c:899 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-folder-view.c:900 mail/em-popup.c:812
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svar til _listen"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:813
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svar til _alle"
 
-#: mail/em-folder-view.c:902 mail/em-popup.c:815
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Videresend"
 
-#: mail/em-folder-view.c:905
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Føl_g opp..."
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Mer_k som fullført"
 
-#: mail/em-folder-view.c:907
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Fj_ern flagg"
 
-#: mail/em-folder-view.c:910 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 "Mer_k som lest"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Merk som _ulest"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Merk som v_iktig"
 
-#: mail/em-folder-view.c:913
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Merk som uviktig"
 
-#: mail/em-folder-view.c:914 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 "Merk som _søppel"
 
-#: mail/em-folder-view.c:915 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 "Merk som _ikke søppel"
 
-#: mail/em-folder-view.c:919
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "A_ngre slett"
 
-#: mail/em-folder-view.c:922
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytt til mappe..."
 
-#: mail/em-folder-view.c:923 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "K_opier til mappe..."
 
-#: mail/em-folder-view.c:931
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Legg til avsender i adresse_bok"
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "_Påfør filtre"
 
-#: mail/em-folder-view.c:935
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltrer søppel"
 
-#: mail/em-folder-view.c:938
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Oppre_tt regel fra melding"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder på e_mne"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder for se_nder"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder for mottake_re"
 
-#: mail/em-folder-view.c:942
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder på e-post_liste"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrer på em_ne"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrer på sen_der"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrer på motta_ker"
 
-#: mail/em-folder-view.c:949
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrer på e-_postliste"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1717 mail/em-folder-view.c:1757
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Forvalgt"
 
-#: mail/em-folder-view.c:1807
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Skriv ut melding"
 
-#: mail/em-folder-view.c:2072
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Kopier lokasjon for lenke"
 
-#: mail/em-folder-view.c:2326
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Klikk for å sende melding til %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:84 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 "Fra"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:85
+#: 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 "Svar-til"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:86 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 "Til"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:87
+#: 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:746 mail/em-format-html.c:1427 mail/em-format-quote.c:191
-#: mail/em-mailer-prefs.c:88
+#: 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:748 mail/em-format-html.c:1577 mail/em-format-quote.c:315
-#: mail/em-mailer-prefs.c:90 mail/message-list.etspec.h:2
+#: 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:749 mail/em-format-html.c:1598 mail/em-mailer-prefs.c:91
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Nyhetsgrupper"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "%s-vedlegg"
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Kunne ikke lese S/MIME-melding: Ukjent feil"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Krypteringstype for multipart/encrypted som ikke er støttet"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Kunne ikke lese MIME-melding. Viser ren meldingstekst."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Ustøttet signaturformat"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Feil under verifisering av signatur"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Ukjent feil under verifisering av signatur"
 
-#: mail/em-format-html.c:453 mail/em-format-html.c:455
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Henter «%s»"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Usignert"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Gyldig signatur"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:648
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Ugyldig signatur"
 
-#: mail/em-format-html.c:563 mail/em-format-html-display.c:649
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
 msgstr "Gyldig signatur. Kan ikke verifisere avsender"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Ukryptert"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Kryptert, svak"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:658
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Kryptert, sterk"
 
-#: mail/em-format-html.c:834
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Feilutformet del for ekstern kropp."
 
-#: mail/em-format-html.c:864
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Peker til FTP-tjener (%s)"
 
-#: mail/em-format-html.c:875
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Peker til lokal fil (%s) gyldig på nettsted «%s»"
 
-#: mail/em-format-html.c:877
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Peker til lokal fil (%s)"
 
-#: mail/em-format-html.c:898
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Peker til eksterne data (%s)"
 
-#: mail/em-format-html.c:909
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Peker til ukjente eksterne data («%s»-type)"
 
-#: mail/em-format-html.c:1151
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formatterer melding"
 
 #. pseudo-header
-#: mail/em-format-html.c:1537 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:932
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "E-postprogram"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1564
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1567
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13371,13 +13452,15 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Treff: %d"
 
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
-msgstr "Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er autentisk."
+msgstr ""
+"Denne meldingen er ikke signert. Du har ingen garanti for at meldingen er "
+"autentisk."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13386,7 +13469,7 @@ msgstr ""
 "Denne meldingen er signert og gyldig. Avsender av denne meldingen er høyst "
 "sannsynlig den den påstår at den er."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13394,7 +13477,11 @@ msgstr ""
 "Signaturen for denne meldingen kan ikke verifiseres. Den kan være endret "
 "under overføring."
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr "Gyldig signatur. Kan ikke verifisere avsender"
+
+#: 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."
@@ -13402,7 +13489,7 @@ msgstr ""
 "Denne meldingen er signert med en gyldig signatur, men avsender av meldingen "
 "kan ikke verifiseres."
 
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13410,7 +13497,7 @@ msgstr ""
 "Denne meldingen er ikke kryptert. Innholdet kan ses under overføring over "
 "Internett."
 
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13420,7 +13507,7 @@ msgstr ""
 "vanskelig, men ikke umulig for en utenforstående å se innholdet i denne "
 "meldingen på noenlunde kort tid."
 
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13428,7 +13515,7 @@ msgstr ""
 "Denne meldingen er kryptert. Det vil være vanskelig for en utenforstående å "
 "se innholdet i denne meldingen."
 
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13437,56 +13524,56 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Vis sertifikat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Dette sertifikatet kan ikke vises"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ferdigstilt på %d %B, %Y, %H.%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Utgått:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "til %d %B %Y %H.%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Vis i meldingsteksten"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Skjul"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Side %d av %d"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (integrert)"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Hver gang"
 
-#: mail/em-mailer-prefs.c:103
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "En gang om dagen"
 
-#: mail/em-mailer-prefs.c:104
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "En gang i uken"
 
-#: mail/em-mailer-prefs.c:105
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "En gang i måneden"
 
@@ -13550,36 +13637,36 @@ msgid ""
 "xmldb' does not exist or is corrupt."
 msgstr ""
 
-#: mail/em-popup.c:701
+#: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Lagre som..."
 
-#: mail/em-popup.c:719
+#: mail/em-popup.c:717
 #, c-format
 msgid "untitled_image.%s"
 msgstr "bilde_uten_navn.%s"
 
-#: mail/em-popup.c:809
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Sett som _bakgrunn"
 
-#: mail/em-popup.c:811
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "Sva_r til avsender"
 
-#: mail/em-popup.c:860
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Åpne lenke i nettleser"
 
-#: mail/em-popup.c:861
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Se_nd melding til..."
 
-#: mail/em-popup.c:862
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Legg til i _adressebok"
 
-#: mail/em-popup.c:968
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Åpne i %s..."
@@ -13606,28 +13693,28 @@ msgstr "Vennligst velg en tjener."
 msgid "No server has been selected"
 msgstr "Ingen tjener er valgt"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ikke vis denne meldingen igjen."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "melding"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Lagre melding..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Legg til adresse"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:989
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Meldinger fra %s"
@@ -14094,55 +14181,64 @@ msgid "spamd port"
 msgstr "port for spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Brukervalg for redigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Konfigurer brukervalg for e-post, inkludert sikkerhet og meldingsvisning her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr "Konfigurer stavekontroll, signaturer og meldingskomposisjon her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Konfigurer e-post-kontoer her"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postkonti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Evolution e-postkomponent"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Evolution e-postredigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Konfigurasjonskontroll for Evolution e-postredigering"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Brukervalg-kontroll for Evolution e-post"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "E-post-konti"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Brukervalg for e-post"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "E-post:"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution importerer gammel e-post fra Elm"
@@ -14374,74 +14470,74 @@ msgstr "%s e-postliste"
 msgid "Add Filter Rule"
 msgstr "Legg til filterregel"
 
-#: mail/mail-component.c:457
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d slettet"
 
-#: mail/mail-component.c:459
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d søppel"
 
-#: mail/mail-component.c:482
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d skisser"
 
-#: mail/mail-component.c:484
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d sendt"
 
-#: mail/mail-component.c:486
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d usendt"
 
-#: mail/mail-component.c:490
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d ulest"
 
-#: mail/mail-component.c:648
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Ny e-post melding"
 
-#: mail/mail-component.c:649
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Send _melding"
 
-#: mail/mail-component.c:650
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Skriv en ny e-postmelding"
 
-#: mail/mail-component.c:656
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Ny e-postmappe"
 
-#: mail/mail-component.c:657
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_E-postmappe"
 
-#: mail/mail-component.c:658
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Opprett en ny e-postmappe"
 
-#: mail/mail-component.c:758
+#: mail/mail-component.c:795
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Feil under oppgradering av innstillinger eller mapper for e-post."
 
-#: mail/mail-config.c:911
+#: mail/mail-config.c:895
 msgid "Checking Service"
 msgstr "Sjekker tjeneste"
 
-#: mail/mail-config.c:989 mail/mail-config.c:993
+#: mail/mail-config.c:973 mail/mail-config.c:977
 msgid "Connecting to server..."
 msgstr "Kobler til tjener..."
 
@@ -15114,7 +15210,9 @@ msgstr "Ugyldig autentisering"
 msgid ""
 "This server does not support this type of authentication and may not support "
 "authentication at all."
-msgstr "Tjener støtter ikke denne typen autentisering. Det kan hende den ikke støtter autentisering i det hele tatt."
+msgstr ""
+"Tjener støtter ikke denne typen autentisering. Det kan hende den ikke "
+"støtter autentisering i det hele tatt."
 
 #. mail:camel-service-auth-failed primary
 #: mail/mail-errors.xml.h:6
@@ -15164,7 +15262,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?"
@@ -15232,7 +15329,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 ""
@@ -15246,7 +15342,9 @@ msgstr "T_øm"
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
-msgstr "Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper permanent?"
+msgstr ""
+"Er du sikker på at du vil fjerne alle slettede meldinger fra alle mapper "
+"permanent?"
 
 #: mail/mail-errors.xml.h:51
 msgid "_Empty Trash"
@@ -15299,13 +15397,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
@@ -15334,8 +15425,6 @@ 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}\"."
@@ -15352,9 +15441,6 @@ 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}\"."
@@ -15381,7 +15467,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 "
@@ -15413,13 +15498,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."
@@ -15432,28 +15515,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 "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
 #, fuzzy
 msgid "Cannot open source \"{2}\"."
 msgstr "Kunne ikke åpne kilde"
 
 #. 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 ikke åpne melding"
 
 #. 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}\"."
@@ -15471,7 +15550,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 ""
@@ -15629,7 +15707,7 @@ msgstr "_Overskriv"
 msgid "_Append"
 msgstr "_Legg til"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinger %s"
@@ -15935,84 +16013,89 @@ msgstr "Ugyldig mappe: «%s»"
 msgid "Setting up vfolder: %s"
 msgstr "Setter opp VFolder: %s"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Oppdaterer vfoldere for URI: %s"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Oppdaterer vfoldere for URI: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMapper"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Rediger VFolder"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Ny VFolder"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Ulest"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Lest"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Besvart"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Flere uleste meldinger"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Flere meldinger"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lavest"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lavere"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Høyere"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Høyest"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "I dag %l:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "I går %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3124
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Genererer meldingsliste"
 
@@ -16391,7 +16474,8 @@ msgstr "«.» og «..» er reserverte mappenavn."
 
 #: shell/e-shell-window.c:336
 msgid "Evolution is currently online.  Click on this button to work offline."
-msgstr "Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
+msgstr ""
+"Evolution er koblet til. Klikk på denne knappen for å arbeide frakoblet."
 
 #: shell/e-shell-window.c:343
 msgid "Evolution is in the process of going offline."
@@ -16399,39 +16483,45 @@ msgstr "Evolution er i ferd med å koble fra."
 
 #: shell/e-shell-window.c:349
 msgid "Evolution is currently offline.  Click on this button to work online."
-msgstr "Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+msgstr ""
+"Evolution er frakoblet. Klikk på denne knappen for å arbeide tilkoblet."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Send til %s"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Feil under kjøring av %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy er ikke installert."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy kunne ikke kjøres."
 
-#: shell/e-shell-window-commands.c:170
+#: shell/e-shell-window-commands.c:171
 msgid "About Evolution"
 msgstr "Om Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Ar_beid tilkoblet"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Ar_beid frakoblet"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Arbeid frakoblet"
 
@@ -16653,7 +16743,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importere data fra følgende filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16688,7 +16778,7 @@ msgstr ""
 "Vi håper at du nyter resultatene av vårt harde arbeid, og vi venter i\n"
 "spenning på at du tilbyr din hjelp!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16696,48 +16786,39 @@ msgstr ""
 "Takk\n"
 "Evolution utviklerene\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Ikke gi beskjed igjen"
 
-#: shell/main.c:391
-msgid "Cannot register the Evolution shell."
-msgstr "Kan ikke registrere skallet for Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Kan ikke initiere Evolution-skallet: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Aktiver oppgitt komponent ved oppstart av Evolution"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Start i frakoblet modus"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Start i tilkoblet modus"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Steng ned alle komponenter i Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvungen ommigrering fra Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Send feilsøkingsutskrift for alle komponentene til en fil."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16781,6 +16862,36 @@ msgstr ""
 msgid "Continue"
 msgstr "Fortsett"
 
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Kan ikke registrere skallet for Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution kontoassistent"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17371,7 +17482,8 @@ msgid "_Preview Pane"
 msgstr "_Forhåndsvisningsvindu"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Lagre _som VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18074,7 +18186,8 @@ msgid "Open the selected message in a new window"
 msgstr "Åpne valgt melding i et nytt vindu"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Åpne valgt melding i redigeringsvinduet for å sende den på nytt"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18189,58 +18302,46 @@ msgstr "VFolder på e_mne..."
 msgid "_Attached"
 msgstr "Vedl_agt"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopier til mappe"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "La_g filter fra melding"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gå til"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Større"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Meldingsvisning"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Flytt til mappe"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Neste melding"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Åpne melding"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Forrige melding"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Sitert"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "S_end på nytt..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Ve_rktøy"
@@ -18638,6 +18739,11 @@ msgstr "_Hurtigreferanse"
 msgid "_Send / Receive"
 msgstr "_Send / motta"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Nytt _vindu"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Etter _firma"
@@ -18702,10 +18808,6 @@ msgstr "Med ferdig-dato"
 msgid "With _Status"
 msgstr "Med _status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Oppgaver"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18752,12 +18854,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"
 
@@ -18861,26 +18963,26 @@ msgstr "Andre..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 msgid "Evolution Error"
 msgstr "Evolution feil"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Evolution advarsel"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 msgid "Evolution Information"
 msgstr "Evolution informasjon"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 msgid "Evolution Query"
 msgstr "Evolution spørring"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:389
+#: widgets/misc/e-error.c:410
 #, fuzzy, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19027,6 +19129,27 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% fullført)"
 
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Kunne ikke initiere gnome-vfs"
+
+#~ msgid "Display a message"
+#~ msgstr "Vis en melding"
+
+#~ msgid "Select source"
+#~ msgstr "Velg kilde"
+
+#, fuzzy
+#~ msgid ""
+#~ "The folder name \"%s\" is invalid because it containes the character \"%c"
+#~ "\""
+#~ msgstr "Mappenavn «%s» er ugyldig fordi det inneholder tegnet «%c»"
+
+#~ msgid "Cannot initialize the Evolution shell: %s"
+#~ msgstr "Kan ikke initiere Evolution-skallet: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "S_end på nytt..."
+
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "UID for kontaktkilden som visningen skal vise"
 
@@ -19051,9 +19174,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "The type of view to show"
 #~ msgstr "Type visning som skal brukes"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Velg mål %s"
-
 #~ msgid "calendar"
 #~ msgstr "kalender"
 
@@ -19093,9 +19213,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "Evolution Mail folder viewer"
 #~ msgstr "Komponent for mappevisning for Evolution e-post"
 
-#~ msgid "Replies to %s"
-#~ msgstr "Svar til %s"
-
 #~ msgid "URI of the mail source that the view will display"
 #~ msgstr "URI for e-postkilden som visningen skal vise"
 
@@ -19238,9 +19355,6 @@ msgstr "%s (%d%% fullført)"
 #~ msgid "S_pouse:"
 #~ msgstr "E_ktefelle:"
 
-#~ msgid "_Add"
-#~ msgstr "_Legg til"
-
 #~ msgid "_Business:"
 #~ msgstr "Ar_beid:"
 
diff --git a/po/pl.po b/po/pl.po
index 1b508511cb..ff87ed6553 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -11,7 +11,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -28,6 +28,15 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "książka adresowa evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "nagłówek kontaktu: "
+
+# FIXME - albo jakoś inaczej?
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "minikarta evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "bieżący folder książki adresowej "
@@ -48,15 +57,6 @@ msgstr " kart"
 msgid " card"
 msgstr " kartę"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "nagłówek kontaktu: "
-
-# FIXME - albo jakoś inaczej?
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "minikarta evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Domyślny adres do synchronizacji:"
@@ -71,63 +71,20 @@ msgstr "Nie można wczytać książki adresowej"
 msgid "Could not read pilot's Address application block"
 msgstr "Nie można odczytać bloku aplikacji adresowej Pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Autouzupełnianie"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certyfikaty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Konfiguracja automatycznego uzupełniania"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Książka adresowa Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Wyskakujące okno zawierające adres z książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Przeglądarka adresów książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Przeglądarka kart książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Komponent książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Przeglądarka folderów książki adresowej Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Sterowanie zarządzaniem certyfikatami S/Mime Evolution"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimowy dostęp do serwera LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrola konfiguracji ustawień folderu Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Nie można dokonać uwierzytelnienia.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Zarządzanie certyfikatami S/Mime"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -165,42 +122,46 @@ msgstr "_Grupa kontaktów"
 msgid "Create a new contacts group"
 msgstr "Tworzy nową grupę kontaktów"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
+#: 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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migracja..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrowanie \"%s\":"
@@ -208,8 +169,8 @@ msgstr "Migrowanie \"%s\":"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Na tym komputerze"
 
@@ -217,7 +178,7 @@ msgstr "Na tym komputerze"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Osobiste"
@@ -278,20 +239,42 @@ msgstr ""
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował dane "
 "synchronizacji Pilota..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimowy dostęp do serwera LDAP"
+#: addressbook/gui/component/addressbook-view.c:674
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Kalendarz \"%s\" zostanie usunięty. Czy na pewno chcesz kontynuować?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Nie można dokonać uwierzytelnienia.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Książka adresowa"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sWprowadź hasło dla %s (użytkownik %s)"
+#: 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
+#: 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
+msgid "Properties..."
+msgstr "Właściwości..."
+
+#. 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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -313,6 +296,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adres URI folderu ostatnio używanego w oknie wyboru nazw"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Autouzupełnianie"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certyfikaty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfiguracja automatycznego uzupełniania"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Książka adresowa Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Wyskakujące okno zawierające adres z książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Przeglądarka adresów książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Przeglądarka kart książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponent książki adresowej Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Sterowanie zarządzaniem certyfikatami S/Mime Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrola konfiguracji ustawień folderu Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -334,6 +372,7 @@ msgstr " Wyświ_etl obsługiwane typy "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -398,7 +437,7 @@ msgstr "Dodawanie grupy kontaktów"
 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:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Zawsze"
@@ -413,101 +452,92 @@ msgid "Basic"
 msgstr "Proste"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "K_olor:"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Nawiązywanie połączenia"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Wyróżniona nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr "Wyróżniona nazwa"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr "Limit pobierania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
 msgstr "Adres e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Adres e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr "Znajdź możliwe podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nigdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr "Położenia w obrębie punktu startowego"
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Wybór koloru"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "_Zakres wyszukiwania: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr "Wyszukiwanie samej podstawy"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
 msgstr "Zakres wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Wyszukiwanie"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -516,7 +546,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -534,7 +564,7 @@ msgstr ""
 "musi\n"
 "wykorzystywać protokołów SSL/TLS, gdyż twoje połączenie jest już bezpieczne."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -548,19 +578,19 @@ msgstr ""
 "będą podatne\n"
 "na ewentualne ataki z zewnątrz."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 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:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Podrzędne"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Obsługiwane podstawy wyszukiwania"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -571,7 +601,7 @@ msgstr ""
 "się wyszukiwanie. Po pozostawieniu tego pola pustym, wyszukiwanie rozpocznie "
 "się od głównego katalogu drzewa katalogów."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -586,13 +616,13 @@ msgstr ""
 "Zakres wyszukiwania \"one\" dołączy tylko wpisy leżące poziom ponad\n"
 "podstawą wyszukiwania.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -602,7 +632,7 @@ msgstr ""
 "liczby \n"
 "spowoduje spowolnienie działania książki adresowej."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -612,7 +642,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -621,7 +651,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -632,122 +662,129 @@ msgstr ""
 "Podano listę standardowych portów. Informacje na temat numeru\n"
 "portu można uzyskać u administratora systemu."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
 msgstr "Przekroczenie czasu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Użycie wyróżnionej nazwy (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Użycie adresu e-mail"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kiedy możliwe"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr "_Dodaj grupę kontaktów"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Limit pobierania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
 msgstr "Adr_es e-mail:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Metoda logowania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Nazwa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Numer p_ortu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Podstawa wyszukiwania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Nazwa serwera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr "_Serwer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Czas oczekiwania (minuty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr "_Bezpieczne połączenie:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: 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:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "zakładka-ogólne"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "zakładka-wyszukiwanie"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfejs wyboru nazwy książki adresowej Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Usuń wszystko"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Usuń"
 
+#: 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 "Nazwa"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Usuń wszystko"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Przejrzyj listę kontaktów"
@@ -770,22 +807,15 @@ msgstr "Dodaj do kontaktów"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez nazwy"
 
-#: 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
-msgid "Name"
-msgstr "Nazwa"
-
 #: 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
 msgid "Source"
 msgstr "Źródło"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfejs wyboru nazwy książki adresowej Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -844,125 +874,127 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "Adres 2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "Adres:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "Rocznica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "Asystent:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "Urodziny:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendarz:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "Miasto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "Firma:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Edytor kontaktów"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "Kraj:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "Wydział:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "Sygnalizacja zajętości:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Pełna _nazwa..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Dom"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#, fuzzy
+msgid "Home Page:"
+msgstr "Witryna domowa"
+
+#: addressbook/gui/contact-editor/contact-editor.glade.h:27
 msgid "Job title:"
 msgstr "Tytuł służbowy:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:29
+#: addressbook/gui/contact-editor/contact-editor.glade.h:28
 #: calendar/gui/e-itip-control.c:936
 msgid "Location:"
 msgstr "Położenie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "Komunikator MSN"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "Adresy pocztowe"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "Menedżer:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "Przy_domek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "Notatki:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Inne"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "Sk_rzynka pocztowa:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "Informacje osobiste"
@@ -985,9 +1017,9 @@ msgstr "Kamera internetowa:"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Praca"
@@ -1018,23 +1050,39 @@ msgstr "element7"
 msgid "item8"
 msgstr "element8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usunąć te kontakty?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Czy na pewno chcesz\n"
+"usunąć ten kontakt?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Adres"
 
 #: 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Modyfikowalny"
 
@@ -2006,92 +2054,110 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "Komunikator internetowy AOL"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Komunikator Yahoo"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Usługa"
-
-#: 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
-msgid "Location"
-msgstr "Położenie"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Nazwa użytkownika"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Książka źródłowa"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Książka docelowa"
 
 # FIXME - trzeba zobaczyć czy jest dobrze
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Jest nowym kontaktem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Pola do zapisu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Zmienione"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Edytor kategorii nie jest dostępny."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ten kontakt przynależy do następujących kategorii:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Wybierz spośród poniższych opcji"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Następujące reguły filtru:\n"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "Nie można odnaleźć widgetu związanego z polem: \"%s\""
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "Komunikator internetowy AOL"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Komunikator Yahoo"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Usługa"
+
+#: 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
+msgid "Location"
+msgstr "Położenie"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Nazwa użytkownika"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Szybkie dodanie kontaktu"
@@ -2109,22 +2175,6 @@ msgstr "Peł_na nazwa:"
 msgid "E-_mail:"
 msgstr "_E-mail"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usunąć te kontakty?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Czy na pewno chcesz\n"
-"usunąć ten kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adres _2:"
@@ -2271,8 +2321,8 @@ msgstr "Edytor listy kontaktów"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Książka"
 
@@ -2333,6 +2383,436 @@ msgstr ""
 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
+msgid "(map)"
+msgstr "(mapa)"
+
+# FIXME - dobrze czy nie?
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Członkowie listy"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizacja"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Pozycja"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Konferencje wideo"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "praca"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Telefon komórkowy"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "osobiste"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Notatka"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Tytuł służbowy"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Witryna domowa"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Sukces"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr "Wsparcie zajęte"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Repozytorium rozłączone"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+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
+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
+msgid "Permission denied"
+msgstr "Brak uprawnień"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Nie odnaleziono kontaktu"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+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
+msgid "Protocol not supported"
+msgstr "Protokół nie jest obsługiwany"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Anulowano"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr "Nie można anulować"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Uwierzytelnienie nie powiodło się"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Wymagane uwierzytelnienie"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+msgid "No such source"
+msgstr "Brak takiego źródła"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Inny błąd"
+
+#: 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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Zapytaniu odpowiada więcej kart, niż maksimum wyników zwracanych,\n"
+"określone w konfiguracji serwera lub wyświetlanych, określone w\n"
+"konfiguracji Evolution.\n"
+"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
+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 ""
+"Czas wykonania tego zapytania przekraczył limit serwera lub\n"
+"limit skonfigurowany dla tej książki adresowej. Określ dokładniej\n"
+"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
+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
+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
+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:208
+msgid "_Discard"
+msgstr "_Porzuć"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+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
+msgid "Error adding contact"
+msgstr "Błąd przy dodawaniu kontaktu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Błąd przy modyfikacji listy"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Błąd przy modyfikacji kontaktu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Błąd przy usuwaniu kontaktu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s istnieje.\n"
+"Czy chcesz go nadpisać?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Przeniesienie kontaktu do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Skopiowanie kontaktu do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Przeniesienie kontaktów do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Skopiowanie kontaktów do"
+
+# FIXME - albo wybierz 
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Wybór docelowej książki adresowej."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Plik VCard z wieloma pozycjami"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "Plik VCard z pozycją %s"
+
+#.
+#. * 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 "(brak)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Główny e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Wybór czynności"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Utwórz nowy kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj adres do istniejącego kontaktu \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Odpytywanie książki adresowej..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Zmień informacje o kontakcie"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Dołączenie adresu e-mail"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "oraz jeden inny kontakt."
+msgstr[1] "oraz %d inne kontakty."
+msgstr[2] "oraz %d innych kontaktów."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Wyświetlanie pełnej wizytówki VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Wyświetlenie okrojonej wizytówki VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Zapisz w książce adresowej"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Brak kontaktów"
@@ -2348,8 +2828,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Zapytanie"
 
@@ -2403,9 +2883,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Zapisz w formacie VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2470,7 +2951,7 @@ msgid "Cut"
 msgstr "Wytnij"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2481,18 +2962,8 @@ msgstr "Skopiuj"
 msgid "Paste"
 msgstr "Wklej"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Usuń"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Bieżący widok"
 
@@ -2509,7 +2980,7 @@ msgstr ""
 "uruchomić Evolution."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Dowolna kategoria"
@@ -2550,21 +3021,6 @@ msgstr "Kategorie"
 msgid "Company Phone"
 msgstr "Telefon firmowy"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-mail 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nazwisko"
@@ -2601,29 +3057,14 @@ msgstr "Dziennik"
 msgid "Manager"
 msgstr "Menedżer"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Telefon komórkowy"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Pseudonim"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Notatka"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Biuro"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizacja"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Inny faks"
@@ -2675,21 +3116,29 @@ msgstr "Jednostka"
 msgid "Web Site"
 msgstr "Witryna sieci web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Szerokość"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Wysokość"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Posiada skupienie"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Wybrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Posiada kursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Pole"
@@ -2706,10 +3155,6 @@ msgstr "Model tekstowy"
 msgid "Max field name length"
 msgstr "Maks. długość nazwy pola"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Szerokość kolumny"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2738,410 +3183,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Łącznik"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Wybrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Posiada kursor"
-
-# FIXME - dobrze czy nie?
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(mapa)"
-
-# FIXME - dobrze czy nie?
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Członkowie listy"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Pozycja"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Konferencje wideo"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "praca"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "osobiste"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Tytuł służbowy"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Witryna domowa"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Sukces"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr "Wsparcie zajęte"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Repozytorium rozłączone"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-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:54
-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:57
-msgid "Permission denied"
-msgstr "Brak uprawnień"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Nie odnaleziono kontaktu"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-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:60
-msgid "Protocol not supported"
-msgstr "Protokół nie jest obsługiwany"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Anulowano"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr "Nie można anulować"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Uwierzytelnienie nie powiodło się"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Wymagane uwierzytelnienie"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-msgid "No such source"
-msgstr "Brak takiego źródła"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Inny błąd"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Nie można otworzyć książki adresowej"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Zapytaniu odpowiada więcej kart, niż maksimum wyników zwracanych,\n"
-"określone w konfiguracji serwera lub wyświetlanych, określone w\n"
-"konfiguracji Evolution.\n"
-"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:167
-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 ""
-"Czas wykonania tego zapytania przekraczył limit serwera lub\n"
-"limit skonfigurowany dla tej książki adresowej. Określ dokładniej\n"
-"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:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Zapytanie nie zakończyło się pomyślnie."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Czy chcesz zapisać zmiany?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Porzuć"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Błąd przy dodawaniu listy"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Błąd przy dodawaniu kontaktu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Błąd przy modyfikacji listy"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Błąd przy modyfikacji kontaktu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Błąd przy usuwaniu listy"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Błąd przy usuwaniu kontaktu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s istnieje.\n"
-"Czy chcesz go nadpisać?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Nadpisz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Przeniesienie kontaktu do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Skopiowanie kontaktu do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Przeniesienie kontaktów do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Skopiowanie kontaktów do"
-
-# FIXME - albo wybierz 
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Wybór docelowej książki adresowej."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Plik VCard z wieloma pozycjami"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "Plik VCard z pozycją %s"
-
-#.
-#. * 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 "(brak)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Główny e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Wybór czynności"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Utwórz nowy kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adres do istniejącego kontaktu \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Odpytywanie książki adresowej..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Zmień informacje o kontakcie"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Dołączenie adresu e-mail"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "oraz jeden inny kontakt."
-msgstr[1] "oraz %d inne kontakty."
-msgstr[2] "oraz %d innych kontaktów."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Wyświetlanie pełnej wizytówki VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Wyświetlenie okrojonej wizytówki VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Zapisz w książce adresowej"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Szerokość kolumny"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3185,11 +3229,6 @@ msgstr "Importer VCard Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Wydrukuj kopertę"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Wydrukuj kontakty"
@@ -3199,6 +3238,11 @@ msgstr "Wydrukuj kontakty"
 msgid "Print contact"
 msgstr "Wydrukuj kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Wydrukuj kopertę"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10-punktowa Tahoma"
@@ -3383,16 +3427,6 @@ msgstr "Test drukowania kontaktów"
 msgid "This should test the contact print code"
 msgstr "Powinno to przetestować kod drukowania kontaktu"
 
-#: 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
-msgid "Can not open file"
-msgstr "Nie można otworzyć pliku"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-msgid "Can not load URI"
-msgstr "Nie można wczytać adresu URI"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Podaj plik wyjściowy zamiast standardowego wyjścia"
@@ -3452,6 +3486,16 @@ msgstr "W trybie zwykłym, nie potrzeba opcji rozmiaru."
 msgid "Impossible internal error."
 msgstr "Nieprawdopodobny błąd wewnętrzny."
 
+#: 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
+msgid "Can not open file"
+msgstr "Nie można otworzyć pliku"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+msgid "Can not load URI"
+msgstr "Nie można wczytać adresu URI"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Błąd przy odczycie domyślnej książki adresowej."
@@ -3464,11 +3508,12 @@ msgstr "Plik wejściowy"
 msgid "No filename provided."
 msgstr "Nie podano nazwy pliku."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Lista kontaktów bez nazwy"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Wprowadź hasło"
 
@@ -3500,117 +3545,55 @@ msgstr "Domyślny priorytet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie można odczytać bloku aplikacji \"do zrobienia\" Pilota"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendarz i zadania"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendarze"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfiguracja strefy czasowej, kalendarza i listy zadań."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendarz i zadania Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola konfiguracji kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Przeglądarka wiadomości terminarza dla kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Przeglądarka kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Edytor kalendarza/zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Przeglądarka zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Komponent kalendarza Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Komponent zadań Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zadania"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Usługa przypominania za pomocą alarmu dla kalendarza Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Rozpoczęcie:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Zakończenie:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarm Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm o %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Zam_knij"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Uśpij"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Czas uśpienia (minuty)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Zmodyfikuj termin"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Uśpij"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otwórz"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Zamknij"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Zamknij wszystko"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Brak opisu."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3623,12 +3606,12 @@ msgstr ""
 "Rozpoczęcie o %s\n"
 "Zakończenie o %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Ostrzeżenie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3640,7 +3623,7 @@ msgstr ""
 "z powiadamianiem za pośrednictwem listów. Zamiast tego\n"
 "zostanie wyświetlone zwykłe okno przypomnienia."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3657,19 +3640,19 @@ msgstr ""
 "\n"
 "Czy na pewno chcesz uruchomić ten program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Bez pytania o ten program w przyszłości."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Usługa przypominania za pomocą alarmu dla kalendarza Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nie można zainicjować Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nie można zainicjować gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie można utworzyć generatora usługi przypominania za pomocą alarmu"
 
@@ -3779,57 +3762,43 @@ msgid "Weekday the week starts on"
 msgstr "Początkowy dzień tygodnia"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Określa, czy potwierdzać usunięcie terminów"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Określa, czy potwierdzać opróżnienie folderu"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Określa, czy ukrywać zakończone zadania"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Określa, czy ustawić domyślne przypomnienie dla zdarzeń"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr ""
 "Określa, czy wyświetlać czas w formacie 24-godzinnym zamiast 12-godzinnym"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Określa, czy wyświetlać numery tygodni w przeglądarce dat"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Zestawienie zawiera"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Opis zawiera"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentarz zawiera"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Położenie zawiera"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Niedopasowane"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendarz"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3839,69 +3808,74 @@ msgstr ""
 "okres czasu. W przypadku kontynuowania operacji, późniejsze odzyskanie zadań "
 "nie będzie możliwe."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Usunięcie zdarzeń starszych niż"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendarz \"%s\" zostanie usunięty. Czy na pewno chcesz kontynuować?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Właściwości..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Wczytywanie kalendarza..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr ""
 "Nie można otworzyć kalendarza \"%s\" w celu utworzenia zdarzeń i spotkań"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Brak dostępnego kalendarza do utworzenia zdarzeń i spotkań"
 
-#: calendar/gui/calendar-component.c:836
+#: calendar/gui/calendar-component.c:963
 msgid ""
 "Selected calendar is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -3909,51 +3883,56 @@ msgstr ""
 "Wybrany kalendarz jest tylko do odczytu, nie można tworzyć zdarzeń. Wybierz "
 "kalendarz z możliwością zapisu."
 
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalendarze"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nowy termin"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Termin"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Tworzy nowy termin"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Spot_kanie"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Tworzy nową prośbę o spotkanie"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Nowy t_ermin całodniowy"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Tworzy nowy termin całodniowy"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Nowy kalendarz"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alendarz"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Tworzy nowy kalendarz"
 
@@ -3983,15 +3962,35 @@ msgstr "Widok tygodnia"
 msgid "Month View"
 msgstr "Widok miesiąca"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Zestawienie zawiera"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Opis zawiera"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentarz zawiera"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Położenie zawiera"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Niedopasowane"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Błąd podczas otwierania kalendarza"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Nieobsługiwana metoda podczas otwierania kalendarza"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Brak uprawnień do otwarcia kalendarza"
 
@@ -4000,19 +3999,6 @@ msgstr "Brak uprawnień do otwarcia kalendarza"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nie można otworzyć folderu o URI \"%s\""
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI wyświetlany przez kalendarz"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Typ wyświetlanego widoku"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Ustawienia alarmu dźwiękowego"
@@ -4079,7 +4065,7 @@ msgid "hours"
 msgstr "godzin"
 
 # FIXME - nie mam koncepci na trigger/spust?
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Akcja/Uaktywnienie"
 
@@ -4098,14 +4084,14 @@ msgstr "Proste"
 msgid "Date/Time:"
 msgstr "Data/Czas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Wyświetlenie komunikatu"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Odtworzenie dźwięku"
 
+#: 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 "Przypomnienia"
@@ -4120,6 +4106,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:927 calendar/gui/e-itip-control.glade.h:11
 msgid "Summary:"
 msgstr "Zestawienie:"
@@ -4158,10 +4145,100 @@ msgstr "minut"
 msgid "start of appointment"
 msgstr "początek terminu"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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:178
+#, 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:193
+#, 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:265
+#, 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:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupa \"%s\" jest zdalna. Należy podać położenie z którego można pobrać "
+"kalendarz"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+msgid "Add Calendar"
+msgstr "Dodawanie kalendarza"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "Dodawanie grupy zadań"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+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:107
+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
+msgid "_Add Calendar"
+msgstr "_Dodaj kalendarz"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+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
+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
+msgid "_Type:"
+msgstr "_Rodzaj:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "Adr_es URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "tygodni"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Aktywne"
 
@@ -4175,19 +4252,19 @@ msgstr "Nie usuwaj"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Wyłącz"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aktywne"
 
@@ -4212,162 +4289,176 @@ msgid "60 minutes"
 msgstr "60 minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alarmy"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Inne</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Wtedy</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Opcje listy zadań</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Dom</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Praca</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Ustawienia kalendarza i zadań"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Kolor zaległych zadań"
 
-#: 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 "Kolor dzisiejszych zadań"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "_Koniec dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Wyświ_etlanie"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "U_aktywnij"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "P_ublikowanie 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:563
 msgid "Friday"
 msgstr "Piątek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Godzin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Poniedziałek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Nie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Wyświetlanie przypo_mnienia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Wyświetlanie _numerów tygodni w przeglądarce dat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Niedziela"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Zadania na _dziś:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Czw"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Lista zadań"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Czwartek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Czas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Strefa c_zasowa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Środa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Początek _tygodnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Środa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Tydzień roboczy"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Dni robocze:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12-godzinny (AP/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-godzinny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "Dodaj _adres URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Potw_ierdzanie przed usunięciem elementów"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Kompresowanie weekendów na widoku miesięcznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Początek _dnia:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "Wyświ_etlanie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4377,137 +4468,47 @@ msgstr "Wyświ_etlanie"
 msgid "_Edit"
 msgstr "_Edycja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "P_ublikowanie informacji o zajętości"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Pią"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "Ogó_lne"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Ukrywanie zakończonych zadań po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "P_on"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Z_aległe zadania:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sob"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Wyświetlanie _czasów zakończenia terminów w widoku tygodniowym i miesięcznym"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Prze_działy czasu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Wto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Ś_ro"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "przed każdym terminem"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, 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:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupa \"%s\" jest zdalna. Należy podać położenie z którego można pobrać "
-"kalendarz"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-msgid "Add Calendar"
-msgstr "Dodawanie kalendarza"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "Dodawanie grupy zadań"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Właściwości kalendarza"
-
-# 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
-msgid "_Add Calendar"
-msgstr "_Dodaj kalendarz"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-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
-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
-msgid "_Type:"
-msgstr "_Rodzaj:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "Adr_es URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tygodni"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4588,81 +4589,81 @@ msgstr "%s  Wprowadzono zmiany. Anulować je wszystkie i uaktualnić edytor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nie wprowadzono żadnych zmian, uaktualnić edytor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Wykryto błąd przy weryfikacji poprawności: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Zakończone "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Zakończone"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Należne "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Należne "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nie można uaktualnić obiektu"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Zmodyfikuj termin"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Termin - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Zadanie - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Wpis dziennika - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Brak zestawienia"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Zapisz jako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Zmiany dokonane w tym elemencie mogą zostać porzucone, jeśli nadejdzie "
 "aktualizacja"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Nie można użyć bieżącej wersji!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Wykryto błąd przy weryfikacji poprawności: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Zakończone "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Zakończone"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Należne "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Należne "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Nie można otworzyć źródła"
@@ -4786,27 +4787,27 @@ msgstr "Oddelegowanie do:"
 msgid "Enter Delegate"
 msgstr "Oddelegowanie"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Termin"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Przypomnienie"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Rekurencja"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Planowanie"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Spotkanie"
 
@@ -4818,7 +4819,7 @@ msgstr "Zdarzenie bez daty rozpoczęcia"
 msgid "Event with no end date"
 msgstr "Zdarzenie bez daty zakończenia"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Data początkowa jest niepoprawna"
 
@@ -4904,10 +4905,10 @@ msgstr "Cza_s rozpoczęcia:"
 #. 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4926,15 +4927,15 @@ msgstr "Wymagany jest organizator."
 msgid "At least one attendee is required."
 msgstr "Wymagany jest co najmniej jeden uczestnik."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Oddeleguj do..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5207,24 +5208,19 @@ msgstr "_Porzuć zmiany"
 msgid "Save Event"
 msgstr "Zapisz zdarzenie"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Wybierz źródło"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Podaj cel %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalendarz"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Folder docelowy:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "lista zadań"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Lista zadań"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5253,38 +5249,44 @@ msgid "% _Complete"
 msgstr "% _Ukończenia"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Zakończone"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Wysoki"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "W trakcie"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Niski"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Zwykły"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nie uruchomiony"
 
@@ -5319,11 +5321,11 @@ msgstr "Witryna _web:"
 msgid "Assignment"
 msgstr "Przyporządkowanie"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Data docelowa jest niepoprawna"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie można otworzyć zadań w \"%s\"."
@@ -5332,8 +5334,9 @@ msgstr "Nie można otworzyć zadań w \"%s\"."
 msgid "Con_fidential"
 msgstr "Taj_ny"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Opis:"
@@ -5482,101 +5485,56 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s z nieznanym typem warunku"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Publiczny"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Prywatny"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Tajny"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Kliknij, aby otworzyć %s"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data zakończenia"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Bez nazwy"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
 msgstr "Data rozpoczęcia"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Zestawienie"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Wolny"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zajęty"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Czas zakończenia:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Położenie geograficzne musi być podane w formacie: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stan:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "P_riorytet:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nie"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Witryna _web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nieznany"
+#: 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 "Publiczny"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Powtarzanie"
+#: 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 "Prywatny"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Przyporządkowano"
+#: 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 "Tajny"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5622,17 +5580,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Wolny"
+
+#: 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 "Zajęty"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Usuwanie zaznaczonych obiektów"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Otwórz"
 
@@ -5641,41 +5608,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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 "S_kopiuj"
 
 #: calendar/gui/e-calendar-table.c:1031 calendar/gui/e-calendar-table.c:1065
-#: calendar/gui/e-calendar-view.c:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Wk_lej"
 
@@ -5730,74 +5698,153 @@ msgstr "Priorytet"
 msgid "Start date"
 msgstr "Data rozpoczęcia"
 
+#: 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 "Zestawienie"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Porządek zadań"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nowy _termin..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nowe zdarzenie _całodniowe"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nowe spotkanie"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "_Dzisiaj"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Wybierz datę..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Opublikuj informację o zajętości"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "S_kopiuj do kalendarza..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "P_rzenieś do kalendarza..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Zap_lanuj spotkanie..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Prześlij w formacie i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Usuń to _wystąpienie"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Usuń w_szystkie wystąpienia"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Przejdź do d_zisiaj"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Przejdź do daty..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Ustawienia..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Data zakończenia"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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: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-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 "Nieznany"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Powtarzanie"
+
+#: calendar/gui/e-cal-model.c:913
+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:168 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:169 calendar/gui/e-meeting-store.c:171
+msgid "No"
+msgstr "Nie"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Położenie geograficzne musi być podane w formacie: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5821,36 +5868,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i-minutowe przedziały czasu"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i-minutowe przedziały czasu"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5965,10 +6012,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Brak</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stan:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5998,7 +6041,7 @@ msgstr "Aktualizacja"
 #: 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6211,63 +6254,59 @@ msgstr "Załącznik nie zawiera poprawnego komunikatu kalendarza"
 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:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Nie można uaktualnić pliku kalendarza!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Aktualizacja zakończona\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Nie można odnaleźć obiektu\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Stan uczestnika został uaktualniony\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Nie można uaktualnić stanu uczestnika!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Usunięcie zakończone"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Element został wysłany!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Nie można wysłać elementu!\n"
 
@@ -6384,28 +6423,6 @@ msgstr "Oddelegowane"
 msgid "In Process"
 msgstr "W toku"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Poza biurem"
@@ -6466,7 +6483,34 @@ msgstr "Czas p_oczątku spotkania:"
 msgid "Meeting _end time:"
 msgstr "Czas _końca spotkania:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B, %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Wprowadź hasło dla \"%s\""
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6475,24 +6519,19 @@ msgstr ""
 "Błąd przy URI %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
-msgstr ""
-"Wspomaganie zadania dla\n"
-"%s\n"
-" spowodowało błąd."
+msgid "The task backend for '%s' has crashed."
+msgstr "Obsługa zadania dla \"%s\" spowodowała błąd."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otwieranie zadań z %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6501,53 +6540,107 @@ msgstr ""
 "Błąd przy otwieraniu %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Wczytywanie zadań"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Wykańczanie zadań..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Usuwanie zaznaczonych obiektów..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Oczyszczanie"
 
+#: calendar/gui/e-tasks.c:960
+#: 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/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:1773
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Wczytywanie terminów z %s"
 
 # FIXME - upewnić się tego "at"
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Wczytywanie zadań z %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Otwieranie %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: 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:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr "Obsługa zadania dla \"%s\" spowodowała błąd."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Czyszczenie"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendarz i zadania"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfiguracja strefy czasowej, kalendarza i listy zadań."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendarz i zadania Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola konfiguracji kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Przeglądarka wiadomości terminarza dla kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Edytor kalendarza/zadań Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Komponent kalendarza Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Komponent zadań Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendarze"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zadania"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Kwiecień"
@@ -6691,6 +6784,23 @@ msgstr "Urodziny i rocznice"
 msgid "On The Web"
 msgstr "Na sieci web"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Nie można otworzyć kalendarza \"%s\"."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nie można otworzyć zadań w \"%s\"."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6910,7 +7020,7 @@ msgid "Contacts: "
 msgstr "Kontakty: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Podgląd wydruku"
 
@@ -6922,26 +7032,47 @@ msgstr "Wydruk elementu"
 msgid "Print Setup"
 msgstr "Ustawienia wydruku"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Nowa lista zadań"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d wszystkich"
+msgstr[1] "%d wszystkich"
+msgstr[2] "%d wszystkich"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] ", %d zaznaczonych"
+msgstr[1] ", %d zaznaczonych"
+msgstr[2] ", %d zaznaczonych"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Wczytywanie zadań"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Brak dostępnego kalendarza do utworzenia zadań"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
@@ -6949,40 +7080,31 @@ 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:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nowe zadanie"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Zadanie"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Tworzy nowe zadanie"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 msgid "New tasks group"
 msgstr "Nowa grupa zadań"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 msgid "_Tasks Group"
 msgstr "_Grupa zadań"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 msgid "Create a new tasks group"
 msgstr "Tworzy nową grupę zadań"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI folderu zadań, który należy wyświetlić"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nie można wczytać zadania w \"%s\""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6995,11 +7117,11 @@ msgstr ""
 "\n"
 "Czy rzeczywiście usunąć te zadania?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Bez pytania o to w przyszłości."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Wydruku zadań"
 
@@ -8650,7 +8772,7 @@ msgstr "Lokalne kopiowanie zawartości folderu dla operacji bez podłączenia"
 msgid "Downloading new messages for offline mode"
 msgstr "Pobieranie nowych wiadomości dla trybu bez podłączenia"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Przygotowywanie folderu \"%s\" do pracy bez podłączenia"
@@ -8743,33 +8865,6 @@ msgstr "Niepoprawne argumenty funkcji (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Błąd przy wykonywaniu wyszukiwania przez filtr: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Błąd w wyrażeniu wyszukiwania: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Błąd przy wykonywaniu wyrażenia wyszukiwania %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Wykonywanie zapytania na nieznanym nagłówku: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8802,7 +8897,52 @@ msgstr "Nauka rozróżniania śmieci (spamu) od wiadomości"
 msgid "Filtering new message(s)"
 msgstr "Filtrowanie nowych wiadomości"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Błąd w wyrażeniu wyszukiwania: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Błąd przy wykonywaniu wyrażenia wyszukiwania %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) wymaga pojedynczego wyniku logicznego"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Wykonywanie zapytania na nieznanym nagłówku: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8813,15 +8953,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Nie można rozpoznać ID użytkownika gpg."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nie można rozpoznać żądania podania hasła od GPG."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8830,28 +8970,28 @@ msgstr ""
 "Należy podać ciąg znaków odblokowujący klucz dla\n"
 "użytkownika: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Anulowano."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Nie można odblokować tajnego klucza: podano 3 niepoprawne ciągi znaków."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nieoczekiwana odpowiedź od programu GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie można zaszyfrować listu: nie podano poprawnych odbiorców."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8863,84 +9003,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nie można zaszyfrować wiadomości z użyciem GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nie można wygenerować danych podpisujących: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Nie można uruchomić gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Nie można uruchomić gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "To jest część listu podpisana cyfrowo"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Nie można zweryfikować podpisu listu: Niepoprawny format wiadomości"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nie można zweryfikować podpisu listu: nie można utworzyć pliku tymczasowego: "
 "%s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nie można wygenerować danych szyfrujących: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "To jest część listu zaszyfrowana cyfrowo"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Zaszyfrowana zawartość"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Nie można przeanalizować zawartości listu"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nie można utworzyć potoku do pomocniczego programu blokującego: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nie można utworzyć procesu dla pomocniczego programu blokującego: %s"
-
-#: 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 ""
-"Nie można zablokować \"%s\": błąd przy komunikacji z programem blokującym"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nie można zablokować \"%s\""
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8963,6 +9082,27 @@ msgstr "Uzyskanie blokady za pomocą fcntl(2) nie powiodło się: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Uzyskanie blokady za pomocą flock(2) nie powiodło się: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nie można utworzyć potoku do pomocniczego programu blokującego: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nie można utworzyć procesu dla pomocniczego programu blokującego: %s"
+
+#: 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 ""
+"Nie można zablokować \"%s\": błąd przy komunikacji z programem blokującym"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nie można zablokować \"%s\""
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9220,7 +9360,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Niepoprawna odpowiedź serwera na uwierzytelnienie."
 
@@ -9429,7 +9569,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "C_ertyfikat szyfrujący:"
 
 #: camel/camel-smime-context.c:360
@@ -9446,7 +9586,7 @@ msgstr "Nie można utworzyć blokady folderu dla %s: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Dodanie do lokalanego folderu \"Wysłane\" nie powiodło się: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Nie można dokonać uwierzytelnienia.\n"
@@ -9512,98 +9652,98 @@ msgstr "Nie można utworzyć folderu: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Nie można pobrać listu %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Błędny podpis certyfikatu"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Podpis prawidłowy"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Podpisujący: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Nie powiodło się polecenie DATA"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nie można utworzyć folderu \"%s\": %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Nie można utworzyć wiadomości."
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nie można utworzyć blokady folderu dla %s: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Nie można było przesłać nazwy użytkownika na serwer"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Niezaimplementowane polecenie"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9623,16 +9763,26 @@ msgstr ""
 "Nie można utworzyć folderu: Niepoprawna operacja na tym miejscu "
 "przechowywania"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Nie można utworzyć folderu \"%s\": folder istnieje"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Śmietnik"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Śmieć"
@@ -9753,7 +9903,7 @@ msgstr "Użycie klucza nie obejmuje podpisywania certyfikatów"
 msgid "Error in application verification"
 msgstr "Błąd przy weryfikacji aplikacji"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9766,11 +9916,11 @@ msgstr ""
 "Odcisk:            %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "POPRAWNY"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "NIEPOPRAWNY"
 
@@ -9794,7 +9944,7 @@ msgstr ""
 "Czy pomimo tego chcesz go zaakceptować?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9809,7 +9959,7 @@ msgstr ""
 "\n"
 "Czy chcesz go zaakceptować?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9818,7 +9968,7 @@ msgstr ""
 "Problem z certyfikatem: %s\n"
 "Wydawca: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9827,7 +9977,7 @@ msgstr ""
 "Niepoprawna domena certyfikatu: %s\n"
 "Wydawca: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9836,7 +9986,7 @@ msgstr ""
 "Certyfikat uległ przedawnieniu: %s\n"
 "Wydawca: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9850,17 +10000,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nie można rozpoznać URL-a \"%s\""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Błąd przy zapisywaniu \"%s\": %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Brak listu %s w %s."
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 
@@ -9869,11 +10019,6 @@ msgstr "Nie można skopiować lub przenieść listów do folderu wirtualnego"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9888,10 +10033,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Nie można skopiować wiadomości do folderu śmieci"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Sprawdzanie nowej poczty"
 
 #: 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 "Sprawdzanie nowych listów we wszystkich folderach"
@@ -9923,6 +10070,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Dla dostępu do serwerów Novell GroupWise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9943,26 +10091,324 @@ msgstr ""
 msgid "Checklist"
 msgstr "Lista sprawdzania"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Nieoczekiwana odpowiedź od serwera IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nie można pobrać folderu \"%s\": %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 "Serwer nieoczekiwanie przerwał połączenie: %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 "Nie można pobrać folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nie można utworzyć folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nie można pobrać folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nie można pobrać folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nie można pobrać listu: %s z folderu %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 ""
+"Nie można pobrać listu: %s z folderu %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nie można dołączyć listu do folderu mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nie można dołączyć listu do folderu 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 ""
+"Nie można pobrać listu: %s z folderu %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 ""
+"Nie można pobrać listu: %s z folderu %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 ""
+"Nie można pobrać listu: %s z folderu %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 ""
+"Nie można pobrać listu: %s z folderu %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 "Foldery"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Przestrzeń nazw"
+
+#: 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 "Przeglądanie i przechowywanie poczty na serwerach IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Przy tej opcji połączenie z serwerem IMAP nastąpi przy użyciu hasła w "
+"postaci czystego tekstu."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, 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: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/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 "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: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:568
+#: camel/providers/imap/camel-imap-store.c:815
+#: 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/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Anulowano połączenie"
+
+#: 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"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Nieznany błąd"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nie można nawiązać połączenia z serwerem POP %s: Brak obsługi wymaganego "
+"mechanizmu uwierzytelniania."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sPodaj hasło SMTP dla %s na serwerze %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nie można przeprowadzić uwierzytelnienia na serwerze POP %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+msgid "Cannot get folder `%s' on IMAP server %s: Unknown"
+msgstr "Nie można pobrać folderu \"%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
+#, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nazwa folderu \"%s\" jest niepoprawna, ponieważ zawiera znak \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nie można utworzyć folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nie można usunąć folderu: %s: Folder nie istnieje"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Polecenie:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nie można usunąć folderu: %s: Niepoprawna operacja"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nie można utworzyć folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nie można zmienić nazwy folderu: %s: Niepoprawna operacja"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nie można utworzyć folderu \"%s\": %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Nieoczekiwana odpowiedź od serwera IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Serwer 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operacja anulowana"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Serwer nieoczekiwanie przerwał połączenie: %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:1089
-msgid "Unknown error"
-msgstr "Nieznany błąd"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10007,21 +10453,21 @@ msgstr "Nie można utworzyć katalogu %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nie można wczytać zestawienia dla %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Folder na serwerze został usunięty i utworzony ponownie."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Wyszukiwanie zmodyfikowanych listów"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nie można pobrać listu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10037,25 +10483,25 @@ msgstr ""
 "Nie można pobrać listu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nie ma takiego listu"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ten list jest obecnie niedostępny"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Pobieranie informacji podsumowujących nowe listy"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nie można odnaleźć treści listu w odpowiedzi na FETCH."
 
@@ -10093,23 +10539,6 @@ msgstr "Użycie własnego polecenie do połączenia z serwerem"
 msgid "Command:"
 msgstr "Polecenie:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Foldery"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Wyświetlanie tylko zasubskrybowanych folderów"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Nadpisanie przestrzeni nazw podanej przez serwer"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Przestrzeń nazw"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10131,86 +10560,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Serwer IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "usługa IMAP dla %s na %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nie można nawiązać połączenia z %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: 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/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Anulowano połączenie"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nie można nawiązać połączenia z serwerem IMAP %s w trybie bezpiecznym: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Nie wprowadzono hasła."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10221,25 +10607,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Folder \"%s\" nie istnieje"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nazwa folderu \"%s\" jest niepoprawna, ponieważ zawiera znak \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10247,7 +10626,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nieznany folder nadrzędny: %s"
@@ -10358,8 +10737,8 @@ msgstr ""
 "kolejek w formacie mbox. Opcji tej można użyć do odczytu drzewa folderów\n"
 "obsługiwanego przez programy Elm, Pine czy Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
@@ -10367,51 +10746,51 @@ msgid "Store root %s is not an absolute path"
 msgstr ""
 "Lokalizacja nadrzędna miejsca przechowywania %s nie jest ścieżką bezwzględną"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr ""
 "Lokalizacja nadrzędna miejsca przechowywania %s nie jest zwykłym katalogiem"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Nie można pobrać folderu: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne miejsca przechowywania nie mają skrzynki nadchodzącej"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalny plik z listami %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie można zmienić nazwy folderu %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie można zmienić nazwy \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nie można usunąć pliku z zestawieniem folderu \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nie można usunąć pliku \"%s\" z indeksem folderu: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10479,7 +10858,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10812,7 +11191,7 @@ 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:258
+#: 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
@@ -10822,8 +11201,8 @@ msgstr "Operacja anulowana"
 
 # c-format
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10832,48 +11211,48 @@ msgstr "Operacja anulowana"
 msgid "Cannot get message %s: %s"
 msgstr "Nie można pobrać listu %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Błąd wewnętrzny: uid w niepoporawnej postaci: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nie można kopiować wiadomości z folderu NNTP!"
 
@@ -11001,7 +11380,8 @@ msgid "Could not get group: %s"
 msgstr "Nie można pobrać grupy: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Nie można pobrać wiadomości: nieokreślony błąd"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11054,8 +11434,8 @@ msgstr "Brak listu o wartości uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Pobieranie %d. listu z serwera POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nieznana przyczyna"
 
@@ -11509,7 +11889,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "załącznik"
 
@@ -11553,6 +11933,104 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerowanie automatycznego wyświetlenia załącznika"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
+"podpisującego dla konta wysyłającego"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
+"szyfrującego dla konta wysyłającego"
+
+#: composer/e-msg-composer.c:1283
+msgid "Could not open file"
+msgstr "Nie można otworzyć pliku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nie można pobrać listu z edytora"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "List bez tytułu"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otwarcie pliku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Wygenerowany automatycznie"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Podpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> załączony plik"
+msgstr[1] "<b>%d</b> załączone pliki"
+msgstr[2] "<b>%d</b> załączonych plików"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Tworzenie listu"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nie można otworzyć okna tworzenia listu:\n"
+"Nie można uaktywnić formantu wyboru adresu."
+
+#: 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 ""
+"Nie można otworzyć okna tworzenia listu:\n"
+"Nie można uaktywnić komponentu edytora HTML-a.\n"
+"Upewnij się, że w systemie zainstalowane są\n"
+"poprawne wersje pakietów gtkhtml i  libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nie można otworzyć okna tworzenia listu:\n"
+"Nie można uaktywnić komponentu edytora HTML-a."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Edytor listów zawiera treść nie będącą tekstem, która nie może podlegać "
+"modyfikacjom.)</b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Cel wysyłania"
@@ -11632,125 +12110,88 @@ msgstr "Kliknij aby wybrać foldery do których wysłać"
 msgid "Attach file(s)"
 msgstr "Załączenie plików"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Nie można podpisać wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"podpisującego dla konta wysyłającego"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Nie można zaszyfrować wiadomości wychodzącej: Nie ustawiono certyfikatu "
-"szyfrującego dla konta wysyłającego"
-
-#: composer/e-msg-composer.c:1273
-msgid "Could not open file"
-msgstr "Nie można otworzyć pliku"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nie można pobrać listu z edytora"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "List bez tytułu"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Otwarcie pliku"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Nie można załączyć do tego listu pliku \"${0}\"."
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Wygenerowany automatycznie"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
+msgstr "${1}"
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Podpis:"
+#. 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 ""
+"Plik \"${0}\" nie jest zwykłym plikiem i nie może być wysłany w wiadomości."
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> załączony plik"
-msgstr[1] "<b>%d</b> załączone pliki"
-msgstr[2] "<b>%d</b> załączonych plików"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
+msgstr "Katalogi nie mogą być załączane do wiadomości."
 
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Ukrycie p_aska załączników (upuść tutaj załączniki)"
+#. 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."
+msgstr ""
+"Aby załączyć zawartość tego katalogu, należy albo załączyć poszczególne "
+"pliki z tego katalogu osobno, albo utworzyć archiwum z tym katalogiem i "
+"załączyć je."
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Wyświetlenie p_aska załączników (upuść tutaj załączniki)"
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+msgid "Unfinished messages found"
+msgstr "Znaleziono niedokończone listy"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Tworzenie listu"
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+msgid "Do you want to recover unfinished messages?"
+msgstr "Czy chcesz odtworzyć niedokończony list?"
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
-"Nie można otworzyć okna tworzenia listu:\n"
-"Nie można uaktywnić formantu wyboru adresu."
+"Program Evolution niespodziewanie zakończył pracę podczas tworzenia nowego "
+"listu. Odtworzenie listu pozwoli na kontynuację pracy w tym samym miejscu."
 
-#: composer/e-msg-composer.c:3165
-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 ""
-"Nie można otworzyć okna tworzenia listu:\n"
-"Nie można uaktywnić komponentu edytora HTML-a.\n"
-"Upewnij się, że w systemie zainstalowane są\n"
-"poprawne wersje pakietów gtkhtml i  libgtkhtml.\n"
+#: composer/mail-composer-errors.xml.h:17
+msgid "Don't Recover"
+msgstr "Nie odtwarzaj"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nie można otworzyć okna tworzenia listu:\n"
-"Nie można uaktywnić komponentu edytora HTML-a."
+#: composer/mail-composer-errors.xml.h:18
+msgid "Recover"
+msgstr "Odtwórz"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Edytor listów zawiera treść nie będącą tekstem, która nie może podlegać "
-"modyfikacjom.)</b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
+msgstr "Nie można zapisać do pliku autozapisu \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Błąd zapisu do pliku autozapisu z powodu \"{1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr "Wszystkie konta zostały usunięte."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Uwaga: Zmodyfikowany list"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 msgid ""
 "Are you sure you want to discard the message, titled '{0}', you are "
 "composing?"
 msgstr "Czy na pewno chcesz porzucić pisany właśnie list o tytule \"{0}\"?"
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr "Ponieważ \"${0}\", możesz potrzebować wybrać inne opcje poczty."
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr "Ponieważ \"${1}\"."
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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 "
@@ -11760,81 +12201,41 @@ msgstr ""
 "chyba, że zostanie wybrany zapis wiadomości w folderze szkiców. Pozwoli to "
 "na późniejsze kontynuowanie wiadomości."
 
-#: composer/mail-composer-errors.xml.in.h:7
-msgid "Could not create message."
-msgstr "Nie można utworzyć wiadomości."
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nie można odczytać pliku z podpisem \"{0}\"."
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr "Nie można zapisać do pliku autozapisu \"{0}\"."
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr "Katalogi nie mogą być załączane do wiadomości."
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 msgid "Discard Changes"
 msgstr "Porzuć zmiany"
 
-#: composer/mail-composer-errors.xml.in.h:12
-msgid "Do you want to recover unfinished messages?"
-msgstr "Czy chcesz odtworzyć niedokończony list?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-msgid "Don't Recover"
-msgstr "Nie odtwarzaj"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Błąd zapisu do pliku autozapisu z powodu \"{1}\"."
-
-#: composer/mail-composer-errors.xml.in.h:15
-msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
-msgstr ""
-"Program Evolution niespodziewanie zakończył pracę podczas tworzenia nowego "
-"listu. Odtworzenie listu pozwoli na kontynuację pracy w tym samym miejscu."
-
-#: composer/mail-composer-errors.xml.in.h:16
-msgid "Recover"
-msgstr "Odtwórz"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 msgid "Save Message"
 msgstr "Zapisz wiadomość"
 
-#: composer/mail-composer-errors.xml.in.h:18
-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."
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+msgid "Could not create message."
+msgstr "Nie można utworzyć wiadomości."
 
-#: composer/mail-composer-errors.xml.in.h:19
-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 ""
-"Aby załączyć zawartość tego katalogu, należy albo załączyć poszczególne "
-"pliki z tego katalogu osobno, albo utworzyć archiwum z tym katalogiem i "
-"załączyć je."
+#. 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 "Ponieważ \"${0}\", możesz potrzebować wybrać inne opcje poczty."
 
-#: composer/mail-composer-errors.xml.in.h:20
-msgid "Unfinished messages found"
-msgstr "Znaleziono niedokończone listy"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nie można odczytać pliku z podpisem \"{0}\"."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Uwaga: Zmodyfikowany list"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr "Ponieważ \"${1}\"."
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Nie można załączyć do tego listu pliku \"${0}\"."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr "Wszystkie konta zostały usunięte."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Przed wysłaniem listu należy skonfigurować konto."
 
@@ -11969,7 +12370,8 @@ msgstr ""
 "Plik o tej nazwie już istnieje.\n"
 "Nadpisać go?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Nadpisać plik?"
 
@@ -12152,71 +12554,88 @@ msgstr "Wybór czasu odniesienia"
 msgid "_Filter Rules"
 msgstr "R_eguły filtrów"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "Błąd w wyrażeniu regularnym \"{0}\"."
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr "Nie można skompilować wyrażenia regularnego \"{1}\"."
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Plik \"{0}\" nie istnieje lub nie jest zwykłym plikiem."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "Brakująca data."
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Należy podać datę."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 msgid "Missing file name."
 msgstr "Brakująca nazwa pliku."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-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."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Plik \"{0}\" nie istnieje lub nie jest zwykłym plikiem."
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "Brakujący folder."
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "Brakująca nazwa."
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "Nazwa \"{0}\" została już użyta."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Należy podać folder."
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "Nie wybrano źródeł."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "Błąd w wyrażeniu regularnym \"{0}\"."
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "Wybierz inną nazwę."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr "Nie można skompilować wyrażenia regularnego \"{1}\"."
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Należy podać datę."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "Brakująca nazwa."
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Należy nadać temu filtrowi nazwę."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "Należy nadać temu vFolderowi nazwę."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Należy podać nazwę pliku."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "Nazwa \"{0}\" została już użyta."
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Należy podać folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "Wybierz inną nazwę."
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "Nie wybrano źródeł."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
+#, fuzzy
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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 ""
 "Należy podać przynajmniej jeden folder jako źródło. Albo poprzez "
 "indywidualny wybór folderów, albo poprzez wybór wszystkich lokalnych "
@@ -12231,64 +12650,11 @@ msgstr "Wybór pliku"
 msgid "<b>Then</b>"
 msgstr "<b>Wtedy</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Wybór folderu"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Ważne"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Do zrobienia"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Później"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Nazwa reguły:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Bez nazwy"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Jeżeli</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Wykonywanie czynności"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "przy spełnieniu wszystkich kryteriów"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "przy spełnieniu któregokolwiek z kryteriów"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "przychodzące"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "wychodzące"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12377,6 +12743,75 @@ msgstr "ze wszystkimi lokalnymi folderami"
 msgid "years"
 msgstr "lat"
 
+#: 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
+msgid "Important"
+msgstr "Ważne"
+
+#. forest green
+#: filter/filter-label.c:124 mail/em-migrate.c:919 mail/mail-config.c:79
+#: mail/mail-config.glade.h:145
+msgid "To Do"
+msgstr "Do zrobienia"
+
+#. blue
+#: filter/filter-label.c:125 mail/em-migrate.c:920 mail/mail-config.c:80
+#: mail/mail-config.glade.h:94
+msgid "Later"
+msgstr "Później"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Nazwa reguły:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Jeżeli</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "przy spełnieniu wszystkich kryteriów"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "przy spełnieniu któregokolwiek z kryteriów"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Wykonywanie czynności"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Oddelegowane"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Lista odbiorców"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Odpowiada do %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Dołączanie:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "przychodzące"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "wychodzące"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12506,7 +12941,7 @@ msgstr "nie jest oznaczony"
 msgid "Junk Test"
 msgstr "Test śmieci"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etykieta"
@@ -12543,7 +12978,7 @@ msgstr "Przesłanie do programu"
 msgid "Play Sound"
 msgstr "Odtworzenie dźwięku"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Przeczytane"
 
@@ -12613,9 +13048,9 @@ msgstr "rozpoczyna się od"
 msgid "Stop Processing"
 msgstr "Zatrzymanie przetwarzania"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12676,103 +13111,60 @@ msgstr "Temat nie zawiera"
 msgid "Virtual _Folders"
 msgstr "W_irtualne foldery"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Źródło VFolderów"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Preferencje edytora listów"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfiguracja preferencji dotyczących listów, m.in. bezpieczeństwa i "
-"wyświetlania"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora listów"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfiguracja kont pocztowych"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Poczta Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola konfiguracji kont pocztowych Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponent poczty programu Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Edytor listów programu Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola konfiguracji programu do tworzenia listów Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Przeglądarka folderu pocztowego Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola preferencji poczty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Poczta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Konta pocztowe"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Ustawienia poczty"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Domyślny]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Nazwa konta"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokół"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Bez nazwy"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Język(i)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "Dodawanie treści podpisu"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Podpis(y)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Przesyłany list ----------"
+
+#: mail/em-composer-utils.c:1499
+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
+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ł:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Utwórz _wirtualny folder na podstawie wyszukiwania..."
 
@@ -12806,267 +13198,443 @@ msgstr "<kliknij, aby wybrać folder> "
 msgid "Create New Folder"
 msgstr "Tworzenie nowego folderu"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Określ miejsce utworzenia folderu:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Tworzenie folderu"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nazwa folderu:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFoldery"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "NIEPASUJĄCE"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Nadchodzące"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Wczytywanie..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Przenoszenie folderu %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Kopiowanie folderu %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Przenoszenie listów do folderu %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, 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:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Nie można upuścić listu w głównym folderze"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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:2551 mail/em-folder-view.c:798
+#: mail/message-list.c:1645
+msgid "_Move"
+msgstr "_Przenieś"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Anuluj zadanie"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Wybór folderu"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Skopiuj"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Tworzenie folderu \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Tworzenie folderu"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Zmiana nazwy folderu \"%s\" na:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Zmień nazwę folderu"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Widok"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Otwórz w nowym _oknie"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "_Przenieś"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Nowy folder..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Zmień nazwę"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 ui/evolution-mail-list.xml.h:27
 msgid "_Properties..."
 msgstr "_Właściwości..."
 
+#: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
+#: mail/mail-vfolder.c:889
+msgid "VFolders"
+msgstr "VFoldery"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "NIEPASUJĄCE"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Nadchodzące"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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:508
+#: mail/mail-component.c:551
+msgid "Mail"
+msgstr "Poczta"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Z_redaguj jako nowy list..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Wy_drukuj"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odpowiedz na _listę"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odpowiedz wszystki_m"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Prześlij"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Po_dążaj..."
 
 # FIXME - upewnić się, że tak a nie inaczej :)
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "_Oznacz jako zakończone"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Wy_czyść flagę"
 
-#: mail/em-folder-view.c:787 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 "O_znacz jako przeczytane"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Oznacz jako ni_eprzeczytane"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Ozn_acz jako nieważne"
 
-#: mail/em-folder-view.c:791 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 "Oznacz jako ś_mieci"
 
-#: mail/em-folder-view.c:792 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 "Oz_nacz jako ważne"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Cofnij usunięcie"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "P_rzenieś do folderu..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "S_kopiuj do folderu..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj nadawcę do _książki adresowej"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Zastosuj fi_ltry"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltruj śmieci"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Utwórz regułę na podstawie listu"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder w oparciu o _temat"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder w oparciu o _nadawcę"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder w oparciu o _odbiorców"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder w oparciu o _listę dyskusyjną"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder w oparciu o _wątek"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtr w oparciu o t_emat"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtr w oparciu o n_adawcę"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtr w oparciu o o_dbiorców"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtr w oparciu o li_stę dyskusyjną"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtr w oparciu o wątek"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Domyślne"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Wydrukuj list"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "Skopiuj położ_enie odnośnika"
 
 # FIXME - Nie mam pewności , że to o to idzie
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknij aby wysłać %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Od"
+
+#: 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 "Odpowiedź do"
+
+#: 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 "Dla"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr "Grupy nowin"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Kliknij, aby otworzyć %s"
+msgid "%s attachment"
+msgstr "Załącznik: %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nie można przetworzyć widomości S/MIME: Nieznany błąd"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
+"szyfrowanych"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr ""
+"Nie można przetworzyć jako list MIME. Wyświetlanie w postaci źródłowej."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nieobsługiwany format podpisu"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Błąd weryfikacji podpisu"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nieznany błąd weryfikacji podpisu"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Pobieranie \"%s\""
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Niepodpisana"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Podpis prawidłowy"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Nieprawidłowy podpis"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Poprawny podpis, nie można zweryfikować nadawcy"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Niezaszyfrowana"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Zaszyfrowana, słabo"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Zaszyfrowana"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Zaszyfrowana, silnie"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Niepoprawna forma części external-body."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Wskaźnik do witryny FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Wskaźnik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Wskaźnik do lokalnego pliku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Wskaźnik na zdalne dane (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Wskaźnik na nieznane zewnętrzne dane (typu \"%s\")"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Formatowanie listu"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Program pocztowy"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 #. message-search popup match count string
 #: mail/em-format-html-display.c:410
@@ -13074,11 +13642,7 @@ msgstr "Kliknij, aby otworzyć %s"
 msgid "Matches: %d"
 msgstr "Dopasowania: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Niepodpisana"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13086,11 +13650,7 @@ msgstr ""
 "Wiadomość nie jest podpisana. Nie ma gwarancji, że ta wiadomość jest "
 "autentyczna."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Podpis prawidłowy"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13098,11 +13658,7 @@ msgstr ""
 "Wiadomość jest podpisana i poprawna, jest bardzo prawdopodbne, że list jest "
 "autentyczny."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Nieprawidłowy podpis"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13110,11 +13666,11 @@ msgstr ""
 "Nie można zweryfikować podpisu wiadomości, list mógł być naruszony podczas "
 "transmisji."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Poprawny podpis, nie można zweryfikować nadawcy"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13122,11 +13678,7 @@ msgstr ""
 "Wiadomość ta jest podpisana poprawnym podpisem, ale nadawca tego listu nie "
 "może być zweryfikowany."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Niezaszyfrowana"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13134,11 +13686,7 @@ msgstr ""
 "Ta wiadomość nie jest zaszyfrowana. Jej zawartość może być podglądnięta "
 "podczas transmisji przez Internet."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Zaszyfrowana, słabo"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13148,11 +13696,7 @@ msgstr ""
 "obcej będzie trudno, ale nie niemożliwie podejrzeć w konkretnym czasie "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Zaszyfrowana"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13160,11 +13704,7 @@ msgstr ""
 "Ta wiadomość jest zaszyfrowana. Osobie obcej będzie trudno podejrzeć "
 "zawartość tego listu."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Zaszyfrowana, silnie"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13173,182 +13713,61 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Wyświetl certyfikat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Tego certyfikatu nie można wyświetlić"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Ukończone %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Zaległe:"
 
 # FIXME - sprawdzić czy ma być na pawno "od"
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "od %d %B, %Y, %k:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Wyświetlenie w treści listu"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Ukryj"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strona %d z %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Pobieranie \"%s\""
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Niepoprawna forma części external-body."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Wskaźnik do witryny FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Wskaźnik do lokalnego pliku (%s) poprawny na witrynie \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Wskaźnik do lokalnego pliku (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Wskaźnik na zdalne dane (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Wskaźnik na nieznane zewnętrzne dane (typu \"%s\")"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Formatowanie listu"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Odpowiedź do"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Dla"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Program pocztowy"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Grupy nowin"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "Załącznik: %s"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nie można przetworzyć widomości S/MIME: Nieznany błąd"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-"Nieobsługiwany rodzaj szyfrowania dla wiadomości wieloczęściowych/"
-"szyfrowanych"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr ""
-"Nie można przetworzyć jako list MIME. Wyświetlanie w postaci źródłowej."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Nieobsługiwany format podpisu"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Błąd weryfikacji podpisu"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Nieznany błąd weryfikacji podpisu"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (wbudowany)"
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Co roku"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Codziennie"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Co tydzień"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Co miesiąc"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13360,25 +13779,55 @@ msgstr ""
 "\n"
 "Zachowaj cierpliwość podczas gdy Evolution będzie migrował foldery..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Nie można zmigrować buforów UID pop3: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nie można utworzyć folderu \"%s\": %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Nie można zmigrować stanu rozwinięcia folderu: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Nie można skopiować deskryptora: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Nie można zapisać pliku listy grup dla %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Nie można przeprowadzić uwierzytelnienia na serwerze POP %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Nie można utworzyć katalogu \"%s\": %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Nie można otworzyć magazynu dla \"%s\": %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Nie można utworzyć katalogu \"%s\": %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Nie można utworzyć pliku wyjściowego: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13389,89 +13838,75 @@ msgstr "Zapisz jako..."
 msgid "untitled_image.%s"
 msgstr "nienazwany_obra.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Ustaw jako _tło"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "Odpo_wiedz nadawcy"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "Otwórz odnośnik w p_rzeglądarce"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Wyślij _list do..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Dodaj d_o książki adresowej"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Otwórz za pomocą programu %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Magazyn ten nie obsługuje subskrypcji, lub nie są one aktywne."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Zasubskrybowane"
 
-#: mail/em-subscribe-editor.c:637 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 "Folder"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Wybierz serwer."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nie wybrano serwera"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Bez wyświetlania tego komunikatu w przyszłości."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtry"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Przesyłany list ----------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-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ł:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "list"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Zapis wiadomości..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Dodanie adresu"
 
 # FIXME - upewnić się co to jest
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Listów z %s"
@@ -13489,11 +13924,13 @@ msgid "Check incoming mail being junk"
 msgstr "Wyszukiwanie śmieci w nadchodzącej poczcie"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Kolor podświetlenia cytatów"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Kolor podświetlenia cytatów."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13596,14 +14033,20 @@ msgid "Last time empty trash was run"
 msgstr "Ostanie opróżnianie kosza"
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Lista etykiet i przypisanych im kolorów"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Lista kont"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Lista kont"
+
+#: 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."
@@ -13611,28 +14054,33 @@ msgstr ""
 "Lista kont znanych składnikowi poczty Evolution. Lista zawiera ciągi nazw "
 "podkatalogów względem /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Lista własnych nagłówków oraz czy są włączone."
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Lista etykiet znanych składnikowi poczty Evolution. Lista zawiera ciągi "
 "zawierające nazwa:kolor, gdzie kolor używa kodowania HTML hex."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 "Lista typów MIME sprawdzanych na obecność składnika przeglądarki bonobo"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Pobieranie obrazów dla wiadomości HTML poprzez protokół HTTP"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13642,90 +14090,90 @@ msgstr ""
 "wartości to: 0 - bez pobierania obrazów z sieci, 1 - pobieranie obrazów "
 "jeżeli nadawca jest w książce adresowej, 2 - zawsze pobieraj obrazy."
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Akcje filtra dziennika"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Akcje filtra dziennika na podanym pliku dziennika."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Plik dziennika do zapisu akcji filtra"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Plik dziennika do zapisu akcji filtra."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Oznaczenie jako przeczytane po określonym czasie"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Oznaczenie jako przeczytane po określonym czasie."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Zaznaczanie cytatów w \"Podglądzie\" wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Zaznaczanie cytatów w \"Podglądzie\" wiadomości."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 msgid "Message Window default height"
 msgstr "Domyślna wysokość okna okna wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Domyślna szerokość okna wiadomości"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Styl wyświetlania wiadomości (zwykły, pełne nagłówki, źródło)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Minimalna liczba dni pomiędzy opróżnieniami kosza przy wyjściu"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 "Minimalny okres czasu w dniach, pomiędzy opróżnieniami kosza przy wyjściu."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Plik dźwięku powiadamiania o nowej poczcie"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Rodzaj powiadamiania o nowej poczcie"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Potwierdzenie przy pustym temacie"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Potwierdzenie przy opróźnianiu folderu."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 "Potwierdzenie podczas próby wysłania listu bez tematu."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Potwierdzenie podczas opróżniania folderu przez użytkownika"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 "Potwierdzenie jeżeli użytkownik wypełnił tylko pole ukrytego adresata (Bcc)"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13733,34 +14181,26 @@ msgstr ""
 "Potwierdzanie przy wysyłaniu listów w formacie HTML do osób, które ich nie "
 "chcą."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr "Potwierdzanie przy wysyłaniu listu bez adresatów w polach Do lub Cc"
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Potwierdzenie przy próbie wysłania niepożądanego formatu HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Rozpoznawanie odnośników w tekście i zamienianie ich."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Rozpoznawanie buziek w tekście i zamienianie ich na obrazy."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Uruchomienie testu śmieci na nadchodzącej poczcie"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3tna 0pcja"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3tna 0pcja."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Domyślne wysłanie listu w formacie HTML"
@@ -13808,7 +14248,8 @@ msgid "Spell check inline"
 msgstr "Sprawdzanie pisowni"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
+#, fuzzy
+msgid "Subscribe dialog default height"
 msgstr "Domyślna wysokośc okna subskrypcji"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13951,33 +14392,65 @@ msgstr "portu uruchamianego przez użytkownika spamd"
 msgid "spamd port"
 msgstr "port spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Importer Elm Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Druid importu poczty Netscape dla Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Preferencje edytora listów"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Druid importu poczty Outlook Express 4 dla Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfiguracja preferencji dotyczących listów, m.in. bezpieczeństwa i "
+"wyświetlania"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Druid importu poczty Pine dla Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Konfiguracja dotycząca sprawdzania pisowni, podpisów i edytora listów"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Importer mbox Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfiguracja kont pocztowych"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Poczta Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola konfiguracji kont pocztowych Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponent poczty programu Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Edytor listów programu Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola konfiguracji programu do tworzenia listów Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola preferencji poczty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Konta pocztowe"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Ustawienia poczty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Poczta"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13985,15 +14458,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Poczekaj chwilę"
 
@@ -14022,18 +14495,46 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Importowanie \"%s\""
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Importowanie szkrzynki pocztowej"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Importer Elm Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Druid importu poczty Netscape dla Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Druid importu poczty Outlook Express 4 dla Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Druid importu poczty Pine dla Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Importer mbox Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbox)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Analizowanie %s"
@@ -14043,7 +14544,7 @@ msgstr "Analizowanie %s"
 msgid "Priority Filter \"%s\""
 msgstr "Filtr priorytetu \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14069,7 +14570,7 @@ msgstr ""
 "punktacji zamiast priorytetów. Sprawdź zaimportowane\n"
 "filtry, aby upewnić się, że wszystko działa jak powinno."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14081,7 +14582,7 @@ msgstr ""
 "Nie jest ona obsługiwana przez Evolution, więc\n"
 "zawierające ją filtry zostaną porzucone."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14095,23 +14596,23 @@ msgstr ""
 "zawierające ją filtry zostaną przekształcone, tak, aby\n"
 "sprawdzać, czy podany napis stanowi część treści listu."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje stare dane Netscape'a"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Importowanie danych Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filtry poczty"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14144,125 +14645,138 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Modyfikacja konta Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\n"
+"Please read carefully the license agreement\n"
+"for %s displayed below\n"
+"and tick the check box for accepting it\n"
+msgstr ""
+
+# FIXME - albo kluczowe uzgodnienie? 
+#: mail/mail-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Uzgodnienie kluczy"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Komputer:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Nazwa _użytkownika:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "Ś_cieżka:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "List do %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Tematem jest %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "List od %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "lista dyskusyjna %s"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Odpowiada do %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Dodanie reguły filtru"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d usunięto"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d śmieci"
 
 # FIXME - albo zmienić koncepcję nazwy :)
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d zapisanych"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d wysłanych"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d nie wysłanych"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d wszystkich"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d nieprzeczytanych"
 
-#: mail/mail-component.c:531
-#, c-format
-msgid ", %d selected"
-msgstr ", %d zaznaczonych"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nowy list"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_List"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Tworzy nowy list"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nowy folder poczty"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "F_older poczty"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Tworzy nowy folder poczty"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "Adres URI źródła listu wyświetlanego przez widok"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Sprawdzanie usługi"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Nawiązywanie połączenia z serwerem..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Tożsamość"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14272,12 +14786,12 @@ msgstr ""
 "jako \"opcjonalne\" nie muszą być wypełnione, chyba, że chcesz, aby "
 "znajdujące się w nich informacje były zawarte w wysyłanych listach."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Odbieranie poczty"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14286,15 +14800,15 @@ msgstr ""
 "pewności co do tych informacji, zapytaj administratora lub dostawcę "
 "Internetu (ISP)."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Wybierz spośród poniższych opcji"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Wysyłanie listów"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14303,11 +14817,11 @@ msgstr ""
 "pewności co do tych informacji, zapytaj administratora lub dostawcę "
 "Internetu (ISP)."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Zarządzanie kontami"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14321,14 +14835,6 @@ msgstr ""
 "tego konta. Nazwa będzie używana tylko przy wyświetlaniu celem odróżnienia "
 "go od innych kont."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Sprawdzanie usługi"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Nawiązywanie połączenia z serwerem..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr " _Sprawdź obsługiwane typy "
@@ -14619,7 +15125,8 @@ msgid "Execute Command..."
 msgstr "Wykonanie polecenia..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Stała szerokość:"
 
 #: mail/mail-config.glade.h:82
@@ -14929,11 +15436,64 @@ msgstr "kolor"
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Folder o nazwie \"{1}\" już istnieje. Użyj innej nazwy."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+msgid "Invalid authentication"
+msgstr "Błędne uwierzytelnienie"
+
+#. 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 ""
+"Ten serwer nie obsługuje tego rodzaju uwierzytelniania i może wogóle nie "
+"obsługiwać uwierzytelniania."
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr "Logowanie do serwera \"{0}\" jako \"{0}\" nie powiodło się."
+
+#. 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 ""
+"Sprawdź czy hasło zostało prawidłowo napisane. Pamiętaj, że wiele haseł jest "
+"wrażliwych na wielkość liter; może być włączony \"caps lock\"."
+
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Czy na pewno chcesz wysłać list w formacie HTML?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
+#, fuzzy
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Upewnij się, że wymienieni niżej odbiorcy chcą otrzymywać listy postaci "
+"HTML: {0} Mimo wszystko wysłać?"
+
+#: 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 "Wyś_lij"
+
+#. 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 "Czy na pewno chcesz wysłać list bez tematu?"
 
-#: mail/mail-errors.xml.in.h:2
+#. 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."
@@ -14941,11 +15501,67 @@ msgstr ""
 "Podanie tytułu opisującego wiadomość, pozwoli odbiorcom na wyobrażenie o "
 "zawartości listu."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Czy na pewno chcesz usunąć to konto?"
+#. 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 "Czy na pewno chcesz wysłać list tylko z ukrytymi adresatami (BCC)?"
 
-#: mail/mail-errors.xml.in.h:4
+#. 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: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:send-no-recipients primary
+#: mail/mail-errors.xml.h:34
+msgid ""
+"This message cannot be sent because you have not specified any Recipients"
+msgstr "List nie może zostać wysłany, gdyż nie podano żadnego odbiorcy"
+
+#. 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 ""
+"Wprowadź poprawny adres e-mail w polu Dla:. Możesz wyszukać adresy e-mail "
+"klikając na przycisku Dla: obok pola wejścia."
+
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr "Użyć domyślnego folderu szkiców?"
+
+#. 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 ""
+"Nie można otworzyć folderu szkiców dla tego konta. Czy chcesz zamiast tego "
+"wykorzystać systemowy folder szkiców?"
+
+#: mail/mail-errors.xml.h:41
+msgid "Use _Default"
+msgstr "_Domyślne"
+
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 msgid ""
 "Are you sure you want to permanently remove all the deleted message in "
 "folder \"{0}\"?"
@@ -14953,7 +15569,17 @@ msgstr ""
 "Czy na pewno chcesz trwale usunąć listy oznaczone do usunięcia z folderu "
 "\"{0}\"?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "W przypadku kontynuacji, nie będzie możliwości odtworzenia tego listu."
+
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
+msgstr "_Wyczyść"
+
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 msgid ""
 "Are you sure you want to permanently remove all the deleted messages in all "
 "folders?"
@@ -14961,367 +15587,368 @@ msgstr ""
 "Czy na pewno chcesz trwale usunąć listy oznaczone do usunięcia ze wszystkich "
 "folderów?"
 
-#: mail/mail-errors.xml.in.h:6
-msgid "Are you sure you want to send a message in HTML format?"
-msgstr "Czy na pewno chcesz wysłać list w formacie HTML?"
+#: mail/mail-errors.xml.h:51
+msgid "_Empty Trash"
+msgstr "Opróżnij śmi_etnik"
 
-#: mail/mail-errors.xml.in.h:7
-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)?"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Zostały niewysłane listy, czy mimo to chcesz zakończyć program?"
 
-#: mail/mail-errors.xml.in.h:8
-msgid "Are you sure you want to send a message without a subject?"
-msgstr "Czy na pewno chcesz wysłać list bez tematu?"
+#. 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 ""
+"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
+"uruchomienia programu Evolution."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
-msgstr "Ponieważ \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr "Wiadomość z tematem \"{0}\" nie została dostarczona."
 
-#: mail/mail-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr "Ponieważ \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
-msgstr "Ponieważ \"{2}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr "Błąd podczas {0}."
 
-#: mail/mail-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
-msgstr "Nie można dodać vFolderu \"{0}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr "{1}."
 
-#: mail/mail-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nie można skopiować folderu \"{0}\" do \"{1}\"."
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
+msgid "Error while performing operation."
+msgstr "Błąd przy wykonywaniu operacji."
 
-#: mail/mail-errors.xml.in.h:14
-msgid "Cannot create folder \"{0}\"."
-msgstr "Nie można utworzyć folderu \"{0}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr "{0}."
 
-#: mail/mail-errors.xml.in.h:15
-msgid "Cannot create temporary save directory."
-msgstr "Nie można utworzyć tymczasowego katalogu zapisu."
+#. 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 "{0}"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
+#, fuzzy
+msgid "Enter password."
+msgstr "Wprowadź hasło"
+
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
+msgstr "Błąd przy wczytywaniu definicji filtrów."
+
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+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/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
+msgid "Cannot save to file \"{0}\"."
+msgstr "Nie można zapisać do pliku \"{0}\"."
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 msgid "Cannot create the save directory, because \"{1}\""
 msgstr "Nie można utworzyć katalogu zapisu, ponieważ \"{1}\""
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+msgid "Cannot create temporary save directory."
+msgstr "Nie można utworzyć tymczasowego katalogu zapisu."
+
+#. 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 "Ponieważ \"{1}\"."
+
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+msgid "File exists but cannot overwrite it."
+msgstr "Plik istnieje, ale nie można go nadpisać."
+
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+msgid "File exists but is not a regular file."
+msgstr "Plik istnieje ale nie jest zwykłym plikiem."
+
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 msgid "Cannot delete folder \"{0}\"."
 msgstr "Nie można usunąć folderu \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:18
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 msgid "Cannot delete system folder \"{0}\"."
 msgstr "Nie można usunąć folderu systemowego \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:19
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Nie można zmodyfikować vFolderu \"{0}\" ponieważ on nie istnieje."
+#. mail:no-delete-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."
+msgstr ""
+"Foldery systemowe są wymagane do poprawnej pracy Ximian Evolution i nie mogą "
+"mieć zmienianych nazw, być usuwane bądź przenoszone."
+
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Nie można zmienić nazwy lub przenieść folderu systemowego \"{0}\"."
+
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+msgid "Delete \"{0}\"?"
+msgstr "Usunąć \"{0}\"?"
 
-#: mail/mail-errors.xml.in.h:20
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Czy rzeczywiście usunąć folder \"{0}\" i wszystkie jego podfoldery?"
+
+#. 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 ""
+"Jeżeli folder zostanie usunięty, cała jego zawartość łącznie z podfolderami "
+"zostanie trwale skasowana."
+
+#. 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 "Nie można zmienić nazwy \"{0}\" to \"{1}\"."
+
+#. mail:no-rename-folder-exists 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."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr "Ponieważ \"{2}\"."
+
+#. mail:no-move-folder-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/mail-errors.xml.in.h:21
-msgid "Cannot open source \"{1}\""
-msgstr "Nie można otworzyć źródła \"{1}\""
-
-#: mail/mail-errors.xml.in.h:22
+#. mail:no-move-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/mail-errors.xml.in.h:23
+#. mail:no-move-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/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr "Nie można zmienić nazwy \"{0}\" to \"{1}\"."
+#. mail:no-copy-folder-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}\"."
 
-#: mail/mail-errors.xml.in.h:25
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nie można zmienić nazwy lub przenieść folderu systemowego \"{0}\"."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nie można utworzyć folderu \"{0}\"."
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+msgid "Cannot open source \"{1}\""
+msgstr "Nie można otworzyć źródła \"{1}\""
 
-#: mail/mail-errors.xml.in.h:26
+#. mail:account-incomplete 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."
 
-#: mail/mail-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Nie można zapisać do katalogu \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:28
-msgid "Cannot save to file \"{0}\"."
-msgstr "Nie można zapisać do pliku \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Nie można ustawić treści podpisu \"{0}\"."
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
-msgstr ""
-"Sprawdź czy hasło zostało prawidłowo napisane. Pamiętaj, że wiele haseł jest "
-"wrażliwych na wielkość liter; może być włączony \"caps lock\"."
-
-#: mail/mail-errors.xml.in.h:31
-msgid "Could not save signature file."
-msgstr "Nie można zapisać pliku z podpisem."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Nie zostały podane wszystkie wymagane informacje."
 
-#: mail/mail-errors.xml.in.h:32
-msgid "Delete \"{0}\"?"
-msgstr "Usunąć \"{0}\"?"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Nie można utworzyć dwóch kont o tej samej nazwie."
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 msgid "Delete account?"
 msgstr "Usunąć konto?"
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
-msgstr "Porzucić zmiany?"
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Czy na pewno chcesz usunąć to konto?"
 
-#: mail/mail-errors.xml.in.h:35
-msgid "Do you wish to save your changes?"
-msgstr "Czy chcesz zapisać zmiany?"
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
+msgstr "W przypadku kontynuacji, informacje o koncie będą trwale usunięte."
 
-#: mail/mail-errors.xml.in.h:36
+#: mail/mail-errors.xml.h:169
 msgid "Don't delete"
 msgstr "Nie usuwaj"
 
-#: mail/mail-errors.xml.in.h:37
-#, fuzzy
-msgid "Enter password."
-msgstr "Wprowadź hasło"
-
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
-msgstr "Błąd przy wczytywaniu definicji filtrów."
-
-#: mail/mail-errors.xml.in.h:39
-msgid "Error while performing operation."
-msgstr "Błąd przy wykonywaniu operacji."
-
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
-msgstr "Błąd podczas {0}."
-
-#: mail/mail-errors.xml.in.h:41
-msgid "File exists but cannot overwrite it."
-msgstr "Plik istnieje, ale nie można go nadpisać."
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+msgid "Could not save signature file."
+msgstr "Nie można zapisać pliku z podpisem."
 
-#: mail/mail-errors.xml.in.h:42
-msgid "File exists but is not a regular file."
-msgstr "Plik istnieje ale nie jest zwykłym plikiem."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
+msgstr "Ponieważ \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:43
-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."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Nie można ustawić treści podpisu \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
-"Jeżeli folder zostanie usunięty, cała jego zawartość łącznie z podfolderami "
-"zostanie trwale skasowana."
-
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr "W przypadku kontynuacji, informacje o koncie będą trwale usunięte."
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
-"W przypadku zakończenia, te wiadomości nie będą wysłane do czasu następnego "
-"uruchomienia programu Evolution."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
+msgstr "Porzucić zmiany?"
 
-#: mail/mail-errors.xml.in.h:47
-msgid "Invalid authentication"
-msgstr "Błędne uwierzytelnienie"
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+msgid "Do you wish to save your changes?"
+msgstr "Czy chcesz zapisać zmiany?"
 
-# FIXME - a może inaczej?
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr "Filtry pocztowe zostały automatycznie zaktualizowane."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
+msgstr "Podpis został zmieniony, lecz zmiany nie zostały zapisane."
 
-#: mail/mail-errors.xml.in.h:49
-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-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Porzuć zmiany"
 
-#: mail/mail-errors.xml.in.h:50
-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 ""
-"Wprowadź poprawny adres e-mail w polu Dla:. Możesz wyszukać adresy e-mail "
-"klikając na przycisku Dla: obok pola wejścia."
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Nie można zmodyfikować vFolderu \"{0}\" ponieważ on nie istnieje."
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
-"Upewnij się, że wymienieni niżej odbiorcy chcą otrzymywać listy postaci "
-"HTML: {0} Mimo wszystko wysłać?"
-
-#: mail/mail-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Czy rzeczywiście usunąć folder \"{0}\" i wszystkie jego podfoldery?"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-"Foldery systemowe są wymagane do poprawnej pracy Ximian Evolution i nie mogą "
-"mieć zmienianych nazw, być usuwane bądź przenoszone."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr "Nie można dodać vFolderu \"{0}\"."
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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 ""
+# FIXME - na 100%?
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr "vFoldery zostały automatycznie zaktualizowane."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
 msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "Poniższe vFoldery:\n"
 "%sUżywały usuniętego folderu:\n"
 "   \"%s\"\n"
 "I zostały zaktualizowane."
 
-#: mail/mail-errors.xml.in.h:56
+# FIXME - a może inaczej?
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr "Filtry pocztowe zostały automatycznie zaktualizowane."
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "Poniższe vFoldery:\n"
 "%sUżywały usuniętego folderu:\n"
 "   \"%s\"\n"
 "I zostały zaktualizowane."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr "List nie może zostać wysłany, gdyż nie podano żadnego odbiorcy"
-
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+"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 ""
-"Ten serwer nie obsługuje tego rodzaju uwierzytelniania i może wogóle nie "
-"obsługiwać uwierzytelniania."
-
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
-msgstr "Podpis został zmieniony, lecz zmiany nie zostały zapisane."
 
-#: mail/mail-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
-"Nie można otworzyć folderu szkiców dla tego konta. Czy chcesz zamiast tego "
-"wykorzystać systemowy folder szkiców?"
 
-#: mail/mail-errors.xml.in.h:64
-msgid "Use _Default"
-msgstr "_Domyślne"
-
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
-msgstr "Użyć domyślnego folderu szkiców?"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Nie zostały podane wszystkie wymagane informacje."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Zostały niewysłane listy, czy mimo to chcesz zakończyć program?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Nie można utworzyć dwóch kont o tej samej nazwie."
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr "Logowanie do serwera \"{0}\" jako \"{0}\" nie powiodło się."
-
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
-msgstr "Wiadomość z tematem \"{0}\" nie została dostarczona."
-
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Porzuć zmiany"
-
-#: mail/mail-errors.xml.in.h:72
-msgid "_Empty Trash"
-msgstr "Opróżnij śmi_etnik"
-
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
-msgstr "_Wyczyść"
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Nadpisz"
 
-#: mail/mail-errors.xml.in.h:74
-msgid "_Send"
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
 msgstr "Wyś_lij"
 
-# FIXME - na 100%?
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
-msgstr "vFoldery zostały automatycznie zaktualizowane."
-
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr "{0}"
-
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr "{0}."
-
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr "{1}"
-
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr "{1}."
-
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Odpytywanie %s"
@@ -15330,21 +15957,21 @@ msgstr "Odpytywanie %s"
 msgid "Working"
 msgstr "Wykonywanie operacji"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrowanie folderu"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Pobieranie poczty"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Zastosowanie filtrów wychodzących nie powiodło się: %s"
 
 # FIXME - jakieś takie kwadratowe to zdanie
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15353,101 +15980,101 @@ msgstr ""
 "Nie powiodło się dodanie do %s: %s\n"
 "Zamiast tego będzie dodanie do folderu \"Wysłane\"."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Dodanie do lokalanego folderu \"Wysłane\" nie powiodło się: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Wysyłanie %d. listu z %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Niepowodzenie przy wysyłaniu %d z %d listów"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Gotowe."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Zapisywanie listu w folderze"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Przenoszenie listów do %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiowanie listów do %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Analizowanie folderów w \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Przesłane listy"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otwieranie folderu %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Otwieranie miejsca przechowywania %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Usuwanie folderu %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Zapisywanie folderu \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Oczyszczanie i zapisywanie konta \"%s\""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Zapisywanie konta \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Odświeżanie folderu"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Oczyszczanie folderu"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Opróżnianie śmietnika w \"%s\""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokalne foldery"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Pobieranie listu %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15455,7 +16082,7 @@ msgstr[0] "Pobieranie %d listu"
 msgstr[1] "Pobieranie %d listów"
 msgstr[2] "Pobieranie %d listów"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15463,7 +16090,7 @@ msgstr[0] "Zapisywanie %d listu"
 msgstr[1] "Zapisywanie %d listów"
 msgstr[2] "Zapisywanie %d listów"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15472,7 +16099,7 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15481,11 +16108,11 @@ msgstr ""
 "Błąd przy zapisie listów do: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Zapisywanie załącznika"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15494,17 +16121,17 @@ msgstr ""
 "Nie można utworzyć pliku wyjściowego: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie można zapisać danych: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odłączanie od %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponowne nawiązywanie połączenia z %s"
@@ -15568,24 +16195,24 @@ msgstr "Aktualizowanie..."
 msgid "Waiting..."
 msgstr "Oczekiwanie..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Operacja anulowana przez użytkownika."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Wprowadź hasło dla %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Wprowadź hasło"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Zapamiętanie hasła"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamiętanie tego hasła na czas bieżącej sesji"
 
@@ -15627,89 +16254,94 @@ msgstr "Przesłany list"
 msgid "Invalid folder: `%s'"
 msgstr "Niepoprawny folder: \"%s\""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ustawianie vfolderu: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Aktualizowanie vfolderów pod uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Aktualizowanie vfolderów pod uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFoldery"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Modyfikacja VFoldera"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nowy VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Niewidziany"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Widziany"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Z odpowiedzią"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Wiele niewidzianych listów"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Wiele listów"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Najniższy"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Niższy"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Wyższy"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Najwyższy"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Dziś %k:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Wczoraj %k:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %k:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Aktualizowanie zestawienia listów"
 
@@ -15743,44 +16375,44 @@ msgid "Size"
 msgstr "Rozmiar"
 
 # FIXME - albo inaczej?
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Wywołaj"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Bez przekazywania"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Kontynuuj"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Do twojej informacji"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Prześlij"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Odpowiedź niekonieczna"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odpowiedz"
 
-#: mail/message-tag-followup.c:70 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 "Wszystkim"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Recenzja"
 
 # FIXME - Albo Zaznacz by kontynuować
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Znacznik kontynuacji"
 
@@ -15824,51 +16456,31 @@ msgstr "_Zasubskrybuj"
 msgid "_Unsubscribe"
 msgstr "O_dsubskrybuj"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Powłoka Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Test Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Testowy składnik Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Domyślna grupa skrótów"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Domyślna szerokość paska folderów"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Domyślna szerokość paska skrótów"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Domyślna wysokość okna"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Domyślna szerokość okna"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Wersja konfiguracji Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "ID lub alias składnika domyślnie wyświetlanego przy uruchomieniu."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -15876,7 +16488,7 @@ msgstr ""
 "Jeżeli ustawione, program Evolution będzie uruchomiony w trybie bez "
 "podłączenia do sieci, zamiast z podłączeniem."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -15884,63 +16496,23 @@ msgstr ""
 "Jeżeli ustawione, okno ostrzegające o rozwojowej wersji Evolution nie będzie "
 "wyświetlane."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ścieżek do folderów synchronizowanych na dysk, dla użytku bez "
 "podłączenia do sieci"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Ścieżka do domyślnego folderu kalendarza"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Ścieżka do domyślnego folderu kontaktów"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Ścieżka do domyślnego folderu poczty"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Ścieżka do domyślnego folderu zadań"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Fizyczny adres URI domyślnego folderu kalendarza"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Fizyczny adres URI domyślnego folderu kontaktów"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Fizyczny adres URI domyślnego folderu poczty"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Fizyczny adres URI domyślnego folderu zadań"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Określa, czy wyświetlać pasek folderów"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Określa, czy wyświetlać pasek skrótów"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "poczta"
 
@@ -15948,6 +16520,32 @@ msgstr "poczta"
 msgid "Brought to you by"
 msgstr "Dostarczone przez"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Nieznany błąd"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Niepoprawny argumenty"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Nie można dokonać rejestracji na serwerze OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Nie odnaleziono bazy danych konfiguracji"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Błąd ogólny"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez nazwy)"
@@ -16086,11 +16684,11 @@ msgstr "Nie można uruchomić importera"
 msgid "_Import"
 msgstr "Za_importuj"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Zamykanie połączeń..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Ustawienia Evolution"
 
@@ -16132,11 +16730,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Program Ximian 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Program Ximian Evolution jest w trakcie rozłączania z siecią."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Program Ximian Evolution jest obecnie rozłączony. Kliknij na tym przycisku "
+"aby pracować w trybie podłączenia do sieci."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "List do %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Błąd przy wykonywaniu %s."
@@ -16150,14 +16772,15 @@ msgid "Bug buddy could not be run."
 msgstr "Nie można uruchomić Bug buddy."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Informacje o programie Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Praca _z podłączeniem"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Praca _bez podłączenia"
 
@@ -16165,51 +16788,6 @@ msgstr "Praca _bez podłączenia"
 msgid "Work Offline"
 msgstr "Praca bez podłączenia"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Program Ximian Evolution jest obecnie podłączony do sieci. Kliknij na tym "
-"przycisku aby pracować w trybie odłączenia od sieci."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Program Ximian Evolution jest w trakcie rozłączania z siecią."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Program Ximian Evolution jest obecnie rozłączony. Kliknij na tym przycisku "
-"aby pracować w trybie podłączenia do sieci."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Ostrzeżenie: Program Evolution nie może uaktualnić wszystkich danych z "
-"wersji %d.%d.%d.\n"
-"Dane nie zostały usunięte, ale nie będą widoczne w tej wersji Evolution.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Niepoprawny argumenty"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Nie można dokonać rejestracji na serwerze OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Nie odnaleziono bazy danych konfiguracji"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Błąd ogólny"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Pole wyboru"
@@ -16281,6 +16859,51 @@ msgstr ""
 "Kliknij OK, aby zamknąć powyższe połączenia i przejść w tryb bez podłączenia "
 "do sieci"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "K_alendarz"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakty: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Poczta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "_Zadania"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "_Typ pliku:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Folder z _wysłanymi listami:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "_Nazwa konta:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nazwa folderu"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "Nazwa _użytkownika:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Druid ustawień Evolution"
@@ -16323,6 +16946,18 @@ msgstr ""
 "\n"
 "Aby zapisać ustawienia, kliknij przycisk \"Zastosuj\"."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Powłoka Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Test Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Testowy składnik Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16384,13 +17019,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Można zaimportować do Evolution dane z następujących plików:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16419,57 +17054,49 @@ msgstr ""
 "Mamy nadzieję, że spodobają ci się wyniki naszej ciężkiej pracy,\n"
 "my zaś będziemy oczekiwać z niecierpliwością na na twoje wsparcie!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Dzięki\n"
 "Zespół Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nie informuj mnie ponownie"
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Nie można zarejestrować powłoki Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Nie można zainicjować powłoki Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Rozpoczyna Evolution aktywując podany komponent"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Rozpoczyna w trybie bez podłączenia"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Rozpoczyna w trybie z podłączeniem"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Wymusza zamknięcie wszystkich komponentów Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Wymusza ponowną migrację z Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Zapisuje do pliku informacje dotyczące przebiegu wykonania komponentów."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16478,13 +17105,79 @@ msgstr ""
 "%s: Nie można jednocześnie użyć opcji --online i --offline.\n"
 "  Aby uzyskać więcej informacji, uruchom %s --help.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Nawiązywanie połączenia"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Nie można zarejestrować powłoki Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Druid kont Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Nazwa certyfikatu"
 
@@ -16721,11 +17414,6 @@ msgstr "W ewidencji dostępne są certyfikaty identyfikujące następujące osob
 msgid "Your Certificates"
 msgstr "Dostępne certyfikaty"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Certyfikat już istnieje"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -16926,6 +17614,11 @@ msgstr "Unikalne ID tematu"
 msgid "Certificate Signature Value"
 msgstr "Wartość podpis certyfikatu"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Certyfikat już istnieje"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Hasło pliku PKCS12"
@@ -16965,12 +17658,12 @@ msgstr "Domyślny temat listu."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nie można uruchomić \"%s\": %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Zamykanie %s (%s)\n"
@@ -17034,7 +17727,8 @@ msgid "Select all contacts"
 msgstr "Zaznacza wszystkie kontakty"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Wysyła list do wybranych kontaktów"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17065,8 +17759,8 @@ msgstr "Wyświetla bieżący kontakt"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "Ak_cje"
@@ -17084,7 +17778,8 @@ msgid "_Preview Pane"
 msgstr "_Podgląd listu"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Z_apisz w formacie VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17208,10 +17903,20 @@ msgstr "Wyświetla bieżący termin"
 msgid "Week"
 msgstr "Tydzień"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Tydzień roboczy"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otówrz termin"
 
+#: 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 "Zam_knij"
+
 #: 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
@@ -17533,6 +18238,16 @@ 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
+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
+msgid "_Close"
+msgstr "Zam_knij"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _nadawcę do książki adresowej"
@@ -17772,7 +18487,8 @@ msgid "Open the selected message in a new window"
 msgstr "Otwiera zaznaczony list w nowym oknie"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 "Otwiera zaznaczony list w oknie redagowania umożliwiając jego ponowne "
 "wysłanie"
@@ -17889,58 +18605,46 @@ msgstr "VFolder w oparciu o _temat..."
 msgid "_Attached"
 msgstr "_Załączony"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "S_kopiuj do folderu"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Utwórz filtr na podstawie listu"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Przejdź do"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "W _treści listu"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Większe"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Wyświetlanie lis_tu"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "P_rzenieś do folderu"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Kolejny list"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Zwykłe wyświetlanie"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Otwórz list"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Poprzedni list"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "Jako _cytat"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Wyślij p_onownie..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Narzędzia"
@@ -17949,16 +18653,6 @@ msgstr "_Narzędzia"
 msgid "_Undelete"
 msgstr "_Cofnij usunięcie"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "Zam_knij"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Załącz"
@@ -18348,6 +19042,11 @@ msgstr "_Szybki odnośnik"
 msgid "_Send / Receive"
 msgstr "Wyślij / _Odbierz"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "No_we okno"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Według _firmy"
@@ -18412,10 +19111,6 @@ msgstr "Z datą zakończenia"
 msgid "With _Status"
 msgstr "Ze _stanem"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zadania"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18571,6 +19266,35 @@ msgstr "Inny..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Poczta Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informacje o spotkaniu"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Test Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Czcionki drukowane</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Rozwinięty"
@@ -18684,6 +19408,31 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Znajdź _teraz"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 istnieje.\n"
+"Czy chcesz go nadpisać?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Nie można zapisać do pliku \"{0}\"."
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Nie można zapisać do pliku \"{0}\"."
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18694,6 +19443,151 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (zakończono %d%%)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Przeglądarka folderów książki adresowej Evolution"
+
+#~ msgid "Address 2:"
+#~ msgstr "Adres 2:"
+
+#~ msgid "Blog:"
+#~ msgstr "Blog:"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Przeglądarka kalendarza Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Przeglądarka zadań Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nie można zainicjować gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nie można otworzyć folderu o URI \"%s\""
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI wyświetlany przez kalendarz"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Typ wyświetlanego widoku"
+
+#~ msgid "Display a message"
+#~ msgstr "Wyświetlenie komunikatu"
+
+#~ msgid "Alerts"
+#~ msgstr "Alarmy"
+
+#~ msgid "Time"
+#~ msgstr "Czas"
+
+#~ msgid "_General"
+#~ msgstr "Ogó_lne"
+
+#~ msgid "Select source"
+#~ msgstr "Wybierz źródło"
+
+#~ msgid "calendar"
+#~ msgstr "kalendarz"
+
+#~ msgid "task list"
+#~ msgstr "lista zadań"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Nie można uaktualnić pliku kalendarza!\n"
+
+#~ msgid ""
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "Wspomaganie zadania dla\n"
+#~ "%s\n"
+#~ " spowodowało błąd."
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI folderu zadań, który należy wyświetlić"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nie można wczytać zadania w \"%s\""
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Przeglądarka folderu pocztowego Evolution"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder w oparciu o _wątek"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtr w oparciu o wątek"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Nie można zmigrować buforów UID pop3: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Nie można zmigrować stanu rozwinięcia folderu: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Nie można otworzyć magazynu dla \"%s\": %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3tna 0pcja"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3tna 0pcja."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Adres URI źródła listu wyświetlanego przez widok"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Domyślna grupa skrótów"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Domyślna szerokość paska skrótów"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Ścieżka do domyślnego folderu kalendarza"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Ścieżka do domyślnego folderu kontaktów"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Ścieżka do domyślnego folderu poczty"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Ścieżka do domyślnego folderu zadań"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Fizyczny adres URI domyślnego folderu kalendarza"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Fizyczny adres URI domyślnego folderu kontaktów"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Fizyczny adres URI domyślnego folderu poczty"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Fizyczny adres URI domyślnego folderu zadań"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Określa, czy wyświetlać pasek folderów"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Określa, czy wyświetlać pasek skrótów"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Ostrzeżenie: Program Evolution nie może uaktualnić wszystkich danych z "
+#~ "wersji %d.%d.%d.\n"
+#~ "Dane nie zostały usunięte, ale nie będą widoczne w tej wersji Evolution.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Nie można zainicjować powłoki Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Wyślij p_onownie..."
+
 #~ msgid "Enter password for {0}"
 #~ msgstr "Wprowadź hasło dla {0}"
 
@@ -18735,13 +19629,6 @@ msgstr "%s (zakończono %d%%)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nie można skopiować deskryptora: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -18847,9 +19734,6 @@ msgstr "%s (zakończono %d%%)"
 #~ "\n"
 #~ "Czy rzeczywiście usunąć te listy?"
 
-#~ msgid "The following filter rule(s):\n"
-#~ msgstr "Następujące reguły filtru:\n"
-
 #~ msgid ""
 #~ "Used the removed folder:\n"
 #~ "    '%s'\n"
diff --git a/po/pt.po b/po/pt.po
index 689f5698b7..82461a911b 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -7,14 +7,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: 2.6\n"
-"Report-Msgid-Bugs-To: Duarte Loreto <happyguy_pt@hotmail.com>\n"
-"POT-Creation-Date: 2004-05-16 20:07+0100\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8-bit\n"
+"Report-Msgid-Bugs-To: Duarte Loreto <happyguy_pt@hotmail.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: a11y/addressbook/ea-addressbook-view.c:94
@@ -136,15 +136,15 @@ 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"
 
-#: addressbook/gui/component/addressbook-config.c:1242
+#: 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:1263
+#: 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:1271
+#: 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"
 
@@ -163,7 +163,7 @@ msgstr "A migrar `%s':"
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: 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:244
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Neste Computador"
 
@@ -236,7 +236,8 @@ msgstr ""
 #, 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?"
+"O livro de endereços '%s' será removido. Tem a certeza de que deseja "
+"continuar?"
 
 #: addressbook/gui/component/addressbook-view.c:761
 msgid "New Address Book"
@@ -263,7 +264,7 @@ msgstr "Propriedades..."
 #.
 #. name = e_book_get_name (book);
 #: addressbook/gui/component/addressbook-view.c:1002
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: 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"
@@ -290,46 +291,55 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI da última pasta utilizada no diálogo de selecção de nomes"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Completar Automaticamente"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contactos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificados"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Configurar aqui o completar automaticamente"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Livro de Endereços Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Popup de endereços do Livro de Endereços Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Visualizador de endereços do Livro de Endereços Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Visualizador de cartões do Livro de Endereços Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Componente de Livro de Endereços Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Controlo de Gestão de Certificados S/Mime do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Controlo de definições de configuração de pasta do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 msgid "Manage your S/MIME certificates here"
 msgstr "Efectue aqui a gestão dos seus certificados S/MIME"
 
@@ -858,9 +868,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:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
@@ -894,7 +904,7 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -902,7 +912,7 @@ msgid "Contact"
 msgstr "Contacto"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1526
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor de Contactos"
 
@@ -923,7 +933,7 @@ msgid "Full _Name..."
 msgstr "_Nome Completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Casa"
@@ -968,7 +978,7 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Outro"
@@ -999,7 +1009,7 @@ msgstr "Câmara web:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: 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
@@ -1047,13 +1057,13 @@ msgstr ""
 "apagar este contacto?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2034,65 +2044,76 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbabué"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Livro de Origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Livro de Destino"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "É um Novo Contacto"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Campos Editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: 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:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Este contacto pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1934
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
 msgid ""
 "The following entries are invalid:\n"
 "\n"
@@ -2100,7 +2121,7 @@ msgstr ""
 "As seguintes entradas são inválidas:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: 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'"
@@ -2352,143 +2373,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Procura Avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Membros da Lista"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Organização"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Cargo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Vídeo-Conferência"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Telefone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "emprego"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefone Celular"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "pessoal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Título do Cargo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "Email"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Página pessoal"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Sucesso"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Módulo de suporte ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Repositório desligado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 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:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 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:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Autorização negada"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contacto não foi encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 msgid "Contact ID already exists"
 msgstr "ID de contacto já existe"
 
 #. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocolo não é suportado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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
@@ -2501,37 +2523,37 @@ msgid "Cancelled"
 msgstr "Cancelado"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Incapaz de cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Autenticação Falhou"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autenticação Requerida"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "Origem inexistente"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: 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."
@@ -2539,7 +2561,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:109
+#: 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."
@@ -2547,7 +2569,7 @@ 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:114
+#: 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 "
@@ -2557,7 +2579,7 @@ msgstr ""
 "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:123
+#: 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."
@@ -2565,11 +2587,11 @@ 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:140
+#: 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:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2581,7 +2603,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:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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"
@@ -2593,55 +2615,55 @@ 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:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 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:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 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:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: 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:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Erro ao adicionar a lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Erro ao adicionar o contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Erro ao alterar a lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Erro ao alterar o contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Erro ao remover a lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Erro ao remover o contacto"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2650,7 +2672,7 @@ msgstr ""
 "Abrir %d contactos irá abrir %d novas janelas.\n"
 "Deseja mesmo visualizar todos estes contactos?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2659,49 +2681,49 @@ msgstr ""
 "%s já existe\n"
 "Deseja sobrepo-lo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Sobrepor"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: 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:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Mover contacto para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Copiar contacto para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Mover contactos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Copiar contactos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Seleccionar o livro de endereços de destino."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "Múltiplos VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard de %s"
@@ -2846,7 +2868,8 @@ msgstr "Livro de Endereços"
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
 #: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Gravar como um VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2923,7 +2946,7 @@ msgid "Paste"
 msgstr "Colar"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Vista Actual"
 
@@ -3533,24 +3556,24 @@ msgstr "_Editar compromisso"
 msgid "_Snooze"
 msgstr "_Adiar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Desactivar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Desactivar Todas"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nenhuma descrição disponível."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3563,12 +3586,12 @@ msgstr ""
 "Iniciar a %s\n"
 "Terminar a %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Aviso"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3580,7 +3603,7 @@ msgstr ""
 "configurado para enviar um email.  O Evolution\n"
 "irá apresentar um diálogo de lembrete normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3597,7 +3620,7 @@ msgstr ""
 "\n"
 "Tem a certeza que deseja executar esta aplicação?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Não perguntar novamente sobre esta aplicação."
 
@@ -3605,15 +3628,11 @@ msgstr "Não perguntar novamente sobre esta aplicação."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de alarme de notificação do Calendário Evolution"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Incapaz de inicializar o Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Incapaz de inicializar o gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Incapaz de criar a fábrica de serviço de alarme de notificação"
 
@@ -3722,30 +3741,34 @@ msgid "Weekday the week starts on"
 msgstr "Dia da semana em que se inicia a semana"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Se pedir confirmação ao apagar compromissos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Se pedir confirmação ao expurgar a pasta"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Se esconder as tarefas terminadas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Se definir um lembrete por omissão para os eventos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Se apresentar as horas no formato 24h em vez de utilizar am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 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:116 calendar/gui/calendar-component.c:552
+#: 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
@@ -3753,7 +3776,7 @@ msgstr "Se apresentar os números das semanas no navegador de datas"
 msgid "Calendar"
 msgstr "Calendário"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3763,36 +3786,36 @@ msgstr ""
 "que o perído de tempo seleccionado. Se continuar, não lhe será possível "
 "recuperar estas tarefas."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Expurgar eventos mais antigos do que"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dias"
 
-#: calendar/gui/calendar-commands.c:431 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.
-#: calendar/gui/calendar-commands.c:434 calendar/gui/calendar-component.c:507
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
@@ -3801,7 +3824,7 @@ 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:464 calendar/gui/calendar-component.c:533
+#: 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"
@@ -3838,7 +3861,7 @@ msgstr ""
 "eventos. Seleccione um calendário para o qual possua permissões de escrita."
 
 #: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Calendários"
 
@@ -3936,15 +3959,15 @@ msgstr "Localização contém"
 msgid "Unmatched"
 msgstr "Sem equivalência"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir o calendário"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Método não suportado ao abrir o calendário"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Autorização negada ao abrir o calendário"
 
@@ -4037,14 +4060,14 @@ msgstr "Simples"
 msgid "Date/Time:"
 msgstr "Data/Hora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Apresentar uma mensagem"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Reproduzir um som"
 
+#: 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 "Lembretes"
@@ -4567,7 +4590,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:1037
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
 #: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Gravar como..."
@@ -4729,27 +4752,27 @@ msgstr "Delegar A:"
 msgid "Enter Delegate"
 msgstr "Introduzir Delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Recorrência"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Calendarização"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Reunião"
 
@@ -4849,8 +4872,8 @@ msgstr "Hora de _início:"
 #: 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:925 mail/mail-account-gui.c:1559
-#: mail/mail-account-gui.c:2039 mail/mail-config.glade.h:100
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
+#: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: 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
@@ -4876,8 +4899,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2619 mail/em-folder-view.c:916
+#: 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
 #: 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
@@ -5149,8 +5172,9 @@ msgid "Save Event"
 msgstr "Gravar o Evento"
 
 #: calendar/gui/dialogs/select-source-dialog.c:65
-msgid "Select source"
-msgstr "Seleccionar a origem"
+#, fuzzy
+msgid "Select destination"
+msgstr "Seleccionar o destino %s"
 
 #: calendar/gui/dialogs/select-source-dialog.c:86
 msgid "_Destination"
@@ -5195,7 +5219,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:928
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Alta"
 
@@ -5209,14 +5233,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:926
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 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:927
+#: mail/message-list.c:957
 msgid "Normal"
 msgstr "Normal"
 
@@ -5417,7 +5441,7 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo despoletado desconhecido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2332
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Clicar para abrir %s"
@@ -5526,8 +5550,8 @@ 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:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:891 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Abrir"
 
@@ -5536,15 +5560,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:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:893 mail/em-popup.c:690 mail/em-popup.c:806
+#: 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
 #: 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:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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
 #: ui/evolution-tasks.xml.h:25
@@ -5552,23 +5576,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:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: 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:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2612 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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
 msgid "_Paste"
@@ -5634,67 +5659,67 @@ msgstr "Resumo"
 msgid "Task sort"
 msgstr "Ordenação de tarefas"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Novo _Compromisso..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Novo _Evento de Dia Completo"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nova Reunião"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nova Tarefa"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "Seleccionar _Hoje"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "_Seleccionar a Data..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Cop_iar para o Calendário..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Mo_ver para o Calendário..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "A_gendar Reunião..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Reenviar como iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Apagar esta _Ocorrência"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "_Apagar Todas as Ocorrências"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Ir para _Hoje"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Ir para uma Data..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Configuraçõe_s..."
 
@@ -5712,7 +5737,7 @@ msgstr "Data de Início"
 #: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
+#: 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
@@ -5721,8 +5746,9 @@ msgstr "Data de Início"
 #: 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:1046
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Desconhecida"
 
@@ -6477,7 +6503,7 @@ msgid "Expunging"
 msgstr "A expurgar"
 
 #: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: 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/importers/icalendar-importer.c:79
@@ -6510,37 +6536,55 @@ msgid "Purging"
 msgstr "A expurgar"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Calendário e Tarefas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configure o seu fuso-horário. Calendário e Lista de Tarefas aqui "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Calendário e Tarefas Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Controlo de configuração de Calendário Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visualizador de mensagem de agendamento do Calendário Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor de Calendário/Tarefas Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Componente de Calendário Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Evolution's Tasks component"
 msgstr "Componente de Tarefas Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendários"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tarefas"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6920,7 +6964,7 @@ msgid "Contacts: "
 msgstr "Contactos: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Antever a Impressão"
 
@@ -6949,7 +6993,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:499
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8665,7 +8709,7 @@ msgstr "Copiar conteúdo da pasta localmente para trabalhar em modo desligado"
 msgid "Downloading new messages for offline mode"
 msgstr "A efectuar download de novas mensagens para o modo desligado"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "A preparar a pasta '%s' para trabalhar em modo desligado"
@@ -8812,7 +8856,8 @@ msgid "(match-all) requires a single bool result"
 msgstr "(coincidir-todas) requer um único resultado boleano"
 
 #: camel/camel-folder-search.c:755
-msgid "(match-threads) now allowed inside match-all"
+#, fuzzy
+msgid "(match-threads) not allowed inside match-all"
 msgstr "(coincidir-árvores) agora permitido dentro de coincidir-todas"
 
 #: camel/camel-folder-search.c:758 camel/camel-folder-search.c:762
@@ -8832,7 +8877,7 @@ msgstr "(coincidir-árvores) requer um conjunto de pastas"
 msgid "Performing query on unknown header: %s"
 msgstr "A efectuar a procura num cabeçalho desconhecido: %s"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8843,15 +8888,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Falha ao parsear a dica de id de utilizador gpg."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Falha ao parsear o pedido de frase-senha gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8860,28 +8905,28 @@ msgstr ""
 "Necessita de uma frase-senha para destrancar a chave\n"
 "para o utilizador: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 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 mail/mail-ops.c:706
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Cancelado."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Falha ao destrancar a chave secreta: indicadas 3 frases-senha incorrectas."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Resposta inesperada do GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Falha ao encriptar: Nenhum destinatário válido especificado."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8892,61 +8937,61 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Falha ao executar o GPG sobre %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Incapaz de gerar os dados de assinatura: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Falha ao executar o gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Falha ao executar o gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 ""
 "Incapaz de verificar a assinatura da mensagem: Formato de mensagem incorrecto"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Incapaz de verificar a assinatura da mensagem: incapaz de criar um ficheiro "
 "temporário: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Incapaz de gerar os dados de encriptação: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem digitalmente encriptada"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Conteúdo encriptado"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Incapaz de parsear o conteúdo da mensagem"
 
@@ -9251,7 +9296,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:1207
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Resposta de autenticação do servidor inválida."
 
@@ -9466,7 +9511,7 @@ msgstr "Incapaz de criar o contexto de encodificação"
 msgid "Failed to add data to CMS encoder"
 msgstr "Falha ao adicionar dados ao codificador CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Falha ao codificar os dados"
 
@@ -9526,91 +9571,93 @@ msgstr "Incapaz de calcular o resumo"
 msgid "Cannot set message digests"
 msgstr "Incapaz de definir o resumo da mensagem"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Falha na importação do certificado"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+#, fuzzy
+msgid "Certificate only message, cannot verify certificates"
 msgstr "Mensagem apenas de certificado, incapaz de verificar os certificados"
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+#, fuzzy
+msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensagem apenas de certificado, certificados importados e verificados"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Incapaz de encontrar o resumo de assinatura"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Assinante: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Falha no descodificador"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Incapaz de encontrar o certificado para `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Incapaz de encontrar o algorítmo de encriptação em grupo"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Incapaz de alocar espaço para a chave de encriptação em grupo"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Incapaz de criar Mensagem CMS"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Incapaz de criar EnvelopedData CMS"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Incapaz de anexar EnvelopedData CMS"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Incapaz de anexar objecto de dados CMS"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Incapaz de criar RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Incapaz de adicionar RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Incapaz de criar contexto de codificador"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Falha ao adicionar dados ao codificador"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Falha no descodificador, erro %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Desencriptação S/MIME: Nenhum conteúdo encriptado encontrado"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "importar chaves: não implementado"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "exportar chaves: não implementado"
 
@@ -9627,16 +9674,26 @@ msgstr "Incapaz de criar a pasta `%s': pasta já existe"
 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Incapaz de apagar a pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Lixo"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Não Solicitado"
@@ -9860,12 +9917,12 @@ msgstr "Incapaz de parsear o URL `%s'"
 msgid "Error storing `%s': %s"
 msgstr "Erro ao armazenar `%s': %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nenhuma mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Incapaz de copiar ou mover as mensagens para uma Pasta Virtual"
 
@@ -9874,11 +9931,6 @@ msgstr "Incapaz de copiar ou mover as mensagens para uma Pasta Virtual"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Incapaz de apagar a pasta: %s: Pasta não existe"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Incapaz de renomear a pasta: %s: Operação inválida"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9986,7 +10038,8 @@ msgstr "Incapaz de sincronizar os parâmetros para a pasta `%s': Desconhecida"
 #: camel/providers/imap4/camel-imap4-folder.c:341
 #, c-format
 msgid "Cannot sync flags to folder `%s': Bad command"
-msgstr "Incapaz de sincronizar os parâmetros para a pasta `%s': Comando inválido"
+msgstr ""
+"Incapaz de sincronizar os parâmetros para a pasta `%s': Comando inválido"
 
 #: camel/providers/imap4/camel-imap4-folder.c:476
 #, c-format
@@ -10026,17 +10079,20 @@ msgstr "Incapaz de mover a mensagem `%s' para a pasta `%s': Desconhecida"
 #: camel/providers/imap4/camel-imap4-folder.c:858
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
-msgstr "Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Desconhecida"
+msgstr ""
+"Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Desconhecida"
 
 #: camel/providers/imap4/camel-imap4-folder.c:866
 #, c-format
 msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
-msgstr "Incapaz de mover mensagens da pasta `%s' para a pasta `%s': Comando inválido"
+msgstr ""
+"Incapaz de mover mensagens da pasta `%s' para a pasta `%s': Comando inválido"
 
 #: camel/providers/imap4/camel-imap4-folder.c:870
 #, c-format
 msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
-msgstr "Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Comando inválido"
+msgstr ""
+"Incapaz de copiar mensagens da pasta `%s' para a pasta `%s': Comando inválido"
 
 #: camel/providers/imap4/camel-imap4-provider.c:40
 #: camel/providers/imap/camel-imap-provider.c:55
@@ -10071,25 +10127,25 @@ msgstr "Para ler e armazenar email em servidores IMAPv4rev1. EXPERIMENTAL !!"
 msgid ""
 "This option will connect to the IMAPv4rev1 server using a plaintext password."
 msgstr ""
-"Esta opção irá estabelecer uma ligação a um servidor IMAPv4rev1 utilizando uma "
-"senha em texto simples."
+"Esta opção irá estabelecer uma ligação a um servidor IMAPv4rev1 utilizando "
+"uma senha em texto simples."
 
 #: camel/providers/imap4/camel-imap4-store.c:165
-#: camel/providers/imap/camel-imap-store.c:424
+#: camel/providers/imap/camel-imap-store.c:429
 #, 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:426
+#: camel/providers/imap/camel-imap-store.c:431
 #, c-format
 msgid "IMAP service for %s on %s"
 msgstr "Serviço IMAP para %s em %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:208
 #: camel/providers/imap4/camel-imap4-store.c:225
-#: camel/providers/imap/camel-imap-store.c:546
-#: camel/providers/imap/camel-imap-store.c:566
+#: 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/pop3/camel-pop3-store.c:175
@@ -10100,15 +10156,15 @@ msgid "Could not connect to %s (port %d): %s"
 msgstr "Incapaz de se ligar a %s (porto %d): %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:210
-#: camel/providers/imap/camel-imap-store.c:548
+#: 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 indisponível"
 
 #: camel/providers/imap4/camel-imap4-store.c:222
-#: camel/providers/imap/camel-imap-store.c:563
-#: camel/providers/imap/camel-imap-store.c:810
+#: camel/providers/imap/camel-imap-store.c:568
+#: camel/providers/imap/camel-imap-store.c:815
 #: camel/providers/imapp/camel-imapp-store.c:228
 #: camel/providers/nntp/camel-nntp-store.c:137
 #: camel/providers/nntp/camel-nntp-store.c:155
@@ -10122,12 +10178,12 @@ msgid ""
 "Failed to connect to IMAP server %s in secure mode: Server does not support "
 "STARTTLS"
 msgstr ""
-"Incapaz de se ligar ao servidor IMAP %s em modo seguro: O servidor não suporta "
-"STARTTLS"
+"Incapaz de se ligar ao servidor IMAP %s em modo seguro: O servidor não "
+"suporta STARTTLS"
 
 #: camel/providers/imap4/camel-imap4-store.c:286
-#: camel/providers/imap/camel-imap-store.c:644
-#: camel/providers/imap/camel-imap-store.c:675
+#: 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 "Incapaz de se ligar ao servidor IMAP %s em modo seguro: %s"
@@ -10164,8 +10220,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:1818
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:1857
+#: camel/providers/imap/camel-imap-store.c:2235
 #, c-format
 msgid ""
 "The folder name \"%s\" is invalid because it contains the character \"%c\""
@@ -10199,7 +10255,8 @@ msgstr "Incapaz de apagar a pasta `%s': Comando inválido"
 #: camel/providers/imap4/camel-imap4-store.c:1037
 #, c-format
 msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
-msgstr "Incapaz de obter a informação %s para o padrão `%s' no servidor IMAP %s: %s"
+msgstr ""
+"Incapaz de obter a informação %s para o padrão `%s' no servidor IMAP %s: %s"
 
 #: camel/providers/imap4/camel-imap4-store.c:1039
 msgid "Bad command"
@@ -10218,7 +10275,9 @@ msgstr "Incapaz de subscrever a pasta `%s': Comando inválido"
 #: camel/providers/imap4/camel-imap4-store.c:1149
 #, c-format
 msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-msgstr "Incapaz de remover a subscrição da pasta `%s': Nome de caixa de correio inválido"
+msgstr ""
+"Incapaz de remover a subscrição da pasta `%s': Nome de caixa de correio "
+"inválido"
 
 #: camel/providers/imap4/camel-imap4-store.c:1154
 #, c-format
@@ -10242,12 +10301,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:3129
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operação cancelada"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3132
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servidor desligou-se inesperadamente: %s"
@@ -10335,7 +10394,7 @@ 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:233
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Esta mensagem de momento não está disponível"
 
@@ -10404,43 +10463,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:645
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:676
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:813
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1237
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1247
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1270
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1284
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Não introduziu a senha."
 
-#: camel/providers/imap/camel-imap-store.c:1313
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10451,18 +10510,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1800
-#: camel/providers/imap/camel-imap-store.c:1990
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Pasta %s inexistente"
 
-#: camel/providers/imap/camel-imap-store.c:1876
-#: camel/providers/imap/camel-imap-store.c:2257
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1931
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10470,7 +10529,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:2207
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Pasta pai desconhecida: %s"
@@ -10578,58 +10637,58 @@ msgstr ""
 "Também pode ser utilizado para ler uma árvore de pastas estilo Elm, Pine ou "
 "Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Armazenamento raiz %s não é um caminho absoluto"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Armazenamento raiz %s não é um directório"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Incapaz de obter a pasta: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Armazenamentos locais não têm uma caixa de entrada"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Ficheiro local de email %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Incapaz de renomear a pasta %s para %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Incapaz de renomear '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Incapaz de apagar o ficheiro de resumo da pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Incapaz de apagar o ficheiro de índice da pasta `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10695,7 +10754,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11026,7 +11085,7 @@ 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:258
+#: 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
@@ -11035,8 +11094,8 @@ msgid "User cancelled"
 msgstr "Cancelado pelo utilizador"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11045,49 +11104,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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Erro interno: uid num formato inválido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:357
+#: 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:368
+#: 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:408
-#: camel/providers/nntp/camel-nntp-folder.c:421
+#: 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:433
+#: 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:436
+#: 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:452
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:463
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Não pode copiar mensagens de uma pasta NNTP!"
 
@@ -11715,7 +11774,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
@@ -12755,7 +12814,7 @@ msgstr "não está Marcada"
 msgid "Junk Test"
 msgstr "Teste de Não Solicitado"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:924
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiqueta"
@@ -12861,8 +12920,8 @@ msgstr "começa por"
 msgid "Stop Processing"
 msgstr "Parar o Processamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1537
-#: mail/em-format-quote.c:302 mail/em-mailer-prefs.c:86
+#: 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"
@@ -12924,6 +12983,11 @@ msgstr "Assunto não contém"
 msgid "Virtual _Folders"
 msgstr "_Pastas Virtuais"
 
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "A_dicionar"
+
 #: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Origem da vPasta"
@@ -13006,95 +13070,120 @@ 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:2344
-#: mail/mail-component.c:699
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Criar uma pasta"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Nome da pasta:"
 
-#: mail/em-folder-tree.c:937
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "A mover a pasta %s"
 
-#: mail/em-folder-tree.c:939
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "A copiar a pasta %s"
 
-#: mail/em-folder-tree.c:946
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "A mover as mensagens para a pasta %s"
 
-#: mail/em-folder-tree.c:948
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "A copiar as mensagens para a pasta %s"
 
-#: mail/em-folder-tree.c:964
+#: mail/em-folder-tree.c:866
 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:2118 mail/em-folder-tree.c:2131
-#: mail/em-folder-view.c:795 mail/em-folder-view.c:809
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "_Mover"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Cancelar a Tarefa"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Seleccionar a pasta"
 
-#: mail/em-folder-tree.c:2158
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copiar"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "A criar a pasta `%s'"
 
-#: mail/em-folder-tree.c:2344 mail/mail-component.c:699
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Criar uma pasta"
 
-#: mail/em-folder-tree.c:2536
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Renomear a pasta \"%s\" para:"
 
-#: mail/em-folder-tree.c:2538
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Renomear a Pasta"
 
-#: mail/em-folder-tree.c:2607 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Ver"
 
-#: mail/em-folder-tree.c:2608
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Abrir numa _Nova Janela"
 
-#: mail/em-folder-tree.c:2613
-msgid "_Move"
-msgstr "_Mover"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2617
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Nova Pasta..."
 
-#: mail/em-folder-tree.c:2620
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Renomear"
 
-#: mail/em-folder-tree.c:2623 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "VPastas"
 
@@ -13112,304 +13201,304 @@ msgstr "Caixa de Entrada"
 msgid "Loading..."
 msgstr "A Ler..."
 
-#: mail/em-folder-view.c:411 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: 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:507
-#: mail/mail-component.c:550
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 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:892 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como uma Nova Mensagem..."
 
-#: mail/em-folder-view.c:894
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:897 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 "_Responder ao Remetente"
 
-#: mail/em-folder-view.c:898 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder para a _Lista"
 
-#: mail/em-folder-view.c:899 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder _a Todos"
 
-#: mail/em-folder-view.c:900 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "R_eencaminhar"
 
-#: mail/em-folder-view.c:903
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Dar Se_guimento..."
 
-#: mail/em-folder-view.c:904
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Marcar como _Terminada"
 
-#: mail/em-folder-view.c:905
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "L_impar a Marca"
 
-#: mail/em-folder-view.c:908 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 "_Marcar como Lida"
 
-#: mail/em-folder-view.c:909
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Marcar _por Ler"
 
-#: mail/em-folder-view.c:910
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marcar como _Importante"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Marcar como Irrelevante"
 
-#: mail/em-folder-view.c:912 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 "Marcar como _Não Solicitada"
 
-#: mail/em-folder-view.c:913 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 "Marcar como _Solicitada"
 
-#: mail/em-folder-view.c:917
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "R_ecuperar"
 
-#: mail/em-folder-view.c:920
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para a Pasta..."
 
-#: mail/em-folder-view.c:921 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiar para a Pasta..."
 
-#: mail/em-folder-view.c:929
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Adicionar o Remetente ao Li_vro de Endereços"
 
-#: mail/em-folder-view.c:932
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Aplicar _Filtros"
 
-#: mail/em-folder-view.c:933
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltrar Não Solicitado"
 
-#: mail/em-folder-view.c:936
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Criar Regra a Par_tir da Mensagem"
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VPasta baseada no A_ssunto"
 
-#: mail/em-folder-view.c:938
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VPasta baseada no Remete_nte"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VPasta baseada nos Destinatá_rios"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VPasta baseada na _Lista de Distribuição"
 
-#: mail/em-folder-view.c:944
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrar baseado no Ass_unto"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrar baseado no _Remetente"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrar baseado no _Destinatário"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrar baseado na _Lista de Distribuição"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1707 mail/em-folder-view.c:1747
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Por Omissão"
 
-#: mail/em-folder-view.c:1797
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Imprimir a Mensagem"
 
-#: mail/em-folder-view.c:2062
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Copiar a Localização do Link"
 
-#: mail/em-folder-view.c:2327
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clicar para enviar mensagem a %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1431 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:81 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 "De"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1431 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:82
+#: 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 "Responder-A"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1431 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:83 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 "Para"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1431 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:84
+#: 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:746 mail/em-format-html.c:1431 mail/em-format-quote.c:192
-#: mail/em-mailer-prefs.c:85
+#: 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:748 mail/em-format-html.c:1581 mail/em-format-quote.c:316
-#: mail/em-mailer-prefs.c:87 mail/message-list.etspec.h:2
+#: 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:749 mail/em-format-html.c:1602 mail/em-mailer-prefs.c:88
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grupo de notícias"
 
-#: mail/em-format.c:986
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Incapaz de parsear a mensagem S/MIME: Erro desconhecido"
 
-#: mail/em-format.c:1174
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de encriptação não suportada para multipartes/encriptada"
 
-#: mail/em-format.c:1320
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Incapaz de parsear a mensagem MIME. A apresentar como código."
 
-#: mail/em-format.c:1339
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Erro ao verificar a assinatura"
 
-#: mail/em-format.c:1347
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar a assinatura"
 
-#: mail/em-format-html.c:453 mail/em-format-html.c:455
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "A obter `%s'"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Não assinada"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: mail/em-format-html.c:563
+#: mail/em-format-html.c:562
 msgid "Valid signature but cannot verify sender"
 msgstr "Assinatura válida mas incapaz de verificar o remetente"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Sem encriptação"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Encriptada com cifra fraca"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Encriptada"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Encriptada com cifra forte"
 
-#: mail/em-format-html.c:838
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte do corpo-externo mal formada."
 
-#: mail/em-format-html.c:868
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Ponteiro para o servidor FTP (%s)"
 
-#: mail/em-format-html.c:879
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Ponteiro para o ficheiro local (%s) válido no servidor \"%s\""
 
-#: mail/em-format-html.c:881
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Ponteiro para o ficheiro local (%s)"
 
-#: mail/em-format-html.c:902
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Ponteiro para dados remotos (%s)"
 
-#: mail/em-format-html.c:913
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Ponteiro para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:1155
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "A formatar a mensagem"
 
 #. pseudo-header
-#: mail/em-format-html.c:1541 mail/em-format-quote.c:309
-#: mail/em-mailer-prefs.c:929
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 msgid "Mailer"
 msgstr "Aplicação de Email"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1568
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1571
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13419,7 +13508,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Equivalências: %d"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13427,7 +13516,7 @@ msgstr ""
 "Esta mensagem não está assinada. Não existe nenhuma garantia de que seja "
 "autêntica."
 
-#: mail/em-format-html-display.c:646
+#: 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."
@@ -13435,7 +13524,7 @@ msgstr ""
 "Esta mensagem está assinada e é válida o que significa que muito "
 "provavelmente é autêntica."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13443,11 +13532,11 @@ msgstr ""
 "A assinatura nesta mensagem não pode ser verificada, o que significa que "
 "pode ter sido alterada durante o percurso."
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, incapaz de verificar o remetente"
 
-#: mail/em-format-html-display.c:648
+#: 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."
@@ -13455,7 +13544,7 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida mas não é possível "
 "verificar o remetente da mesma."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13463,7 +13552,7 @@ msgstr ""
 "Esta mensagem não está encriptada.  O seu conteúdo pode ser visualizado "
 "durante o seu percurso pela Internet."
 
-#: mail/em-format-html-display.c:655
+#: 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 "
@@ -13473,7 +13562,7 @@ msgstr ""
 "Seria difícil, mas não impossível, que um terceiro conseguisse visualizar o "
 "conteúdo da mensagem dentro de um período de tempo útil."
 
-#: mail/em-format-html-display.c:656
+#: 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."
@@ -13481,7 +13570,7 @@ msgstr ""
 "Esta mensagem está encriptada.  Seria difícil que um terceiro conseguisse "
 "visualizar o seu conteúdo."
 
-#: mail/em-format-html-display.c:657
+#: 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 "
@@ -13491,35 +13580,35 @@ 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:758
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Visualizar o Certificado"
 
-#: mail/em-format-html-display.c:773
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é visualizável"
 
-#: mail/em-format-html-display.c:1005
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Terminada a %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: mail/em-format-html-display.c:1016
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "por %B %d, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1086
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Ver Imbutido"
 
-#: mail/em-format-html-display.c:1087
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
@@ -13528,19 +13617,19 @@ msgstr "Página %d de %d"
 msgid "Spamassassin (built-in)"
 msgstr "Spamassassin (incorporado)"
 
-#: mail/em-mailer-prefs.c:99
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Sempre"
 
-#: mail/em-mailer-prefs.c:100
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Uma vez por dia"
 
-#: mail/em-mailer-prefs.c:101
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Uma vez por semana"
 
-#: mail/em-mailer-prefs.c:102
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Uma vez por mês"
 
@@ -13579,7 +13668,8 @@ msgstr "Incapaz de abir dados antigos POP manter-no-servidor `%s': %s"
 #: mail/em-migrate.c:1933
 #, 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"
+msgstr ""
+"Incapaz de criar o directório de dados POP3 manter-no-servidor `%s': %s"
 
 #: mail/em-migrate.c:1962
 #, c-format
@@ -13601,8 +13691,8 @@ msgid ""
 "Unable to read settings from previous Evolution install, `evolution/config."
 "xmldb' does not exist or is corrupt."
 msgstr ""
-"Incapaz de ler as definições da instalação anterior do Evolution, `evolution"
-"/config.xmldb' não existe ou está corrompido."
+"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
 msgid "Save As..."
@@ -13659,28 +13749,28 @@ msgstr "Seleccione um servidor."
 msgid "No server has been selected"
 msgstr "Não seleccionou nenhum servidor"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Não apresentar esta mensagem novamente."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "mensagem"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Gravar a Mensagem..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Adicionar o endereço"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:989
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -14172,58 +14262,67 @@ msgid "spamd port"
 msgstr "porto spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Preferências do Compositor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure aqui as suas preferências de email, incluindo a segurança e "
 "apresentação de mensagens"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Configure aqui a correcção ortográfica, assinaturas e o compositor de "
 "mensagens"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configure aqui as suas contas de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Email Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Controlo de configuração de contas de Email Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente de Email Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Compositor de Mensagem Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Controlo de configuração de compositor de Mensagem Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Controlo de preferências de Email Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "Contas de Email"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Preferências do Email"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "E_mail:"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "Evolution está a importar as suas mensagens Elm antigas"
@@ -14475,66 +14574,66 @@ msgstr "lista de distribuição %s"
 msgid "Add Filter Rule"
 msgstr "Adicionar Regra de Filtro"
 
-#: mail/mail-component.c:460
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d seleccionada"
 
-#: mail/mail-component.c:462
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d não solicitado"
 
-#: mail/mail-component.c:485
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d rascunho"
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d enviada"
 
-#: mail/mail-component.c:489
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d por enviar"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:495
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d por enviar"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova Mensagem de Email"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mensagem de Email"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Compor uma nova mensagem de email"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nova Pasta de Mensagens"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Pasta de Mensagens"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de mensagens"
 
-#: mail/mail-component.c:793
+#: mail/mail-component.c:795
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falha ao actualizar as definições ou pastas de Mensagens."
 
@@ -15735,7 +15834,7 @@ msgstr "_Sobrepor"
 msgid "_Append"
 msgstr "_Acrescentar"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "A pingar %s"
@@ -16041,84 +16140,89 @@ msgstr "Pasta inválida: `%s'"
 msgid "Setting up vfolder: %s"
 msgstr "A configurar uma vpasta: %s"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "A actualizar as vpastas para o uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "A actualizar as vpastas para o uri: %s"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vPastas"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Editar a VPasta"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nova VPasta"
 
-#: mail/message-list.c:916
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Por Ler"
 
-#: mail/message-list.c:917
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Lida"
 
-#: mail/message-list.c:918
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Respondida"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Múltiplas Mensagens Por Ler"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Múltiplas Mensagens"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Mais Baixo"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Baixo"
 
-#: mail/message-list.c:929
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Alto"
 
-#: mail/message-list.c:930
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Mais Alto"
 
-#: mail/message-list.c:1249
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1256
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Hoje %l:%M %p"
 
-#: mail/message-list.c:1265
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Ontem %l:%M %p"
 
-#: mail/message-list.c:1277
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1285
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1287
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3124
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "A gerar a lista de mensagens"
 
@@ -16503,7 +16607,8 @@ msgstr "'.' e '..' são nomes de pastas reservados."
 #: shell/e-shell-window.c:336
 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."
+"Evolution de momento está ligado.  Clique neste botão para trabalhar "
+"desligado."
 
 #: shell/e-shell-window.c:343
 msgid "Evolution is in the process of going offline."
@@ -16512,39 +16617,45 @@ msgstr "Evolution está no processo de se desligar."
 #: shell/e-shell-window.c:349
 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."
+"Evolution de momento está desligado.  Clique neste botão para trabalhar "
+"ligado."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mensagem para %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bub buddy não está instalado."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Incapaz de executar o Bub buddy."
 
-#: shell/e-shell-window-commands.c:170
+#: shell/e-shell-window-commands.c:171
 msgid "About Evolution"
 msgstr "Sobre o Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Trabalhar _Ligado"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Trabalhar _Desligado"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Trabalhar Desligado"
 
@@ -16767,7 +16878,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution pode importar dados dos seguintes ficheiros:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16803,7 +16914,7 @@ msgstr ""
 "Esperamos que lhe agrade o resultado do nosso trabalho e aguardamos\n"
 "as suas contribuições!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16811,50 +16922,41 @@ msgstr ""
 "Obrigado\n"
 "A Equipa do Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Não apresentar novamente"
 
-#: shell/main.c:391
-msgid "Cannot register the Evolution shell."
-msgstr "Incapaz de registar a consola do Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Incapaz de inicializar a consola do Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution activando o componente especificado"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Iniciar em modo desligado"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Iniciar em modo ligado"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Forçar todos os componentes Evolution a terminar"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 "Forçar uma nova actualização de ficheiros de configuração do Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Enviar o resultado de depuração de todos os componentes para um ficheiro."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16877,8 +16979,8 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Actualizar os seus dados e definições irá requerer até {0} de espaço em disco, "
-"mas apenas possui disponíveis {1}.\n"
+"Actualizar os seus dados e definições irá requerer até {0} de espaço em "
+"disco, mas apenas possui disponíveis {1}.\n"
 "\n"
 "Terá de conseguir mais espaço livre em disco na sua pasta pessoal antes de "
 "poder prosseguir."
@@ -16909,6 +17011,36 @@ msgstr ""
 msgid "Continue"
 msgstr "Prosseguir"
 
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Incapaz de registar a consola do Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Assistente de Contas Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17500,7 +17632,8 @@ msgid "_Preview Pane"
 msgstr "_Painel de Antevisão"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Gravar como VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18320,10 +18453,6 @@ msgstr "VPasta ao A_ssunto..."
 msgid "_Attached"
 msgstr "_Anexado"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Copiar para a Pasta"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Criar Filtro a Partir da Mensagem"
@@ -18344,10 +18473,6 @@ msgstr "M_aior"
 msgid "_Message Display"
 msgstr "Apresentação da _Mensagem"
 
-#: ui/evolution-mail-message.xml.h:119
-msgid "_Move to Folder"
-msgstr "_Mover para a Pasta"
-
 #: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Mensagem Segui_nte"
@@ -18765,6 +18890,11 @@ msgstr "_Referência Rápida"
 msgid "_Send / Receive"
 msgstr "_Enviar / Receber"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Nova _Janela"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _Empresa"
@@ -18829,10 +18959,6 @@ msgstr "Com Data de _Término"
 msgid "With _Status"
 msgstr "Com _Estado"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tarefas"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18988,26 +19114,26 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 msgid "Evolution Error"
 msgstr "Erro Evolution"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Aviso Evolution"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 msgid "Evolution Information"
 msgstr "Informação Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 msgid "Evolution Query"
 msgstr "Questão Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:389
+#: widgets/misc/e-error.c:410
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
@@ -19158,6 +19284,18 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% terminado)"
 
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Incapaz de inicializar o gnome-vfs"
+
+#~ msgid "Display a message"
+#~ msgstr "Apresentar uma mensagem"
+
+#~ msgid "Select source"
+#~ msgstr "Seleccionar a origem"
+
+#~ msgid "Cannot initialize the Evolution shell: %s"
+#~ msgstr "Incapaz de inicializar a consola do Evolution: %s"
+
 #~ msgid "Evolution Addressbook folder viewer"
 #~ msgstr "Visualizador de pasta de Livro de Endereços Evolution"
 
@@ -19182,9 +19320,6 @@ msgstr "%s (%d%% terminado)"
 #~ msgid "The type of view to show"
 #~ msgstr "O tipo de vista a apresentar"
 
-#~ msgid "Select destination %s"
-#~ msgstr "Seleccionar o destino %s"
-
 #~ msgid "calendar"
 #~ msgstr "calendário"
 
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 88a7bf8137..6a79692c45 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -11,14 +11,14 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution 1.5.7\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2004-05-17 12:52-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
 "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
@@ -141,15 +141,15 @@ 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"
 
-#: addressbook/gui/component/addressbook-config.c:1242
+#: 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:1263
+#: 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:1271
+#: 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"
 
@@ -168,7 +168,7 @@ msgstr "Migrando `%s':"
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: 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:244
+#: mail/mail-component.c:245 mail/mail-vfolder.c:218
 msgid "On This Computer"
 msgstr "Neste computador"
 
@@ -270,7 +270,7 @@ msgstr "Propriedades..."
 #.
 #. name = e_book_get_name (book);
 #: addressbook/gui/component/addressbook-view.c:1002
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#: 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"
@@ -297,46 +297,55 @@ msgid "URI for the folder last used in the select names dialog"
 msgstr "URI para a última pasta a ser usada no diálogo selecionar nomes"
 
 #: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
 msgid "Autocompletion"
 msgstr "Autocompletar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contatos"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
 msgid "Certificates"
 msgstr "Certificados"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
 msgid "Configure autocomplete here"
 msgstr "Configure aqui o autocompletar"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
 msgid "Evolution Addressbook"
 msgstr "Catálogo de endereços do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
 msgid "Evolution Addressbook address pop-up"
 msgstr "Pop-up de endereços do catálogo de endereços do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
 msgid "Evolution Addressbook address viewer"
 msgstr "Visualizador de endereços do catálogo de endereços do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
 msgid "Evolution Addressbook card viewer"
 msgstr "Visualizador de cartões do catálogo de endereços do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
 msgid "Evolution Addressbook component"
 msgstr "Componente do catálogo de endereços do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
 msgid "Evolution S/Mime Certificate Management Control"
 msgstr "Controle de gerência de certifcados S/MIME do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
 msgid "Evolution folder settings configuration control"
 msgstr "Controle de configuração das configurações de pasta do Evolution"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
 msgid "Manage your S/MIME certificates here"
 msgstr "Gerencie aqui os seus certificados S/MIME"
 
@@ -866,9 +875,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:183
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
@@ -902,7 +911,7 @@ msgid "Company:"
 msgstr "Empresa:"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:19
-#: addressbook/gui/contact-editor/e-contact-editor.c:270
+#: addressbook/gui/contact-editor/e-contact-editor.c:271
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:160
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -910,7 +919,7 @@ msgid "Contact"
 msgstr "Contato"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/e-contact-editor.c:1526
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor de contatos"
 
@@ -931,7 +940,7 @@ msgid "Full _Name..."
 msgstr "_Nome completo..."
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/e-contact-editor.c:201
+#: addressbook/gui/contact-editor/e-contact-editor.c:202
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:240
 msgid "Home"
 msgstr "Residencial"
@@ -976,7 +985,7 @@ msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:35
-#: addressbook/gui/contact-editor/e-contact-editor.c:202
+#: addressbook/gui/contact-editor/e-contact-editor.c:203
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:248
 msgid "Other"
 msgstr "Outro"
@@ -1007,7 +1016,7 @@ msgstr "Webcam:"
 
 #. red
 #: addressbook/gui/contact-editor/contact-editor.glade.h:43
-#: addressbook/gui/contact-editor/e-contact-editor.c:200
+#: addressbook/gui/contact-editor/e-contact-editor.c:201
 #: 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
@@ -1055,13 +1064,13 @@ msgstr ""
 "excluir este contato?"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 msgid "Address"
 msgstr "Endereço"
 
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:103
-#: addressbook/gui/contact-editor/e-contact-editor.c:291
+#: addressbook/gui/contact-editor/e-contact-editor.c:292
 #: 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
@@ -2042,65 +2051,76 @@ msgstr "Zâmbia"
 msgid "Zimbabwe"
 msgstr "Zimbábue"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:185
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:186
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:187
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
+#: addressbook/gui/widgets/eab-contact-display.c:344
+#: addressbook/gui/widgets/eab-contact-display.c:363
 msgid "ICQ"
 msgstr "ICQ"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:256
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Catálogo origem"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:263
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Catálogo alvo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:277
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "É um novo contato"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:284
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Campos editáveis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:298
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Alterado"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1740
+#: 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:1748
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Este contato pertence a estas categorias:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1934
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
 msgid ""
 "The following entries are invalid:\n"
 "\n"
@@ -2108,7 +2128,7 @@ msgstr ""
 "As seguintes entradas são inválidas:\n"
 "\n"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2636
+#: 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'"
@@ -2360,143 +2380,144 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Pesquisa avançada"
 
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
 msgid "(map)"
 msgstr "(mapa)"
 
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
 msgid "map"
 msgstr "mapa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
 msgid "List Members"
 msgstr "Listar membros"
 
-#: addressbook/gui/widgets/eab-contact-display.c:293
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
 msgid "E-mail"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:300
+#: addressbook/gui/widgets/eab-contact-display.c:340
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
 msgid "Organization"
 msgstr "Empresa"
 
-#: addressbook/gui/widgets/eab-contact-display.c:301
+#: addressbook/gui/widgets/eab-contact-display.c:341
 msgid "Position"
 msgstr "Cargo"
 
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
 msgid "Groupwise"
 msgstr "Groupwise"
 
-#: addressbook/gui/widgets/eab-contact-display.c:308
+#: addressbook/gui/widgets/eab-contact-display.c:348
 msgid "Video Conferencing"
 msgstr "Vídeo conferência"
 
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
 msgid "Phone"
 msgstr "Telefone"
 
-#: addressbook/gui/widgets/eab-contact-display.c:310
+#: addressbook/gui/widgets/eab-contact-display.c:350
 msgid "Fax"
 msgstr "Fax"
 
-#: addressbook/gui/widgets/eab-contact-display.c:314
+#: addressbook/gui/widgets/eab-contact-display.c:354
 msgid "work"
 msgstr "trabalho"
 
-#: addressbook/gui/widgets/eab-contact-display.c:327
+#: addressbook/gui/widgets/eab-contact-display.c:367
 msgid "WWW"
 msgstr "WWW"
 
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
 msgid "Blog"
 msgstr "Blog"
 
-#: addressbook/gui/widgets/eab-contact-display.c:331
+#: addressbook/gui/widgets/eab-contact-display.c:371
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
 msgid "Mobile Phone"
 msgstr "Telefone celular"
 
-#: addressbook/gui/widgets/eab-contact-display.c:335
+#: addressbook/gui/widgets/eab-contact-display.c:375
 msgid "personal"
 msgstr "pessoal"
 
-#: addressbook/gui/widgets/eab-contact-display.c:342
+#: addressbook/gui/widgets/eab-contact-display.c:382
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
 msgid "Note"
 msgstr "Nota"
 
-#: addressbook/gui/widgets/eab-contact-display.c:508
+#: addressbook/gui/widgets/eab-contact-display.c:548
 msgid "Job Title"
 msgstr "Função"
 
-#: addressbook/gui/widgets/eab-contact-display.c:512
+#: addressbook/gui/widgets/eab-contact-display.c:552
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
 #: smime/lib/e-cert.c:774
 msgid "Email"
 msgstr "E-mail"
 
-#: addressbook/gui/widgets/eab-contact-display.c:539
+#: addressbook/gui/widgets/eab-contact-display.c:579
 msgid "Home page"
 msgstr "Página web"
 
 #. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
+#: addressbook/gui/widgets/eab-gui-util.c:50
 msgid "Success"
 msgstr "Sucesso"
 
 #. E_BOOK_ERROR_INVALID_ARG
 #. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
+#: addressbook/gui/widgets/eab-gui-util.c:52
 msgid "Backend busy"
 msgstr "Backend ocupado"
 
 #. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
+#: addressbook/gui/widgets/eab-gui-util.c:53
 msgid "Repository offline"
 msgstr "Repositório desconectado"
 
 #. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
+#: addressbook/gui/widgets/eab-gui-util.c:54
 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:54
+#: addressbook/gui/widgets/eab-gui-util.c:55
 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:57
+#: addressbook/gui/widgets/eab-gui-util.c:58
 msgid "Permission denied"
 msgstr "Permissão negada"
 
 #. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
+#: addressbook/gui/widgets/eab-gui-util.c:59
 msgid "Contact not found"
 msgstr "Contato não encontrado"
 
 #. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
+#: addressbook/gui/widgets/eab-gui-util.c:60
 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:60
+#: addressbook/gui/widgets/eab-gui-util.c:61
 msgid "Protocol not supported"
 msgstr "Protocolo não suportado"
 
 #. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
+#: addressbook/gui/widgets/eab-gui-util.c:62
 #: 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
@@ -2509,37 +2530,37 @@ msgid "Cancelled"
 msgstr "Cancelada"
 
 #. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
+#: addressbook/gui/widgets/eab-gui-util.c:63
 msgid "Could not cancel"
 msgstr "Não foi possível cancelar"
 
 #. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
+#: addressbook/gui/widgets/eab-gui-util.c:64
 msgid "Authentication Failed"
 msgstr "Falhou a autenticação"
 
 #. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
+#: addressbook/gui/widgets/eab-gui-util.c:65
 msgid "Authentication Required"
 msgstr "Autenticação necessária"
 
 #. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
+#: addressbook/gui/widgets/eab-gui-util.c:66
 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:67
+#: addressbook/gui/widgets/eab-gui-util.c:68
 msgid "No such source"
 msgstr "Não existe tal fonte"
 
 #. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
+#: addressbook/gui/widgets/eab-gui-util.c:69
 msgid "Other error"
 msgstr "Outro erro"
 
-#: addressbook/gui/widgets/eab-gui-util.c:102
+#: 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."
@@ -2547,7 +2568,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:109
+#: 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."
@@ -2555,7 +2576,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 LDAP está fora do ar."
 
-#: addressbook/gui/widgets/eab-gui-util.c:114
+#: 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 "
@@ -2565,7 +2586,7 @@ msgstr ""
 "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:123
+#: 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."
@@ -2573,11 +2594,11 @@ 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:140
+#: 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:161
+#: addressbook/gui/widgets/eab-gui-util.c:162
 msgid ""
 "More cards matched this query than either the server is \n"
 "configured to return or Evolution is configured to display.\n"
@@ -2591,7 +2612,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:167
+#: addressbook/gui/widgets/eab-gui-util.c:168
 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,56 +2624,56 @@ 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:173
+#: addressbook/gui/widgets/eab-gui-util.c:174
 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:176
+#: addressbook/gui/widgets/eab-gui-util.c:177
 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:179
+#: addressbook/gui/widgets/eab-gui-util.c:180
 msgid "This query did not complete successfully."
 msgstr "Esta consulta não terminou com sucesso."
 
-#: addressbook/gui/widgets/eab-gui-util.c:205
+#: 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:207
+#: addressbook/gui/widgets/eab-gui-util.c:208
 msgid "_Discard"
 msgstr "_Descartar"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
+#: addressbook/gui/widgets/eab-gui-util.c:229
 msgid "Error adding list"
 msgstr "Erro ao adicionar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:651
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
 msgid "Error adding contact"
 msgstr "Erro ao adicionar contato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying list"
 msgstr "Erro ao modificar lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:239
+#: addressbook/gui/widgets/eab-gui-util.c:240
 msgid "Error modifying contact"
 msgstr "Erro ao modificar contato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
+#: addressbook/gui/widgets/eab-gui-util.c:252
 msgid "Error removing list"
 msgstr "Erro ao remover lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:609
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
 msgid "Error removing contact"
 msgstr "Erro ao remover contato"
 
-#: addressbook/gui/widgets/eab-gui-util.c:333
+#: addressbook/gui/widgets/eab-gui-util.c:334
 #, c-format
 msgid ""
 "Opening %d contacts will open %d new windows as well.\n"
@@ -2661,7 +2682,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:359
+#: addressbook/gui/widgets/eab-gui-util.c:360
 #, c-format
 msgid ""
 "%s already exists\n"
@@ -2670,49 +2691,49 @@ msgstr ""
 "%s já existe\n"
 "Você deseja sobrescrevê-lo?"
 
-#: addressbook/gui/widgets/eab-gui-util.c:363
+#: addressbook/gui/widgets/eab-gui-util.c:364
 msgid "Overwrite"
 msgstr "Sobrescrever"
 
-#: addressbook/gui/widgets/eab-gui-util.c:399
+#: 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:436
+#: addressbook/gui/widgets/eab-gui-util.c:437
 msgid "card.vcf"
 msgstr "cartao.vcf"
 
-#: addressbook/gui/widgets/eab-gui-util.c:570
+#: addressbook/gui/widgets/eab-gui-util.c:571
 msgid "list"
 msgstr "lista"
 
-#: addressbook/gui/widgets/eab-gui-util.c:705
+#: addressbook/gui/widgets/eab-gui-util.c:706
 msgid "Move contact to"
 msgstr "Mover contato para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:707
+#: addressbook/gui/widgets/eab-gui-util.c:708
 msgid "Copy contact to"
 msgstr "Copiar contato para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:710
+#: addressbook/gui/widgets/eab-gui-util.c:711
 msgid "Move contacts to"
 msgstr "Mover contatos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:712
+#: addressbook/gui/widgets/eab-gui-util.c:713
 msgid "Copy contacts to"
 msgstr "Copiar contatos para"
 
-#: addressbook/gui/widgets/eab-gui-util.c:715
+#: addressbook/gui/widgets/eab-gui-util.c:716
 msgid "Select target addressbook."
 msgstr "Selecionar catálogo de endereços alvo."
 
-#: addressbook/gui/widgets/eab-gui-util.c:888
+#: addressbook/gui/widgets/eab-gui-util.c:939
 msgid "Multiple VCards"
 msgstr "Vários VCards"
 
-#: addressbook/gui/widgets/eab-gui-util.c:891
+#: addressbook/gui/widgets/eab-gui-util.c:942
 #, c-format
 msgid "VCard for %s"
 msgstr "VCard para %s"
@@ -2857,7 +2878,8 @@ msgstr "Catálogo de endereços"
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
 #: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Salvar como VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -3542,24 +3564,24 @@ msgstr "_Editar compromisso"
 msgid "_Snooze"
 msgstr "_Adiar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Abrir"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Ignorar"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Ignorar tudo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Sem descrição disponível."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3572,12 +3594,12 @@ msgstr ""
 "Iniciando em %s\n"
 "Terminando em %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Alerta"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3589,7 +3611,7 @@ msgstr ""
 "com notificações por e-mail. Em lugar disso, o Evolution\n"
 "exibirá uma caixa de diálogo de lembrete normal."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3606,7 +3628,7 @@ msgstr ""
 "\n"
 "Você tem certeza que deseja executar este programa?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Não me pergunte sobre este programa novamente."
 
@@ -3614,15 +3636,11 @@ msgstr "Não me pergunte sobre este programa novamente."
 msgid "Evolution Calendar alarm notification service"
 msgstr "Serviço de notificação de alarme da agenda do Evolution"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Não foi possível iniciar Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Não foi possível iniciar gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Não foi possível criar a fábrica de serviço de notificação de alarme"
 
@@ -3731,30 +3749,34 @@ msgid "Weekday the week starts on"
 msgstr "Dia em que a semana começa"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Se é necessário pedir confirmação ao apagar compromissos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Se é necessário pedir confirmação ao apagar uma pasta permanentemente"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Se é necessário esconder tarefas concluídas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Se é necessário estabelecer um lembrete padrão para eventos"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Se as horas são exibidas no formato 24h no lugar de se usar am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 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:116 calendar/gui/calendar-component.c:552
+#: 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
@@ -3762,7 +3784,7 @@ msgstr "Se é necessário exibir o número da semana no navegador de datas"
 msgid "Calendar"
 msgstr "Agenda"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3772,36 +3794,36 @@ msgstr ""
 "quantidade de tempo selecionada. Se você continuar, você não será capaz de "
 "recuperar estes eventos."
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Apagar permanentemente eventos com idade superior a"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dias"
 
-#: calendar/gui/calendar-commands.c:431 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 de %B de %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:434 calendar/gui/calendar-component.c:507
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443 calendar/gui/calendar-component.c:509
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
@@ -3810,7 +3832,7 @@ msgstr "%d de %B de %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:464 calendar/gui/calendar-component.c:533
+#: 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"
@@ -3846,7 +3868,7 @@ msgstr ""
 "favor, selecione uma agenda com possibilidade de escrita."
 
 #: calendar/gui/calendar-component.c:1071
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
 msgid "Calendars"
 msgstr "Agendas"
 
@@ -3944,15 +3966,15 @@ msgstr "Local contém"
 msgid "Unmatched"
 msgstr "Não casadas"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Erro ao abrir a agenda"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Método não suportado ao abrir a agenda"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Permissão negada para abrir a agenda"
 
@@ -4735,27 +4757,27 @@ msgstr "Delegar para:"
 msgid "Enter Delegate"
 msgstr "Entrar delegado"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Compromisso"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Lembrete"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Repetição"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Agendar"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Reunião"
 
@@ -4855,7 +4877,7 @@ msgstr "Hora de _início:"
 #: 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:926 mail/mail-account-gui.c:1559
+#: mail/em-folder-view.c:928 mail/mail-account-gui.c:1559
 #: mail/mail-account-gui.c:1955 mail/mail-config.glade.h:100
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:192
 #: widgets/misc/e-cell-date-edit.c:257 widgets/misc/e-dateedit.c:443
@@ -4883,7 +4905,7 @@ msgstr "_Delegar para..."
 #: 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:917
+#: mail/em-folder-tree.c:2557 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
@@ -5428,7 +5450,7 @@ msgstr "%s em %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s para um tipo de gatilho desconhecido"
 
-#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2333
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
 #, c-format
 msgid "Click to open %s"
 msgstr "Clique para abrir %s"
@@ -5538,7 +5560,7 @@ 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
-#: mail/em-folder-view.c:892 ui/evolution-addressbook.xml.h:37
+#: mail/em-folder-view.c:894 ui/evolution-addressbook.xml.h:37
 msgid "_Open"
 msgstr "A_brir"
 
@@ -5548,7 +5570,7 @@ 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:894 mail/em-popup.c:690 mail/em-popup.c:806
+#: mail/em-folder-view.c:896 mail/em-popup.c:690 mail/em-popup.c:806
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "_Salvar como..."
@@ -5733,8 +5755,9 @@ msgstr "Data de início"
 #: 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:1111
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
+#: 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 "Desconhecido"
 
@@ -6488,7 +6511,7 @@ msgid "Expunging"
 msgstr "Excluindo permanentemente"
 
 #: calendar/gui/e-tasks.c:960
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#: 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/importers/icalendar-importer.c:79
@@ -6521,37 +6544,55 @@ msgid "Purging"
 msgstr "Excluindo permanentemente"
 
 #: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
 msgid "Calendar and Tasks"
 msgstr "Agenda e tarefas"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
 msgid "Configure your timezone, Calendar and Task List here "
 msgstr "Configure o seu fuso horário, agenda e lista de tarefas aqui "
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
 msgid "Evolution Calendar and Tasks"
 msgstr "Agenda e tarefas do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
 msgid "Evolution Calendar configuration control"
 msgstr "Controle de configuração da agenda do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
 msgid "Evolution Calendar scheduling message viewer"
 msgstr "Visualizador de mensagens de agendamento da agenda do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
 msgid "Evolution Calendar/Task editor"
 msgstr "Editor da agenda e tarefas do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
 msgid "Evolution's Calendar component"
 msgstr "Componente de agenda do Evolution"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
 msgid "Evolution's Tasks component"
 msgstr "Componente de tarefas do Evolution"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Agendas"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Tarefas"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Abril"
@@ -6698,7 +6739,8 @@ msgstr "Na web"
 #. FIXME: set proper domain/code
 #: calendar/gui/migration.c:708 calendar/gui/migration.c:840
 msgid "Unable to migrate old settings from evolution/config.xmldb"
-msgstr "Não é possível migrar as configurações antigas de evolution/config.xmldb"
+msgstr ""
+"Não é possível migrar as configurações antigas de evolution/config.xmldb"
 
 #. FIXME: domain/code
 #: calendar/gui/migration.c:737
@@ -6931,7 +6973,7 @@ msgid "Contacts: "
 msgstr "Contatos: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Visualizar impressão"
 
@@ -6960,7 +7002,7 @@ msgid_plural "%d tasks"
 msgstr[0] "%d tarefa"
 msgstr[1] "%d tarefas"
 
-#: calendar/gui/tasks-component.c:400 mail/mail-component.c:499
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
 #, c-format
 msgid ", %d selected"
 msgid_plural ", %d selected"
@@ -8678,7 +8720,7 @@ msgstr "Copiar o conteúdo da pasta localmente para funcionamento desconectado"
 msgid "Downloading new messages for offline mode"
 msgstr "Baixando novas mensagens para modo desconectado"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Preparando pasta '%s' para desconexão"
@@ -8933,8 +8975,8 @@ msgid "This is a digitally signed message part"
 msgstr "Esta é uma parte de mensagem assinada digitalmente"
 
 #: camel/camel-gpg-context.c:1397 camel/camel-gpg-context.c:1406
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 ""
 "Não é possível verificar assinatura da mensagem: Formato de mensagem "
@@ -8956,7 +8998,7 @@ msgstr "Não foi possível gerar dados de cifragem: %s"
 msgid "This is a digitally encrypted message part"
 msgstr "Esta é uma parte de mensagem cifrada digitalmente"
 
-#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Conteúdo cifrado"
 
@@ -9478,7 +9520,7 @@ msgstr "Não é possível criar contexto de codificador"
 msgid "Failed to add data to CMS encoder"
 msgstr "Falha ao acrescentar dados ao codificador CMS"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 msgid "Failed to encode data"
 msgstr "Falha ao codificar dados"
 
@@ -9538,91 +9580,91 @@ msgstr "Não é possível calcular digests"
 msgid "Cannot set message digests"
 msgstr "Não é possível configurar digests de mensagem"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 msgid "Certificate import failed"
 msgstr "Falhou a importação do certificado"
 
-#: camel/camel-smime-context.c:624
+#: camel/camel-smime-context.c:628
 msgid "Certificate only message, cannot verify certificates"
 msgstr "Mensagem com certificado apenas, não é possível verificar certificados"
 
-#: camel/camel-smime-context.c:627
+#: camel/camel-smime-context.c:631
 msgid "Certificate only message, certificates imported and verified"
 msgstr "Mensagem com certificado apenas, certificados importados e verificados"
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr "Não é possível localizar digests de assinatura"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Autor da assinatura: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr "Falhou o decodificador"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Não é possível localizar certificado para `%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Não é possível localizar algoritmo comum de cifragem em massa"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr "Não é possível alocar espaço para chave de cifragem em massa"
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr "Não é possível criar mensagem CMS"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr "Não é possível criar EnvelopedData CMS"
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr "Não é possível anexar EnvelopedData CMS"
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr "Não é possível anexar objeto de dados CMS"
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr "Não é possível criar RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr "Não é possível adicionar RecipientInfo CMS"
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 msgid "Can't create encoder context"
 msgstr "Não é possível criar contexto do codificador"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 msgid "Failed to add data to encoder"
 msgstr "Falha ao adicionar dados ao codificador"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr "Falhou o decodificador, erro %d"
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr "Decifragem S/MIME: Não foi encontrado conteúdo cifrado"
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr "importar chaves: não implementado"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr "exportar chaves: não implementado"
 
@@ -9654,11 +9696,11 @@ msgstr "Não é possível excluir pasta: %s: Operação inválida"
 msgid "Cannot rename folder: %s: Invalid operation"
 msgstr "Não é possível renomear pasta: %s: Operação inválida"
 
-#: camel/camel-store.c:808
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Lixeira"
 
-#: camel/camel-store.c:810 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Lixo"
@@ -9882,12 +9924,12 @@ msgstr "Não foi possível analisar URL `%s'"
 msgid "Error storing `%s': %s"
 msgstr "Erro ao armazenar `%s': %s"
 
-#: camel/camel-vee-folder.c:673
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Não existe tal mensagem %s em %s"
 
-#: camel/camel-vee-folder.c:839 camel/camel-vee-folder.c:845
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Não é possível copiar ou mover mensagem para uma pasta virtual"
 
@@ -10362,7 +10404,7 @@ 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:233
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Esta mensagem não está disponível no momento"
 
@@ -10720,7 +10762,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11051,7 +11093,7 @@ 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:258
+#: 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
@@ -11060,8 +11102,8 @@ msgid "User cancelled"
 msgstr "O usuário cancelou"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11070,47 +11112,47 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Erro interno: uid em formato inválido: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:357
+#: 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:368
+#: 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:408
-#: camel/providers/nntp/camel-nntp-folder.c:421
+#: 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:433
+#: 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:436
+#: 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:452
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:463
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Você não pode copiar mensagens de uma pasta NNTP!"
 
@@ -11739,7 +11781,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:404
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexo"
 
@@ -12781,7 +12823,7 @@ msgstr "não está Marcada"
 msgid "Junk Test"
 msgstr "Teste lixo"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:925
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Rótulo"
@@ -12887,7 +12929,7 @@ msgstr "começa com"
 msgid "Stop Processing"
 msgstr "Parar o processamento"
 
-#: filter/libfilter-i18n.h:64 mail/em-format.c:747 mail/em-format-html.c:1537
+#: 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
@@ -12950,6 +12992,10 @@ msgstr "Assunto não contém"
 msgid "Virtual _Folders"
 msgstr "Pastas _virtuais"
 
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Adicionar"
+
 #: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Fonte de pastas virtuais"
@@ -13033,11 +13079,16 @@ msgid "Create New Folder"
 msgstr "Criar nova pasta"
 
 #: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
-#: mail/mail-component.c:699
+#: mail/mail-component.c:701
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Especificar onde criar a pasta:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Criar pasta"
+
 #: mail/em-folder-selector.c:303
 #: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
@@ -13075,7 +13126,8 @@ msgstr "Copiar para _pasta"
 msgid "_Move to Folder"
 msgstr "M_over para pasta"
 
-#: mail/em-folder-tree.c:959 mail/em-folder-tree.c:2551
+#: 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
 msgid "_Move"
 msgstr "_Mover"
@@ -13085,17 +13137,22 @@ msgid "Cancel _Drag"
 msgstr "Cancelar _arraste"
 
 #: mail/em-folder-tree.c:2056 mail/em-folder-tree.c:2069
-#: mail/em-folder-view.c:796 mail/em-folder-view.c:810
+#: mail/em-folder-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Selecionar pasta"
 
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copiar"
+
 #: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Criando pasta `%s'"
 
-#: mail/em-folder-tree.c:2282 mail/mail-component.c:699
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Criar pasta"
 
@@ -13132,7 +13189,7 @@ msgid "_Properties..."
 msgstr "_Propriedades..."
 
 #: mail/em-folder-tree-model.c:199 mail/em-folder-tree-model.c:201
-#: mail/mail-vfolder.c:851
+#: mail/mail-vfolder.c:889
 msgid "VFolders"
 msgstr "Pastas virtuais"
 
@@ -13150,304 +13207,304 @@ msgstr "Caixa de entrada"
 msgid "Loading..."
 msgstr "Carregando..."
 
-#: mail/em-folder-view.c:412 mail/GNOME_Evolution_Mail.server.in.in.h:11
+#: 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:507
-#: mail/mail-component.c:550
+#: mail/importers/pine-importer.c:474 mail/mail-component.c:508
+#: mail/mail-component.c:551
 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:893 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
 #: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editar como nova mensagem..."
 
-#: mail/em-folder-view.c:895
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Imprimir"
 
-#: mail/em-folder-view.c:898 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 "_Responder ao remetente"
 
-#: mail/em-folder-view.c:899 mail/em-popup.c:810
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Responder a _lista"
 
-#: mail/em-folder-view.c:900 mail/em-popup.c:811
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Responder a _todos"
 
-#: mail/em-folder-view.c:901 mail/em-popup.c:813
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
 #: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Encamin_har"
 
-#: mail/em-folder-view.c:904
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "_Continuar..."
 
-#: mail/em-folder-view.c:905
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Marcar como concl_uída"
 
-#: mail/em-folder-view.c:906
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Lim_par marca"
 
-#: mail/em-folder-view.c:909 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 "Marcar como li_da"
 
-#: mail/em-folder-view.c:910
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Marcar como _não lida"
 
-#: mail/em-folder-view.c:911
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marcar como i_mportante"
 
-#: mail/em-folder-view.c:912
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Marcar como sem imp_ortância"
 
-#: mail/em-folder-view.c:913 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 "Marcar como _lixo"
 
-#: mail/em-folder-view.c:914 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 "Marcar como _não lixo"
 
-#: mail/em-folder-view.c:918
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Des_fazer exclusão"
 
-#: mail/em-folder-view.c:921
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Mo_ver para pasta..."
 
-#: mail/em-folder-view.c:922 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Copiar para p_asta..."
 
-#: mail/em-folder-view.c:930
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Adicionar remetente ao catálo_go de endereços"
 
-#: mail/em-folder-view.c:933
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Aplicar _filtros"
 
-#: mail/em-folder-view.c:934
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "Filtrar _lixo"
 
-#: mail/em-folder-view.c:937
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Criar _regra a partir da mensagem"
 
-#: mail/em-folder-view.c:938
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Pasta virtual por _assunto"
 
-#: mail/em-folder-view.c:939
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Pasta virtual por _remetente"
 
-#: mail/em-folder-view.c:940
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Pasta virtual por _destinatários"
 
-#: mail/em-folder-view.c:941
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Pasta virtual por _lista de discussão"
 
-#: mail/em-folder-view.c:945
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtro por a_ssunto"
 
-#: mail/em-folder-view.c:946
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtro por r_emetente"
 
-#: mail/em-folder-view.c:947
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtro por des_tinatários"
 
-#: mail/em-folder-view.c:948
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtro por l_ista de discussão"
 
 #. default charset used in mail view
-#: mail/em-folder-view.c:1708 mail/em-folder-view.c:1748
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Padrão"
 
-#: mail/em-folder-view.c:1798
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Imprimir mensagem"
 
-#: mail/em-folder-view.c:2063
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "Copiar local do _vínculo"
 
-#: mail/em-folder-view.c:2328
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Clique para enviar correio para %s"
 
-#: mail/em-format.c:742 mail/em-format-html.c:1431 mail/em-format-quote.c:192
+#: 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 "De"
 
-#: mail/em-format.c:743 mail/em-format-html.c:1431 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 "Responder-A"
 
-#: mail/em-format.c:744 mail/em-format-html.c:1431 mail/em-format-quote.c:192
+#: 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 "Para"
 
-#: mail/em-format.c:745 mail/em-format-html.c:1431 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 "Cc"
 
-#: mail/em-format.c:746 mail/em-format-html.c:1431 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 "Bcc"
 
-#: mail/em-format.c:748 mail/em-format-html.c:1581 mail/em-format-quote.c:316
+#: 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:749 mail/em-format-html.c:1602 mail/em-mailer-prefs.c:89
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 msgid "Newsgroups"
 msgstr "Grupos de notícias"
 
-#: mail/em-format.c:985
+#: mail/em-format.c:993
 #, c-format
 msgid "%s attachment"
 msgstr "anexo %s"
 
-#: mail/em-format.c:1064 mail/em-format.c:1183
+#: mail/em-format.c:1024 mail/em-format.c:1143
 msgid "Could not parse S/MIME message: Unknown error"
 msgstr "Não foi possível analisar mensagem S/MIME: Erro desconhecido"
 
-#: mail/em-format.c:1173
+#: mail/em-format.c:1133
 msgid "Unsupported encryption type for multipart/encrypted"
 msgstr "Tipo de cifragem não suportado para multiparte/cifrado"
 
-#: mail/em-format.c:1319
+#: mail/em-format.c:1279
 msgid "Could not parse MIME message. Displaying as source."
 msgstr "Não foi possível analisar mensagem MIME. Exibindo como fonte."
 
-#: mail/em-format.c:1338
+#: mail/em-format.c:1298
 msgid "Unsupported signature format"
 msgstr "Formato de assinatura não suportado"
 
-#: mail/em-format.c:1346
+#: mail/em-format.c:1306
 msgid "Error verifying signature"
 msgstr "Erro ao verificar assinatura"
 
-#: mail/em-format.c:1346
+#: mail/em-format.c:1306
 msgid "Unknown error verifying signature"
 msgstr "Erro desconhecido ao verificar assinatura"
 
-#: mail/em-format-html.c:453 mail/em-format-html.c:455
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
 msgid "Retrieving `%s'"
 msgstr "Buscando `%s'"
 
-#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "Não assinado"
 
-#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 msgid "Valid signature"
 msgstr "Assinatura válida"
 
-#: mail/em-format-html.c:562 mail/em-format-html-display.c:647
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 msgid "Invalid signature"
 msgstr "Assinatura inválida"
 
-#: mail/em-format-html.c:563
+#: mail/em-format-html.c:562
 msgid "Valid signature but cannot verify sender"
 msgstr "Assinatura válida, mas não é possível verificar remetente"
 
-#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 msgid "Unencrypted"
 msgstr "Não cifrada"
 
-#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr "Cifrada, cifra fraca"
 
-#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 msgid "Encrypted"
 msgstr "Cifrada"
 
-#: mail/em-format-html.c:572 mail/em-format-html-display.c:657
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr "Cifrada, cifra forte"
 
-#: mail/em-format-html.c:838
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Parte external-body malformada."
 
-#: mail/em-format-html.c:868
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Apontador para site FTP (%s)"
 
-#: mail/em-format-html.c:879
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Apontador para arquivo local (%s) válido no site \"%s\""
 
-#: mail/em-format-html.c:881
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Apontador para arquivo local (%s)"
 
-#: mail/em-format-html.c:902
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Apontador para dados remotos (%s)"
 
-#: mail/em-format-html.c:913
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Apontador para dados externos desconhecidos (tipo \"%s\")"
 
-#: mail/em-format-html.c:1155
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr "Formatando mensagem"
 
 #. pseudo-header
-#: mail/em-format-html.c:1541 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 "Programa de correio"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1568
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr "<I> (%a, %R %Z)</I>"
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1571
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr "<I> (%R %Z)</I>"
 
@@ -13457,7 +13514,7 @@ msgstr "<I> (%R %Z)</I>"
 msgid "Matches: %d"
 msgstr "Ocorrências: %d"
 
-#: mail/em-format-html-display.c:645
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
@@ -13465,7 +13522,7 @@ msgstr ""
 "Esta mensagem não está assinada. Não há garantias de que esta mensagem seja "
 "autêntica."
 
-#: mail/em-format-html-display.c:646
+#: 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."
@@ -13473,7 +13530,7 @@ msgstr ""
 "Esta mensagem está assinada e é válida. É muito provável que esta mensagem "
 "seja autêntica."
 
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13481,11 +13538,11 @@ msgstr ""
 "Não é possível verificar a assinatura desta mensagem. Ela pode ter sido "
 "alterada em trânsito. "
 
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Assinatura válida, não é possível verificar remetente"
 
-#: mail/em-format-html-display.c:648
+#: 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."
@@ -13493,7 +13550,7 @@ msgstr ""
 "Esta mensagem está assinada com uma assinatura válida, mas o remetente não "
 "pode ser verificado."
 
-#: mail/em-format-html-display.c:654
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
@@ -13501,7 +13558,7 @@ msgstr ""
 "Esta mensagem não está cifrada. O seu conteúdo pode ser visto em trânsito "
 "através da Internet."
 
-#: mail/em-format-html-display.c:655
+#: 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 "
@@ -13511,7 +13568,7 @@ msgstr ""
 "difícil, mas não impossível, que um estranho conseguisse ver o conteúdo "
 "desta mensagem em uma quantidade de tempo razoável."
 
-#: mail/em-format-html-display.c:656
+#: 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."
@@ -13519,7 +13576,7 @@ msgstr ""
 "Esta mensagem está cifrada. Seria difícil que um estranho conseguisse ver o "
 "conteúdo desta mensagem."
 
-#: mail/em-format-html-display.c:657
+#: 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 "
@@ -13529,35 +13586,35 @@ 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:758
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Ver certificado"
 
-#: mail/em-format-html-display.c:773
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Este certificado não é observável"
 
-#: mail/em-format-html-display.c:1005
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Concluída em %d de %B, %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Atrasada:"
 
-#: mail/em-format-html-display.c:1016
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "até %d de %B, %Y, %H:%M"
 
-#: mail/em-format-html-display.c:1086
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Ver embutido"
 
-#: mail/em-format-html-display.c:1087
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Esconder"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Página %d de %d"
@@ -13699,28 +13756,28 @@ msgstr "Por favor, selecione um servidor."
 msgid "No server has been selected"
 msgstr "Não foi selecionado um servidor"
 
-#: mail/em-utils.c:98
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Não exibir esta mensagem novamente."
 
-#: mail/em-utils.c:288
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtros"
 
-#: mail/em-utils.c:402
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "mensagem"
 
-#: mail/em-utils.c:505
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Salvar mensagem..."
 
-#: mail/em-utils.c:554
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Adicionar endereço"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:1012
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Mensagens de %s"
@@ -14202,58 +14259,67 @@ msgid "spamd port"
 msgstr "porta do spamd"
 
 #: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 msgid "Composer Preferences"
 msgstr "Preferências do redator"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
 msgid ""
 "Configure mail preferences, including security and message display, here"
 msgstr ""
 "Configure aqui preferências de correio, incluindo segurança e exibição de "
 "mensagens"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
 msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 "Configure aqui a verificação ortográfica, assinaturas e o redator de "
 "mensagens"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 msgid "Configure your email accounts here"
 msgstr "Configure aqui as suas contas de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 msgid "Evolution Mail"
 msgstr "Correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 msgid "Evolution Mail accounts configuration control"
 msgstr "Controle de configuração de contas do correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 msgid "Evolution Mail component"
 msgstr "Componente correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 msgid "Evolution Mail composer"
 msgstr "Redator do correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 msgid "Evolution Mail composer configuration control"
 msgstr "Controle de configuração do redator do correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
 msgid "Evolution Mail preferences control"
 msgstr "Controle de preferências do correio do Evolution"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
 msgid "Mail Accounts"
 msgstr "Contas de correio"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13 mail/mail-config.glade.h:96
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
 msgid "Mail Preferences"
 msgstr "Preferências de correio"
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Correio:"
+
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
 msgstr "O Evolution está importando seu correio antigo Elm"
@@ -14505,66 +14571,66 @@ msgstr "Lista de discussão %s"
 msgid "Add Filter Rule"
 msgstr "Adicionar regra de filtro"
 
-#: mail/mail-component.c:460
+#: mail/mail-component.c:461
 #, c-format
 msgid "%d deleted"
 msgstr "%d apagadas"
 
-#: mail/mail-component.c:462
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr "%d lixo"
 
-#: mail/mail-component.c:485
+#: mail/mail-component.c:486
 #, c-format
 msgid "%d drafts"
 msgstr "%d rascunhos"
 
-#: mail/mail-component.c:487
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d enviadas"
 
-#: mail/mail-component.c:489
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d não enviadas"
 
-#: mail/mail-component.c:493
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:495
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ", %d não lidas"
 
-#: mail/mail-component.c:651
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova mensagem de correio"
 
-#: mail/mail-component.c:652
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Mensagem de correio"
 
-#: mail/mail-component.c:653
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Redigir uma nova mensagem de correio"
 
-#: mail/mail-component.c:659
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Nova pasta de correio"
 
-#: mail/mail-component.c:660
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Pasta de correio"
 
-#: mail/mail-component.c:661
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Criar uma nova pasta de correio"
 
-#: mail/mail-component.c:793
+#: mail/mail-component.c:795
 msgid "Failed upgrading Mail settings or folders."
 msgstr "Falhou a atualização das configurações ou pastas de correio."
 
@@ -15769,7 +15835,7 @@ msgstr "S_obrescrever"
 msgid "_Append"
 msgstr "_Adicionar"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -16075,20 +16141,25 @@ msgstr "Pasta inválida: `%s'"
 msgid "Setting up vfolder: %s"
 msgstr "Preparando pasta virtual: %s"
 
-#: mail/mail-vfolder.c:206
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Atualizando pastas virtuais para URI: %s"
 
-#: mail/mail-vfolder.c:921
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Atualizando pastas virtuais para URI: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Pastas virtuais"
 
-#: mail/mail-vfolder.c:960
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Editar pasta virtual"
 
-#: mail/mail-vfolder.c:1044
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nova pasta virtual"
 
@@ -16551,37 +16622,42 @@ msgstr ""
 "O Evolution está atualmente desconectado. Clique neste botão para trabalhar "
 "conectado."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Correio para %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Erro ao executar %s."
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "Bug buddy não está instalado."
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "Bug buddy não pôde ser executado."
 
-#: shell/e-shell-window-commands.c:170
+#: shell/e-shell-window-commands.c:171
 msgid "About Evolution"
 msgstr "Sobre o Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Trabalhar conectado"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Trabalhar desconectado"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "Trabalhar desconectado"
 
@@ -16804,7 +16880,7 @@ msgid "Evolution can import data from the following files:"
 msgstr "O Evolution pode importar dados dos seguintes arquivos:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
@@ -16839,7 +16915,7 @@ msgstr ""
 "We hope that you enjoy the results of our hard work, and we\n"
 "eagerly await your contributions!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 msgid ""
 "Thanks\n"
 "The Evolution Team\n"
@@ -16847,48 +16923,39 @@ msgstr ""
 "Obrigado\n"
 "A equipe do Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Não me diga novamente"
 
-#: shell/main.c:391
-msgid "Cannot register the Evolution shell."
-msgstr "Não é possível registrar a shell do Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Evolution shell: %s"
-msgstr "Não é possível iniciar a shell do Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Iniciar o Evolution ativando o componente especificado"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Iniciar no modo desconectado"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Iniciar no modo conectado"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Desligar a força todos os componentes do Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Executar novamente a migração do Evolution 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Enviar a saída de depuração de todos os componentes para um arquivo."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16911,9 +16978,11 @@ msgid ""
 "You will need to make more space available in your home directory before you "
 "can continue."
 msgstr ""
-"Atualizar os seus dados e configurações exigirá até {0} de espaço em disco, mas você possui apenas {1} disponíveis.\n"
+"Atualizar os seus dados e configurações exigirá até {0} de espaço em disco, "
+"mas você possui apenas {1} disponíveis.\n"
 "\n"
-"Você precisará liberar algum espaço em seu diretório pessoal antes de poder continuar."
+"Você precisará liberar algum espaço em seu diretório pessoal antes de poder "
+"continuar."
 
 #. shell:upgrade-failed primary
 #: shell/shell-errors.xml.h:8
@@ -16934,12 +17003,43 @@ msgid ""
 msgstr ""
 "{1}\n"
 "\n"
-"Se você decidir continuar, você pode não ter acesso a alguns dos seus dados antigos.\n"
+"Se você decidir continuar, você pode não ter acesso a alguns dos seus dados "
+"antigos.\n"
 
 #: shell/shell-errors.xml.h:15
 msgid "Continue"
 msgstr "Continuar"
 
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Não é possível registrar a shell do Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Assistente de contas do Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -17530,7 +17630,8 @@ msgid "_Preview Pane"
 msgstr "_Painel de visualização"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Salvar como VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18789,6 +18890,11 @@ msgstr "_Referência rápida"
 msgid "_Send / Receive"
 msgstr "_Enviar / receber"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Nova _janela"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Por _empresa"
@@ -18853,10 +18959,6 @@ msgstr "Com _prazo de conclusão"
 msgid "With _Status"
 msgstr "Com _estado"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Tarefas"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19012,30 +19114,31 @@ msgstr "Outro..."
 msgid "..."
 msgstr "..."
 
-#: widgets/misc/e-error.c:76 widgets/misc/e-error.c:77
-#: widgets/misc/e-error.c:119
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
 msgid "Evolution Error"
 msgstr "Erro do Evolution"
 
-#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
-#: widgets/misc/e-error.c:117
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
 msgid "Evolution Warning"
 msgstr "Alerta do Evolution"
 
-#: widgets/misc/e-error.c:116
+#: widgets/misc/e-error.c:118
 msgid "Evolution Information"
 msgstr "Informação do Evolution"
 
-#: widgets/misc/e-error.c:118
+#: widgets/misc/e-error.c:120
 msgid "Evolution Query"
 msgstr "Consulta do Evolution"
 
 #. setup a dummy error
-#: widgets/misc/e-error.c:389
+#: widgets/misc/e-error.c:410
 #, c-format
 msgid ""
 "<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
-msgstr "<span weight=\"bold\">Erro interno, foi pedido erro desconhecido '%s'</span>"
+msgstr ""
+"<span weight=\"bold\">Erro interno, foi pedido erro desconhecido '%s'</span>"
 
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
@@ -19180,6 +19283,12 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% cumprida)"
 
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Não foi possível iniciar gnome-vfs"
+
+#~ msgid "Cannot initialize the Evolution shell: %s"
+#~ msgstr "Não é possível iniciar a shell do Evolution: %s"
+
 #~ msgid "Display a message"
 #~ msgstr "Exibir uma mensagem"
 
@@ -19373,9 +19482,6 @@ msgstr "%s (%d%% cumprida)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Cônjuge:"
 
-#~ msgid "_Add"
-#~ msgstr "_Adicionar"
-
 #~ msgid "_Business:"
 #~ msgstr "C_omercial:"
 
diff --git a/po/ro.po b/po/ro.po
index 800513bfe0..3fac0f94c6 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Editare agendă"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Contacte"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Fereastra Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,16 +57,6 @@ msgstr "Nepornit"
 msgid " card"
 msgstr "Tipăreşte calendar"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Contacte"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Fereastra Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 #, fuzzy
 msgid "Default Sync Address:"
@@ -73,74 +73,24 @@ msgstr "Nu pot încărca %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Data terminare"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "ID certificat:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Crează sau editează conturile de mail şi alte preferinţe"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Contacte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Editare agendă"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Procesator pentru apariţia adreselor din agendă"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Vizualizor agendă minicard Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Componenta Evolution pentru sumarul activităţilor."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
+msgid "Failed to authenticate.\n"
 msgstr ""
+"Autentificare la serverul IMAP eşuată.\n"
+"%s\n"
+"\n"
+
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Introduceţi parola pentru %s"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -185,12 +135,16 @@ msgstr "Grup de _contact"
 msgid "Create a new contacts group"
 msgstr "Crează un grup nou de scurtături"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -198,39 +152,39 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Aştept..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Trimit \"%s\""
@@ -238,8 +192,8 @@ msgstr "Trimit \"%s\""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -247,7 +201,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr ""
@@ -297,24 +251,43 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr ""
-"Autentificare la serverul IMAP eşuată.\n"
-"%s\n"
-"\n"
+msgid "New Address Book"
+msgstr "Agendă"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Introduceţi parola pentru %s"
+#: 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
+#: 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
+#, 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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -334,6 +307,69 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Data terminare"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Contacte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID certificat:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Crează sau editează conturile de mail şi alte preferinţe"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Editare agendă"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Procesator pentru apariţia adreselor din agendă"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Vizualizor agendă minicard Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Componenta Evolution pentru sumarul activităţilor."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: 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
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -356,6 +392,7 @@ msgstr "Verific tipurile suportate"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 ""
@@ -429,7 +466,7 @@ msgstr "Grup de _contact"
 msgid "Address Book Properties"
 msgstr "Surse agendă"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 #, fuzzy
 msgid "Always"
@@ -446,119 +483,109 @@ msgid "Basic"
 msgstr "De bază"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Închide"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Connecting"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Nume listă:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Nume listă:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Încarcă _imaginile"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Stochez căutarea ca dosar V"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 #, fuzzy
 msgid "Never"
 msgstr "Fiecare"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Unu"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Alege o culoare"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "Scopul căutării:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Scopul căutării:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 #, fuzzy
 msgid "Searching"
 msgstr "Caut..."
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -569,7 +596,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -578,21 +605,21 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 #, fuzzy
 msgid "Sub"
 msgstr "Du"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Stochez căutarea ca dosar V"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -600,7 +627,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -610,34 +637,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -645,140 +672,146 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format timp:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid "Using email address"
 msgstr "_Aceasta este adresa de expediere"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Grup de _contact"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adresa email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 #, fuzzy
 msgid "_Name:"
 msgstr "Nume:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 #, fuzzy
 msgid "_Port number:"
 msgstr "Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Prioritate:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 #, fuzzy
 msgid "_Search base:"
 msgstr "Domeniu căutare:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 #, fuzzy
 msgid "_Server name:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Mesaj server:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Durata de sforăire (minute)"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Foloseşte conectare securizată (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "cards"
 msgstr "Nepornit"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Deconectare de la %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "general-tab"
 msgstr "General"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minute"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "searching-tab"
 msgstr "Caut..."
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaţa de selectare nume a agendei Evolution."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Şterge tot"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Şterge"
 
+#: 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 "Nume"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Şterge tot"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -804,22 +837,16 @@ msgstr "Adaugă la contacte"
 msgid "Unnamed Contact"
 msgstr "Contact schimbat:"
 
-#: 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
-msgid "Name"
-msgstr "Nume"
-
 #: 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
 msgid "Source"
 msgstr "Sursă"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr ""
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfaţa de selectare nume a agendei Evolution."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -892,60 +919,50 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresa _2"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ani_versare:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Ziua de naştere:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "întotdeauna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Calendar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Lo_calitate:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Companie"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -953,85 +970,95 @@ msgstr "Companie"
 msgid "Contact"
 msgstr "Contacte"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor de contacte"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Ţara"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Departament:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL liber-ocupat"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 #, fuzzy
 msgid "Full _Name..."
 msgstr "_Nume complet..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Adresa de acasă"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Adresa email:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Manager"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Poreclă:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "No_tiţe"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Alte"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "Căsuţa _poştală:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1059,9 +1086,9 @@ msgstr "Pagină"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
@@ -1097,24 +1124,38 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, 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
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #, fuzzy
 msgid "Editable"
 msgstr "Validează"
@@ -2168,103 +2209,121 @@ msgstr ""
 msgid "Zimbabwe"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Tipăreşte mesaj"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Contact schimbat:"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Adaug serviciu"
-
-#: 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 "_Acţiune"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Nume utilizator:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Port:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Nume grup:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Sursă"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Contact nou"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Câmpul De la"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Scaun"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Această persoană de contact aparţine categoriilor:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Şterge contactele selectate"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Nume"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Tipăreşte mesaj"
+
+#: 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 "Adaug serviciu"
+
+#: 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 "_Acţiune"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Nume utilizator:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Contact Adăugare-Rapidă"
@@ -2287,20 +2346,6 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-#, 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
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2"
@@ -2455,8 +2500,8 @@ msgstr "editor-lista-contact"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 #, fuzzy
 msgid "Book"
 msgstr "Corp"
@@ -2520,6 +2565,455 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Căutare avansată"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Membri"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizaţie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Jos:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Nume grup:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Inexistent"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Lucrez"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "întotdeauna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Telefon mobil"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "General"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Notă"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Funcţia:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax acasă"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Succes"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Depozitare offline"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Acces interzis"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, 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
+#, 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
+msgid "Protocol not supported"
+msgstr "Protocol nesuportat"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Revocat"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nu pot redenumi dosarul: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Eşec la autentificare."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Necesită autentificare"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Nu există mesaj"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Altă eroare"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nu pot deschide această agendă. Aceasta poate însemna\n"
+"că aţi introdus URI incorect, sau serverul LDAP\n"
+"e căzut"
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nu pot deschide această agendă. Aceasta poate însemna\n"
+"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
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Eroare adăugare card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Eroare la modificarea listei"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Eroare la modificare card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Eroare ştergere card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+#, 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
+msgid "card.vcf"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+#, fuzzy
+msgid "list"
+msgstr "Ceaţă"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Nepornit"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Salvează in agendă"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Carduri V multiple"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "Card V pentru %s"
+
+#.
+#. * 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
+#, fuzzy
+msgid "(none)"
+msgstr "(Fără nume)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Email principal"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Selectez o acţiune"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Crează contact nou \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Adaugă adresa la contactul existent \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Căutare agendă..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Editare informaţii contact"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Reuneşte adresele email:"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "nu conţine"
+msgstr[1] "nu conţine"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Arată toate antetele"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Salvează ca şi card V"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Salvează in agendă"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2535,8 +3029,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
 msgid "Query"
 msgstr "Fiecare"
@@ -2597,9 +3091,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Salvează ca şi card V"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2675,7 +3170,7 @@ msgid "Cut"
 msgstr "Decupează"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2686,18 +3181,8 @@ msgstr "Copiază"
 msgid "Paste"
 msgstr "Lipeşte"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Şterg"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 #, fuzzy
 msgid "Current View"
 msgstr "Vizualizarea _curentă"
@@ -2711,7 +3196,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 #, fuzzy
 msgid "Any Category"
@@ -2753,21 +3238,6 @@ msgstr "Categorii"
 msgid "Company Phone"
 msgstr "Telefon companie"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Nume de familie"
@@ -2807,29 +3277,14 @@ msgstr "Corean"
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Telefon mobil"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Poreclă"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Notă"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Birou"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizaţie"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Alt Fax"
@@ -2883,23 +3338,33 @@ msgstr "Nevăzut"
 msgid "Web Site"
 msgstr "Site web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Lăţime:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Înălţime:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Şterse"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sortare sarcini"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -2918,10 +3383,6 @@ msgstr ""
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr ""
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 #, fuzzy
 msgid ""
@@ -2955,432 +3416,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "după"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Şterse"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Sortare sarcini"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Membri"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Jos:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Nume grup:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Inexistent"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Lucrez"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "întotdeauna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "General"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Funcţia:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax acasă"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Succes"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Depozitare offline"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Acces interzis"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, 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:59
-#, 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:60
-msgid "Protocol not supported"
-msgstr "Protocol nesuportat"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Revocat"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nu pot redenumi dosarul: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "Eşec la autentificare."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Necesită autentificare"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nu există mesaj"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Altă eroare"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nu pot deschide această agendă. Aceasta poate însemna\n"
-"că aţi introdus URI incorect, sau serverul LDAP\n"
-"e căzut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nu pot deschide această agendă. Aceasta poate însemna\n"
-"că aţi introdus URI incorect, sau serverul LDAP\n"
-"e căzut"
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Nu pot deschide agenda"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Doriţi să salvaţi modificările?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, fuzzy
-msgid "_Discard"
-msgstr "Tipăreşte calendar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Eroare adăugare listă"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Eroare adăugare card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Eroare la modificarea listei"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Eroare la modificare card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Eroare la ştergerea listei"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Eroare ştergere card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-#, fuzzy
-msgid "Overwrite"
-msgstr "Suprascrieţi fişierul?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
 msgstr ""
 
-#: addressbook/gui/widgets/eab-gui-util.c:569
-#, fuzzy
-msgid "list"
-msgstr "Ceaţă"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Nepornit"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Salvează in agendă"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Carduri V multiple"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "Card V pentru %s"
-
-#.
-#. * 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
-#, fuzzy
-msgid "(none)"
-msgstr "(Fără nume)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Email principal"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Selectez o acţiune"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Crează contact nou \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Adaugă adresa la contactul existent \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Căutare agendă..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Editare informaţii contact"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Reuneşte adresele email:"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "nu conţine"
-msgstr[1] "nu conţine"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Arată toate antetele"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Salvează ca şi card V"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Salvează in agendă"
-
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
 msgstr "Vizualizare card"
@@ -3428,12 +3467,6 @@ msgstr "Compozitorul de mailuiri Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-#, fuzzy
-msgid "Print envelope"
-msgstr "Tipăreşte plic"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3445,6 +3478,12 @@ msgstr "Tipăreşte contactele selectate"
 msgid "Print contact"
 msgstr "Tipăreşte contactele selectate"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+#, fuzzy
+msgid "Print envelope"
+msgstr "Tipăreşte plic"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3633,18 +3672,6 @@ msgstr "_Contact"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nu pot deschide mesajul"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Nu găsesc card-ul"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3703,6 +3730,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nu pot deschide mesajul"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Nu găsesc card-ul"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 #, fuzzy
 msgid "Error loading default addressbook."
@@ -3718,12 +3757,13 @@ msgstr "Inserează fişier"
 msgid "No filename provided."
 msgstr "Nici un destinatar specificat"
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Contact schimbat:"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Introduceţi parola pentru %s"
@@ -3757,131 +3797,58 @@ msgstr "_Prioritate:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nu pot citi pilotul blocului aplicaţie ToDo"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Setări _mail..."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Calendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Setări _mail..."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution calendar iTip/iMip vizualizator"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Editor de ştiri Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Editor de ştiri Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Componenta Evolution pentru afişarea mailului."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Sarcini"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Procesator pentru serviciul notificare alarme"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 #, fuzzy
 msgid "Starting:"
 msgstr "Setări"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 #, fuzzy
 msgid "Ending:"
 msgstr "Umbrire"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 #, fuzzy
 msgid "Evolution Alarm"
 msgstr "Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, fuzzy, c-format
 msgid "Alarm on %s"
 msgstr "Alarme"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Închide"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Sforăie"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Durata de sforăire (minute)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Editează întălnire"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Sforăie"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Deschide"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nu e disponibilă o descriere."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3890,12 +3857,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Avertisment"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3903,7 +3870,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3914,20 +3881,21 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 #, fuzzy
 msgid "Do not ask me about this program again."
 msgstr "Nu mă întreba din nou"
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Procesator pentru serviciul notificare alarme"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nu pot iniţializa Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nu pot iniţializa gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nu pot crea procesatorul servicului de notificare alarmă"
 
@@ -4043,96 +4011,85 @@ msgid "Weekday the week starts on"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:26
-msgid "Whether to ask for confirmation on appointment deletion"
+msgid "Whether or not to use the notification tray for display alarms"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
-msgid "Whether to ask for confirmation when folder is expunged"
+msgid "Whether to ask for confirmation on appointment deletion"
 msgstr ""
 
 #: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+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 "Şterge sarcinile selectate"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Arată numărul de săptămâni"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Rezumatul conţine"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Descrierea conţine"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Comentariul conţine"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Descrierea conţine"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr ""
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "e mai mic decât"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "zile"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 #, fuzzy
 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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
 #, fuzzy
 msgid "%a %d %b %Y"
 msgstr "%a %d %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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
 #, fuzzy
 msgid "%d %B %Y"
 msgstr "%A, %d %B %Y"
@@ -4140,96 +4097,102 @@ msgstr "%A, %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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Contact nou"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
+#: calendar/gui/calendar-component.c:623
 #, fuzzy
-msgid "Properties..."
-msgstr "_Proprietăţi..."
+msgid "Failed upgrading calendars."
+msgstr "Încarc calendar..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Calendar"
+
+#: calendar/gui/calendar-component.c:1234
 #, fuzzy
 msgid "New appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 #, fuzzy
 msgid "_Appointment"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Crează o întîlnire nouă"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 #, fuzzy
 msgid "New meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Aceasta e o cerere de întâlnire."
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "Întâlnire nouă"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Crează o întîlnire nouă"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Contact nou"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Calendar"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Crează un calendar nou"
 
@@ -4259,16 +4222,37 @@ msgstr "Afişare săptamână"
 msgid "Month View"
 msgstr "Afişare lună"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Rezumatul conţine"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Descrierea conţine"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Comentariul conţine"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Descrierea conţine"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr ""
+
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Eroare in timpul comunicării cu serverul calendar"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Acces interzis"
@@ -4278,19 +4262,6 @@ msgstr "Acces interzis"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, fuzzy, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nu pot deschide dosarul în `%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI afişat de calendar"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opţiuni alarmă audio"
@@ -4361,7 +4332,7 @@ msgstr "timp în plus la fiecare"
 msgid "hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4381,14 +4352,14 @@ msgstr "Baze"
 msgid "Date/Time:"
 msgstr "Data/Ora"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Afişează un mesaj"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Redă un sunet"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4404,6 +4375,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
 msgid "Summary:"
 msgstr "Cuprins:"
@@ -4442,10 +4414,110 @@ msgstr "minut(e)"
 msgid "start of appointment"
 msgstr "început întâlnire"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Nume stil:"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Adaugă în calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Lista de sarcini"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Adaugă în calendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "săptămâni"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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
 #, fuzzy
 msgid "Enabled"
 msgstr "Validează"
@@ -4462,19 +4534,19 @@ msgstr "Nu înlătura"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Invalidează"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Validează"
 
@@ -4500,179 +4572,190 @@ msgstr "60 minute"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "Alerts"
-msgstr "Alarme"
+msgid "<b>Alerts</b>"
+msgstr "Descriere:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
 #, fuzzy
+msgid "<b>General</b>"
+msgstr "Memorator"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "informaţie calendar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "Descriere:"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Săptămâna de lucru"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#, fuzzy
 msgid "Calendar and Tasks Settings"
 msgstr "Setări _mail..."
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Culoare pentru sarcinile întârziate"
 
-#: 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 "Culoare pentru sarcinile de astăzi"
 
-#: 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
 #, fuzzy
 msgid "Days"
 msgstr "Zi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Afişează"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 #, fuzzy
 msgid "E_nable"
 msgstr "Validează"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Vineri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 #, fuzzy
 msgid "Hours"
 msgstr "ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 #, fuzzy
 msgid "Minutes"
 msgstr "minute"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Luni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "S_un"
 msgstr "Dum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sâmbătă"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 #, fuzzy
 msgid "Show week _numbers in date navigator"
 msgstr "Arată numărul de săptămâni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Duminică"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Sarcini pentru azi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 #, fuzzy
 msgid "T_hu"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Lista de sarcini"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Joi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Timp"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 #, fuzzy
 msgid "Time _zone:"
 msgstr "Zona temporală:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Marţi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Miercuri"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Săptămâna de lucru"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 #, fuzzy
 msgid "_12 hour (AM/PM)"
 msgstr "12 ore (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 #, fuzzy
 msgid "_24 hour"
 msgstr "24 ore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "Adaugă ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 #, fuzzy
 msgid "_Compress weekends in month view"
 msgstr "Comprimă weekend-urile la afişarea lunii"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Day begins:"
 msgstr "Afişează staţiile:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#, fuzzy
-msgid "_Display"
-msgstr "Afişează"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4682,158 +4765,57 @@ msgstr "Afişează"
 msgid "_Edit"
 msgstr "_Editează"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "URL liber-ocupat"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 #, fuzzy
 msgid "_Fri"
 msgstr "Vin"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-#, fuzzy
-msgid "_General"
-msgstr "General"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 #, fuzzy
 msgid "_Hide completed tasks after"
 msgstr "Ascunde mesajele şterse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 #, fuzzy
 msgid "_Mon"
 msgstr "Lun"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Sarcini întârziate"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 #, fuzzy
 msgid "_Sat"
 msgstr "Sâm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr ""
 "Arată termenul de final al întâlnirilor la afişarea săptămânii şi lunii"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Diviziuni de timp:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #, fuzzy
 msgid "_Tue"
 msgstr "Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 #, fuzzy
 msgid "_Wed"
 msgstr "Mie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "before every appointment"
 msgstr "înainte de sfîrşitul întâlnirii"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Nume stil:"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Adaugă în calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Lista de sarcini"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Calendar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Adaugă în calendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "săptămâni"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4910,81 +4892,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Nu aţi făcut modificări, actualizaţi editorul?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Eroare necunoscută: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " la "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Terminat "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Terminat "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nu pot actualiza fişierele corect"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Editează întâlnire"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Întâlnire - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Sarcina - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Intrare jurnal - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nu există rezumat"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Salvează ca..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nu pot obţine versiunea curentă!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Eroare necunoscută: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " la "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Terminat "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Terminat "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr ""
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -5111,28 +5093,28 @@ msgstr "Delegat la:"
 msgid "Enter Delegate"
 msgstr "Şterse"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Întâlnire"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Reaminteşte"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Revenire"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 #, fuzzy
 msgid "Scheduling"
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Întâlnire"
 
@@ -5144,7 +5126,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Data început"
@@ -5239,10 +5221,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5262,15 +5244,15 @@ msgstr "Un organizator trebuie setat."
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegat la..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5567,26 +5549,19 @@ msgstr ""
 msgid "Save Event"
 msgstr "Mesaj calendar"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Alege dosar"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Alegeţi dosarul destinaţie pentru importul datelor"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Calendar"
+msgid "_Destination"
+msgstr "Şterge acest dosar"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Lista de sarcini"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5624,38 +5599,44 @@ msgid "% _Complete"
 msgstr "% Terminat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Terminat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Ridicat"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "În derulare"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Scăzut"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nepornit"
 
@@ -5694,11 +5675,11 @@ msgstr "Adresa paginii de web:"
 msgid "Assignment"
 msgstr "Alocat"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nu pot deschide agenda"
@@ -5708,8 +5689,9 @@ msgstr "Nu pot deschide agenda"
 msgid "Con_fidential"
 msgstr "Confidenţial"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Descriere:"
@@ -5865,102 +5847,57 @@ msgstr "%s server %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Public"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Confidenţial"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Data sfârşit"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Data început"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Clic aici să adăugaţi o sarcină"
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Rezumat"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Fără titlu"
 
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
 #, fuzzy
-msgid "Free"
-msgstr "Grec"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Ocupat"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+msgid "Start Date:"
+msgstr "Data de început:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Data scadentă:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Poziţia geografică trebuie introdusă in format: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+#, fuzzy
+msgid "Status:"
+msgstr "_Stare"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritate:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nu"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Adresa paginii de web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Necunoscut"
+#: 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 "Public"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-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 "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Alocat"
+#: 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 "Confidenţial"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -6007,18 +5944,28 @@ msgstr "90%"
 msgid "100%"
 msgstr "10%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+#, fuzzy
+msgid "Free"
+msgstr "Grec"
+
+#: 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 "Ocupat"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 #, fuzzy
 msgid "Deleting selected objects"
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "Deschide"
 
@@ -6028,41 +5975,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Lipeşte"
 
@@ -6126,88 +6074,167 @@ msgstr "Prioritate"
 msgid "Start date"
 msgstr "Data început"
 
+#: 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 "Rezumat"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Sortare sarcini"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 #, fuzzy
 msgid "New _Appointment..."
 msgstr "întâlnire nouă..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 #, fuzzy
 msgid "New All Day _Event"
 msgstr "Eveniment zilnic nou"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 #, fuzzy
 msgid "New Meeting"
 msgstr "Întâlnire"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Selec_tează înlănţuirea"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Şterge..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Copiez în folderul..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Mut în folderul..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "Progra_mare întâlniri"
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Înaintează ca şi _calendar i"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 #, fuzzy
 msgid "Delete this _Occurrence"
 msgstr "Şterge această apariţie"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 #, fuzzy
 msgid "Delete _All Occurrences"
 msgstr "Şterge toate apariţiile"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Mergi la _ziua"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 #, fuzzy
 msgid "_Go to Date..."
 msgstr "Mergi la data..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "Setări _mail..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Data sfârşit"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Necunoscut"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nu"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Poziţia geografică trebuie introdusă in format: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -6231,36 +6258,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i diviziuni minute"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i diviziuni minute"
 
 #: calendar/gui/e-itip-control.c:592
 #, fuzzy
@@ -6374,11 +6401,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:950
-#, fuzzy
-msgid "Status:"
-msgstr "_Stare"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6413,7 +6435,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6650,68 +6672,63 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-#, fuzzy
-msgid "Calendar file could not be updated!\n"
-msgstr "Nu pot încărca cursorul\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 #, fuzzy
 msgid "Update complete\n"
 msgstr "Întâlnire încheiată:"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 #, 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:1858
+#: calendar/gui/e-itip-control.c:1859
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Bug buddy nu poate fi rulat."
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 #, 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:1864
+#: calendar/gui/e-itip-control.c:1865
 #, fuzzy
 msgid "Attendee status updated\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 #, fuzzy
 msgid "Attendee status could not be updated!\n"
 msgstr "Adrese participare"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 #, fuzzy
 msgid "Removal Complete"
 msgstr "% Terminat"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 #, fuzzy
 msgid "Item sent!\n"
 msgstr "Date trimise"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6837,28 +6854,6 @@ msgstr "Şterse"
 msgid "In Process"
 msgstr "În derulare"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Afară din oficiu"
@@ -6919,84 +6914,171 @@ msgstr "Ora de început a întâlnirii:"
 msgid "Meeting _end time:"
 msgstr "Ora de sfârşit a întâlnirii:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Introduceţi parola pentru %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr "Eroare la start %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, fuzzy, c-format
 msgid "Opening tasks at %s"
 msgstr "Deschid rezerva %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Eroare la start %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Data terminare"
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Şterge contactele selectate"
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 #, fuzzy
 msgid "Expunging"
 msgstr "Distrug dosarul"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Sarcini"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Nu există întâlniri"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Încarcă _imaginile"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Deschide în %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turc"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Setări _mail..."
+
+#: 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
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Setări _mail..."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Editor de ştiri Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Componenta Evolution pentru afişarea mailului."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Calendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "Sarcină"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Aprilie"
@@ -7142,6 +7224,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Acces interzis"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nu pot deschide agenda"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -7368,7 +7467,7 @@ msgid "Contacts: "
 msgstr "Contacte"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Previzualizează tipărirea"
 
@@ -7380,69 +7479,79 @@ msgstr "Tipăreşte elementul"
 msgid "Print Setup"
 msgstr "Setează tipărirea"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Şterse"
+msgstr[1] "Şterse"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Încarcă _imaginile"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 #, fuzzy
 msgid "New task"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "Sarcină"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Crează o sarcină nouă"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Sarcină nouă"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista de sarcini"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Crează o sarcină nouă"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "De afişat URI pentru dosarul sarcini"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nu pot incărca sarcinile în `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7450,12 +7559,12 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 #, fuzzy
 msgid "Do not ask me again."
 msgstr "Nu mă întreba din nou"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 #, fuzzy
 msgid "Print Tasks"
 msgstr "Tipăreşte calendar"
@@ -9147,7 +9256,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Creez dosar nou"
@@ -9243,33 +9352,6 @@ msgstr "Conţinut invalid al mesajului"
 msgid "Error executing filter search: %s: %s"
 msgstr "Eroare execuţie filtru căutare: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nu pot parsa expresia de căutare: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Eroare executare expresia căutare: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(potrivire totală) se cere un singur rezultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Execută interogare în header necunoscut: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9308,7 +9390,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Primesc mesaje"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nu pot parsa expresia de căutare: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Eroare executare expresia căutare: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(potrivire totală) se cere un singur rezultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(potrivire totală) se cere un singur rezultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(potrivire totală) se cere un singur rezultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Execută interogare în header necunoscut: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9316,43 +9443,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Anulat."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nu pot trimite mesajul: destinatar neprecizat."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9360,85 +9487,65 @@ msgid ""
 "%s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1246 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 "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Nu pot crea fişier temp: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nu pot crea fişier temp: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Mesaj criptat"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nu pot primi mesajul de la editor"
 
-#: 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 "Nu pot bloca: '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9460,6 +9567,26 @@ msgstr "Eşuare la blocare prin folosirea fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Eşec la blocarea prin folosirea flock(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 "Nu pot bloca: '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9706,7 +9833,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Răspuns de la server de autentificare eşuată."
 
@@ -9913,7 +10040,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "ID certificat:"
 
 #: camel/camel-smime-context.c:360
@@ -9930,7 +10057,7 @@ msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 msgid "Failed to add data to CMS encoder"
 msgstr "Eşuare la stocarea mesajului în fişierul temporar %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr ""
@@ -10006,99 +10133,99 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Fişier semnătură:"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Adaugă criteriu"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Tip: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Comanda IMAP eşuată: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Eşec la găsirea certificatului pentru \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Eşec la găsirea algoritmului comun bulk."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Crează regulă din mesaj"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nu pot crea contextul pentru decodarea S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Eşec la trimiterea numelui utilizator la server"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Comandă neimplementată"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -10117,16 +10244,26 @@ msgstr "Nu pot lua dosarul: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, fuzzy, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Nu pot crea dosarul blocat la %s: %s"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, fuzzy, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Gunoi"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -10259,7 +10396,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10268,11 +10405,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -10294,7 +10431,7 @@ msgstr ""
 "Doriţi să acceptaţi oricum?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, fuzzy, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10309,28 +10446,28 @@ msgstr ""
 "\n"
 "Doriţi să acceptaţi oricum?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, fuzzy, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr "ID certificat:"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, fuzzy, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10342,17 +10479,17 @@ msgstr "ID certificat:"
 msgid "Could not parse URL `%s'"
 msgstr "Nu pot parsa URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Eroare la start %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nu există mesajul %s în %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Verific mesajele noi în toate dosarele"
@@ -10362,11 +10499,6 @@ msgstr "Verific mesajele noi în toate dosarele"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/camel-vee-store.c:390
-#, fuzzy, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nu pot crea dosarul blocat la %s: %s"
-
 #: camel/camel-vee-store.c:398
 #, fuzzy, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10383,10 +10515,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Nu puteţi copia mesaje din acest dosar"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Verific mailurile noi"
 
 #: 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 "Verific mesajele noi în toate dosarele"
@@ -10420,6 +10554,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10440,26 +10575,326 @@ msgstr ""
 msgid "Checklist"
 msgstr "Ceaţă densă"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %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 "Server deconectat neaşteptat"
+
+#: 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 "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nu pot lua mesajul: %s din dosarul %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 ""
+"Nu pot lua mesajul: %s din dosarul %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nu pot adăuga mesajul la dosarul mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nu pot adăuga mesajul la dosarul 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 ""
+"Nu pot lua mesajul: %s din dosarul %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 ""
+"Nu pot lua mesajul: %s din dosarul %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 ""
+"Nu pot lua mesajul: %s din dosarul %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 ""
+"Nu pot lua mesajul: %s din dosarul %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 "Dosare"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Arată numai dosare înscrise"
+
+#: 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 "Nume spaţiu"
+
+#: 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 "Pentru citirea şi stocarea mesajelor pe servere IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s serviciu pentru %s în %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:140
+#: 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 "Nu mă pot conecta la %s (port %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:815
+#: 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/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Conexiune anulată"
+
+#: 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"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"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
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"Eroare la trimiterea numelui utilizator: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Eroare necunoscută"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nu mă pot conecta la serverul POP.\n"
+"Mecanismul de autentificare solicitat este nesuportat."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sIntroduceţi vă rog parola SMTP pentru %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Autentificare nereuşită la serverul KPOP: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Nu pot deschide directorul cache: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "_Compania:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nu pot crea dosarul blocat la %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nu pot lua dosarul: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Răspuns neaşteptat de la serverul IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Nu există sarcini"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operaţia anulată"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, fuzzy, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server deconectat neaşteptat"
 
-#: 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:1089
-msgid "Unknown error"
-msgstr "Eroare necunoscută"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10502,22 +10937,22 @@ msgstr "Nu pot crea directorul %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nu pot încărca sumarul pentru %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Dosarul a fost distrus şi recreat pe server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 #, fuzzy
 msgid "Scanning for changed messages"
 msgstr "Salvez mesajele"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Eşec la decodarea mesajului."
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10533,25 +10968,25 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nu există mesaj"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Mesajul nu este disponibil în mod curent"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nu pot găsi corpul mesajului în răspunsul FETCH."
 
@@ -10593,23 +11028,6 @@ msgstr "Nu mă pot conecta la serverul LDAP."
 msgid "Command:"
 msgstr "_Compania:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Dosare"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Arată numai dosare înscrise"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Nume spaţiu"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Aplică filtrele pe mesajele noi din INBOX pe acest server"
@@ -10633,89 +11051,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:424
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Server SMTP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s serviciu pentru %s în %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nu mă pot conecta la %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Conexiune anulată"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"Nu mă pot conecta la serverul POP.\n"
-"Eroare la trimiterea numelui utilizator: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Nu aţi introdus o parolă."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10726,25 +11100,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nu există dosarul %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Nu pot deschide directorul cache: %s"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10752,7 +11119,7 @@ msgstr ""
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Eroare necunoscută: %s"
@@ -10861,58 +11228,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr "Pentru stocarea mail-urilor locale în directoare spool Unix"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Stocarea root %s nu e o cale absolută"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Stocarea root %s nu e director obişnuit"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Nu pot lua dosarul: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Stocările locale nu au un inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Fişier mail-uri locale %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nu pot redenumi dosarul %s în %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nu pot şterge dosarul sumar al fişierelor `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nu pot şterge dosarul index al fişierelor `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10979,7 +11346,7 @@ msgstr "Nu pot şterge dosarul `%s': %s"
 msgid "not a maildir directory"
 msgstr "nu e director maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11324,7 +11691,7 @@ 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:258
+#: 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
@@ -11334,8 +11701,8 @@ msgid "User cancelled"
 msgstr "Operaţia anulată"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11346,49 +11713,49 @@ msgstr ""
 "Nu pot lua mesajul: %s\n"
 "  %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Eroare la salvarea automată a mesajului: %s:\n"
 "%s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nu puteţi copia mesaje din acest dosar"
@@ -11509,7 +11876,7 @@ msgstr "Nu pot crea conexiunea: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Nu pot aduce mesajul: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11564,8 +11931,8 @@ msgstr "Nici un mesaj cu uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Primesc mesajul POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 #, fuzzy
 msgid "Unknown reason"
 msgstr "Precipitaţie necunoscută"
@@ -12033,7 +12400,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "anexă"
 
@@ -12078,6 +12445,98 @@ msgstr "Tip MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Sugerez afişarea automată a anexei"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Nu pot trimite mesajul: destinatar neprecizat."
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nu pot deschide mesajul"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nu pot primi mesajul de la editor"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Mesaj fără titlu)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Deschide fişier"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Salvează semnătura"
+
+#: 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.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 "Compune un mesaj"
+
+#: 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
+#, fuzzy
+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 ""
+"Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
+"nici o identitate în componenţa mailului."
+
+#: composer/e-msg-composer.c:3279
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
+"nici o identitate în componenţa mailului."
+
+#: 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
 #, fuzzy
 msgid "Posting destination"
@@ -12163,213 +12622,141 @@ msgstr "<clic aici să alegeţi un dosar>"
 msgid "Attach file(s)"
 msgstr "Anexează un fisier"
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Nu pot trimite mesajul: destinatar neprecizat."
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nu pot deschide mesajul"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nu pot primi mesajul de la editor"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Mesaj fără titlu)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Deschide fişier"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr ""
-
-#: composer/e-msg-composer.c:2087
-#, fuzzy
-msgid "Signature:"
-msgstr "Salvează semnătura"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Compune un mesaj"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Anexează un fişier la mesaj"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-#, fuzzy
-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: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 ""
-"Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
-"nici o identitate în componenţa mailului."
 
-#: composer/e-msg-composer.c:3269
-#, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Nu pot crea fereastra de compunere pentru că n-aţi configurat încă\n"
-"nici o identitate în componenţa mailului."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+"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/mail-composer-errors.xml.in.h:2
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid "All accounts have been removed."
-msgstr "Salvează fişierul curent cu un nume diferit"
+msgid "Unfinished messages found"
+msgstr "Trimite şi mesajele ciornă"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+msgid "Do you want to recover unfinished messages?"
+msgstr "Doriţi să salvaţi modificările?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nu pot crea conexiunea: %s"
+msgid "Don't Recover"
+msgstr "Nu înlătura"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-"Nu pot deschde fişierul semnătură %s:\n"
-"%s"
+msgid "Recover"
+msgstr "Şterge"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 "Nu pot deschde fişierul semnătură %s:\n"
 "%s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Tipăreşte calendar"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Doriţi să salvaţi modificările?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Eroare la salvarea scurtăturilor."
 
-#: composer/mail-composer-errors.xml.in.h:13
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
 #, fuzzy
-msgid "Don't Recover"
-msgstr "Nu înlătura"
+msgid "Warning: Modified Message"
+msgstr "Mesaje înaintate"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Eroare la salvarea scurtăturilor."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi întălnirea"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Şterge"
+msgid "Discard Changes"
+msgstr "Tipăreşte calendar"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Salvează mesajul ca..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nu pot crea conexiunea: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Trimite şi mesajele ciornă"
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
+"Nu pot deschde fişierul semnătură %s:\n"
+"%s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-#, fuzzy
-msgid "Warning: Modified Message"
-msgstr "Mesaje înaintate"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Anexează un fişier la mesaj"
+msgid "All accounts have been removed."
+msgstr "Salvează fişierul curent cu un nume diferit"
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12501,7 +12888,8 @@ msgstr ""
 "Fişier al cărui nume există deja.\n"
 "Îl suprascrieţi?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Suprascrieţi fişierul?"
 
@@ -12690,85 +13078,101 @@ msgstr "Selectez ora locală"
 msgid "_Filter Rules"
 msgstr "Reguli filtre"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Eroare în expresia regulată '%s':\n"
-"%s"
+msgid "Missing date."
+msgstr "Ora de sfârşit a întâlnirii:"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Oops. Aţi uitat să alegeţi o dată."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Fişierul spool `%s' nu există sau nu e un fişier obişnuit."
+msgid "Missing file name."
+msgstr "_Nume listă:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Ora de sfârşit a întâlnirii:"
+msgid "You must specify a file name."
+msgstr "Nume stil:"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "_Nume listă:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Fişierul spool `%s' nu există sau nu e un fişier obişnuit."
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Rezumare dosar"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Alocat"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "Nume stil:"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Acest eveniment a fost şters."
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Eroare în expresia regulată '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Oops. Aţi uitat să alegeţi o dată."
+msgid "Missing name."
+msgstr "Alocat"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 #, fuzzy
 msgid "You must name this filter."
 msgstr "Schimbă numele acestui dosar"
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Schimbă numele acestui dosar"
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Nume stil:"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "Nume stil:"
+msgid "No sources selected."
+msgstr "Acest eveniment a fost şters."
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12782,69 +13186,11 @@ msgstr "Selectez o acţiune"
 msgid "<b>Then</b>"
 msgstr "Descriere:"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Alege dosar"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Important"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "To Do"
-msgstr "La"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Later"
-msgstr "după"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Nume regulă:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Fără titlu"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "Descriere:"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Execută acţiunile"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "dacă toate criteriile sunt îndeplinite"
-
-#: filter/filter-rule.c:813
-#, fuzzy
-msgid "if any criteria are met"
-msgstr "dacă oricare criteriu e îndeplinit"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "intră"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "iese"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12940,6 +13286,80 @@ 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
+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
+#, 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
+#, fuzzy
+msgid "Later"
+msgstr "după"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Nume regulă:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "Descriere:"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "dacă toate criteriile sunt îndeplinite"
+
+#: filter/filter-rule.c:854
+#, fuzzy
+msgid "if any criteria are met"
+msgstr "dacă oricare criteriu e îndeplinit"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Execută acţiunile"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Şterse"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Înlocuieşte"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Răspuns la"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Include:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "intră"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "iese"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -13077,7 +13497,7 @@ msgstr "Marcat"
 msgid "Junk Test"
 msgstr "Iunie"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -13119,7 +13539,7 @@ msgstr "Ieşire din program"
 msgid "Play Sound"
 msgstr "Redă sunetul:"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Citeşte"
 
@@ -13192,9 +13612,9 @@ msgstr "începe cu"
 msgid "Stop Processing"
 msgstr "Opresc procesarea"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -13267,119 +13687,68 @@ msgstr "nu conţine"
 msgid "Virtual _Folders"
 msgstr "Dosare virtuale"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Adaugă"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "Surse dosare V"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Preferinţe calendar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Crează sau editează conturile de mail şi alte preferinţe"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Compozitorul de mailuiri Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Procesator pentru componenta de mail Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Componenta Evolution pentru afişarea mailului."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Componenta Evolution pentru sumarul activităţilor."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Conturi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Preferinţe calendar"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 #, fuzzy
 msgid "[Default]"
 msgstr "Implicit"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 #, fuzzy
 msgid "Account name"
 msgstr "Management cont"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 #, fuzzy
 msgid "Unnamed"
 msgstr "Contact schimbat:"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 #, fuzzy
 msgid "Language(s)"
 msgstr "Limbaj"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Şterge tot în afară de semnătură"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Semnătură HTML:"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Mesaje înaintate"
+
+#: mail/em-composer-utils.c:1499
+#, 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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 #, fuzzy
 msgid "Create _Virtual Folder From Search..."
 msgstr "Crează dosar virtual din mesaj"
@@ -13419,495 +13788,459 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Previzualizare"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Nume dosar:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Dosare V"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Inbox"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Încarc..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Verific mesajele noi în toate dosarele"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Mută"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Anulează sarcina"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Alege dosarul"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Copiază"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Creez dosar nou"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Creez un dosar nou"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, fuzzy, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Redenumşte dosarul '%s'"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Vizualizare"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Deschide în fereastră nouă"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Mută"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Dosar _nou"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 #, fuzzy
 msgid "_Rename"
 msgstr "Redenumeşte"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "Dosare V"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Inbox"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Editează ca mesaj nou..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Ti_păreşte"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Răspunde la _listă"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Răspunde la toţi"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Înaintează"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Terminat"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Şterge"
 
-#: mail/em-folder-view.c:787 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 "Marchează ca citit"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 #, fuzzy
 msgid "Mark as _Unread"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 #, fuzzy
 msgid "_Mark as Unimportant"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Marchez ca necitit"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Marchează ca important"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 #, fuzzy
 msgid "U_ndelete"
 msgstr "Rec_uperează"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 #, fuzzy
 msgid "Mo_ve to Folder..."
 msgstr "Mut în folderul..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Copiază în dosarul..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 #, fuzzy
 msgid "Add Sender to Address_book"
 msgstr "Adaugă expeditorul în agendă"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 #, fuzzy
 msgid "Appl_y Filters"
 msgstr "Aplică filtre"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Reguli filtre"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 #, fuzzy
 msgid "Crea_te Rule From Message"
 msgstr "Crează regulă din mesaj"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Doasr V pe _subiect"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Dosar V pe expeditor"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Dosar V pe destinatari"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Dosar V în lista de mail"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "VFolder în expeditor"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtru pe subiect"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtru pe expeditor"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtru pe destinatari"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtru pe lista de mail"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtru pe expeditor"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 #, fuzzy
 msgid "Default"
 msgstr "Implicit"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Tipăreşte mesaj"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Copiază legătura către locaţia"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Clic aici să adăugaţi o sarcină"
 
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Clic aici să adăugaţi o sarcină"
-
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Potriviri:"
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Alocat"
+#: 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 "De la"
 
-#: mail/em-format-html-display.c:646
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
+#: 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 "Răspuns-la:"
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Adaugă criteriu"
+#: 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 "La"
 
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
+#: 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-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format.c:754 mail/em-format-html.c:1413 mail/em-format-quote.c:192
+#: mail/em-mailer-prefs.c:86
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Adaugă criteriu"
+msgid "Bcc"
+msgstr "Bcc:"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-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-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s anexă"
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "Unencrypted"
-msgstr "Nedefinit"
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-#, fuzzy
-msgid "Encrypted, weak"
-msgstr "Mesaj criptat"
-
-#: mail/em-format-html-display.c:656
-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.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Encrypted"
-msgstr "Criptare PGP"
+msgid "Unsupported signature format"
+msgstr "Operaţie anulată de utilizator."
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Eşec la verificarea certificatului."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Mesaj criptat"
+msgid "Unknown error verifying signature"
+msgstr "Eşec la verificarea certificatului."
 
-#: mail/em-format-html-display.c:658
-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.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Primesc mesajul %s"
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
-msgid "_View Certificate"
-msgstr "ID certificat:"
+msgid "Unsigned"
+msgstr "Alocat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "Mesajul nu este disponibil în mod curent"
+msgid "Valid signature"
+msgstr "Adaugă criteriu"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgid "Invalid signature"
+msgstr "Adaugă criteriu"
 
-#: mail/em-format-html-display.c:1010
-#, fuzzy
-msgid "Overdue:"
-msgstr "Termen depăşit"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%b %d %l:%M %p"
+msgid "Unencrypted"
+msgstr "Nedefinit"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 #, fuzzy
-msgid "_View Inline"
-msgstr "Vedere inline"
+msgid "Encrypted, weak"
+msgstr "Mesaj criptat"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
-msgid "_Hide"
-msgstr "Ascund"
-
-#: mail/em-format-html-print.c:125
-#, fuzzy, c-format
-msgid "Page %d of %d"
-msgstr "Primesc mesajul %d din %d"
+msgid "Encrypted"
+msgstr "Criptare PGP"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Primesc mesajul %s"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Mesaj criptat"
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Corpul extern al mesajului parţial deformat."
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Indicator către site-ul FTP (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Indicator către fişierul local (%s) valid pe site-ul \"%s\""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Indicator către fişierul local (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, fuzzy, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Indicator către site-ul FTP (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Indicator către o dată externă necunoscută (tip \"%s\")"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "Copiez mesaje"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "De la"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Răspuns-la:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "La"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-#, fuzzy
-msgid "Bcc"
-msgstr "Bcc:"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 #, fuzzy
 msgid "Mailer"
 msgstr ""
@@ -13915,82 +14248,142 @@ msgstr ""
 "Program de mail:"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Potriviri:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
+
+#: mail/em-format-html-display.c:645
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
+
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s anexă"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
+#: 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."
+msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nu pot parsa mesajul MIME. Afişez ca sursă."
+#: 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."
+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."
+msgstr ""
 
-#: mail/em-format.c:1339
+#: 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 ""
+
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Operaţie anulată de utilizator."
+msgid "_View Certificate"
+msgstr "ID certificat:"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Eşec la verificarea certificatului."
+msgid "This certificate is not viewable"
+msgstr "Mesajul nu este disponibil în mod curent"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Eşec la verificarea certificatului."
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "Overdue:"
+msgstr "Termen depăşit"
+
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%b %d %l:%M %p"
+
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "Vedere inline"
+
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "Ascund"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-print.c:126
+#, fuzzy, c-format
+msgid "Page %d of %d"
+msgstr "Primesc mesajul %d din %d"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Fiecare"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "O zi"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "O săptămână"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "O lună"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13998,26 +14391,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Eşec la decodarea mesajului."
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Eşec la decodarea mesajului."
+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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Eşec la decodarea mesajului."
 
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Salvează ca..."
@@ -14027,101 +14450,85 @@ msgstr "Salvează ca..."
 msgid "untitled_image.%s"
 msgstr "(Mesaj fără titlu)"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Fundal:"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Răspunde la expeditor"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Deschide legătura în navigator"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Trimite _mesaj către lista..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Adăugare agendă"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Deschide în %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Răspunsul serverului IMAP nu conţine informaţia %s"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Abonează"
 
-#: mail/em-subscribe-editor.c:637 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 "Dosar"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 #, fuzzy
 msgid "No server has been selected"
 msgstr "Acest eveniment a fost şters."
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Nu arăta acest mesaj din nou"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "_Filtre..."
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Mesaje înaintate"
-
-#: mail/em-utils.c:1137
-#, 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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Mesaj"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Salvează mesajul ca..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "_Adresa:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Mail de la %s"
@@ -14141,11 +14548,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -14259,164 +14666,165 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Conturi"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Conturi"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Execută acţiunile"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "_Prioritate:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Configurare mail"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Configurare mail"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Întreabă-mă când trimit mesaje fără subiect"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14470,8 +14878,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "_Prioritate:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14614,37 +15023,73 @@ msgstr ""
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Compozitorul de mailuiri Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Compozitorul de mailuiri Evolution."
+msgid "Composer Preferences"
+msgstr "Preferinţe calendar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Configure your email accounts here"
+msgstr "Crează sau editează conturile de mail şi alte preferinţe"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Compozitorul de mailuiri Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Procesator pentru componenta de mail Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Componenta Evolution pentru sumarul activităţilor."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Conturi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Preferinţe calendar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Mail"
 
 #: mail/importers/elm-importer.c:88
 #, fuzzy
@@ -14653,16 +15098,16 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 #, fuzzy
 msgid "Please wait"
 msgstr "se termină cu"
@@ -14695,19 +15140,51 @@ msgid "Select folder to import into"
 msgstr "Alege dosar"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Se importă"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Se importă"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, fuzzy, c-format
 msgid "Scanning %s"
 msgstr "Trimit \"%s\""
@@ -14717,7 +15194,7 @@ msgstr "Trimit \"%s\""
 msgid "Priority Filter \"%s\""
 msgstr "_Prioritate:"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14732,7 +15209,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14740,7 +15217,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14749,25 +15226,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Se importă"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Setări"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Editează filtre"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14802,133 +15279,144 @@ msgid "Pine"
 msgstr "Tipăreşte"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor de conturi Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 #, fuzzy
 msgid "_Host:"
 msgstr "Gazdă:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "Nume utilizator:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 #, fuzzy
 msgid "_Path:"
 msgstr "Cale:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, fuzzy, c-format
 msgid "Mail to %s"
 msgstr "Mail la %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Subiectul este %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Mail de la %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s lista de mail"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Răspuns la"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Adaugă regulă de filtrare"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Şterse"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d netrimise"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Ciornă"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d netrimise"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d netrimise"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d total"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d netrimise"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Şterse"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 #, fuzzy
 msgid "New Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Mesaj _mail"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Compune un mesaj"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Dosar V Nou"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Editează filtre"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Creez un mail nou"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI afişat de calendar"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Conectare la server..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitate"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14939,13 +15427,13 @@ msgstr ""
 "\"de mai jos nu e necesar să le completaţi decât dacă doriţi să includeţi "
 "această informaţie în emailul pe care-l trimiteţi"
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14955,16 +15443,16 @@ msgstr ""
 "Dacă nu ştiţi ce fel de server folosiţi, contactaţi administratorul "
 "dumneavoastră de sistem sau furnizorul de serviciu Internet."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Trimit mail"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14974,11 +15462,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Management cont"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14993,14 +15481,6 @@ msgstr ""
 "rog introduceţi mai jos un nume pentru acest cont. Acest nume va fi folosit "
 "doar pentru afişare."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Conectare la server..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -15324,7 +15804,7 @@ msgstr "Execută acţiunile"
 
 #: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "se termină cu"
 
 #: mail/mail-config.glade.h:82
@@ -15667,429 +16147,546 @@ msgstr " culoare"
 msgid "description"
 msgstr "Descriere:"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Autentificare"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Serverul SMTP %s nu suportă tipul cerut de autentificare %s"
+
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
 msgstr ""
-"Sunteţi sigur că doriţi să deschideţitoate cele %d mesaje în ferestre "
-"separate?"
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Şterg pentru totdeauna mesajele şterse din toate dosarele"
+"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-errors.xml.in.h:6
+#. 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 "Sunteţi sigur că doriţi să retrimiteţi toate cele %d mesaje?"
 
-#: mail/mail-errors.xml.in.h:7
+#. 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"
+"{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
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Sunteţi sigur că doriţi să retrimiteţi toate cele %d mesaje?"
+msgid "_Send"
+msgstr "Trimite"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 "Sunteţi sigur că doriţi să retrimiteţi toate cele %d mesaje?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Sunteţi sigur că doriţi să retrimiteţi toate cele %d mesaje?"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Nu pot lua dosarul: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nu pot crea directorul temporar: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Nu pot crea directorul\n"
-"%s\n"
-"Eroare: %s"
+msgid "Use default drafts folder?"
+msgstr "Deschid dosarul %s"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
+"Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
+"Doriţi să folosiţi dosarul cu ciorne implicit?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Nu pot lua dosarul: %s: %s"
+msgid "Use _Default"
+msgstr "Implicit"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Dosarul `%s' nu există."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr ""
+"Sunteţi sigur că doriţi să deschideţitoate cele %d mesaje în ferestre "
+"separate?"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#. 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 ""
-"Nu pot şterge dosarul `%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Nu pot redenumi dosarul: %s"
+msgid "_Expunge"
+msgstr "Distrug_e"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Nu pot redenumi dosarul: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Şterg pentru totdeauna mesajele şterse din toate dosarele"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Nu pot deschide mesajul"
+msgid "_Empty Trash"
+msgstr "Goleş_te gunoiul"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nu pot lua dosarul: %s: %s"
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Nu pot crea directorul %s: %s"
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Nu pot lua mesajul: %s\n"
-"  %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Şterge tot în afară de semnătură"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Could not save signature file."
+msgid "Error while {0}."
 msgstr ""
-"Nu pot deschde fişierul semnătură %s:\n"
+"Eroare în timpul '%s':\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Şterg"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Delete account?"
-msgstr "Chiar ştergeţi acest cont?"
-
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+msgid "Error while performing operation."
 msgstr ""
+"Eroare în timpul operaţiei:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Doriţi să salvaţi modificările?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Nu şterge"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Eroare la încarcarea informaţiei de filtrare:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Eroare în timpul operaţiei:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Eroare în timpul '%s':\n"
-"%s"
+"Nu pot lua mesajul: %s\n"
+"  %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"Nu pot crea directorul\n"
+"%s\n"
+"Eroare: %s"
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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
 msgid "File exists but cannot overwrite it."
 msgstr "Fişierul există, suprascriu?"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
 msgid "File exists but is not a regular file."
 msgstr "Fişierul spool `%s' nu există sau nu e un fişier obişnuit."
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
+"Nu pot şterge dosarul `%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: mail/mail-errors.xml.in.h:46
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autentificare"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: mail/mail-errors.xml.in.h:48
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Actualizare automată"
-
-#: mail/mail-errors.xml.in.h:49
-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-errors.xml.in.h:50
-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-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
+msgid "Delete \"{0}\"?"
+msgstr "Şterg"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Şterge dosarul '%s'"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. 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-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. 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 ""
+"Nu pot şterge dosarul `%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "Serverul SMTP %s nu suportă tipul cerut de autentificare %s"
+msgid "Cannot open source \"{2}\"."
+msgstr "Nu pot redenumi dosarul: %s"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"Această semnătură a fost modificată, dar n-a fost salvată.\n"
-"Doriţi să salvaţi modificările?"
+msgid "Cannot open target \"{2}\"."
+msgstr "Nu pot deschide mesajul"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nu pot deschide dosarul cu ciorne pentru acest cont.\n"
-"Doriţi să folosiţi dosarul cu ciorne implicit?"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Use _Default"
-msgstr "Implicit"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nu pot lua dosarul: %s: %s"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Deschid dosarul %s"
+msgid "Cannot open source \"{1}\""
+msgstr "Nu pot redenumi dosarul: %s"
 
-#: mail/mail-errors.xml.in.h:66
+#. mail:account-incomplete primary
+#: mail/mail-errors.xml.h:156 mail/mail-errors.xml.h:160
+msgid "Cannot save changes to account."
+msgstr ""
+
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
 msgid "You have not filled in all of the required information."
 msgstr "Nu aţi completat toată informaţia cerută."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Chiar ştergeţi acest cont?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Sunteţi sigur că doriţi să ştergeţi acest cont?"
+
+#. 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-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Nu şterge"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
 msgstr ""
+"Nu pot deschde fişierul semnătură %s:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Şterge tot în afară de semnătură"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Goleş_te gunoiul"
+msgid "Do you wish to save your changes?"
+msgstr "Doriţi să salvaţi modificările?"
 
-#: mail/mail-errors.xml.in.h:73
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
-msgid "_Expunge"
-msgstr "Distrug_e"
+msgid "This signature has been changed, but has not been saved."
+msgstr ""
+"Această semnătură a fost modificată, dar n-a fost salvată.\n"
+"Doriţi să salvaţi modificările?"
+
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Send"
-msgstr "Trimite"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Dosarul `%s' nu există."
 
-#: mail/mail-errors.xml.in.h:75
+#. 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."
+msgstr ""
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 #, fuzzy
 msgid "vFolders automatically updated."
 msgstr "Actualizare automată"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+#, fuzzy
+msgid "Mail filters automatically updated."
+msgstr "Actualizare automată"
+
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-folder-cache.c:786
+#: 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 "Suprascrieţi fişierul?"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Deschide"
+
+#: mail/mail-folder-cache.c:787
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Trimit \"%s\""
@@ -16098,140 +16695,140 @@ msgstr "Trimit \"%s\""
 msgid "Working"
 msgstr "Lucrez"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 #, fuzzy
 msgid "Filtering Folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 #, fuzzy
 msgid "Fetching Mail"
 msgstr "Primesc mail"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Trimit mesajul %d din %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Eşec la decodarea mesajului."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Terminat"
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Salvez mesaj în dosar"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Mut mesajele în %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Copiez mesajele în %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Mesaje înaintate"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Deschid rezerva %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Şterg dosarul %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, fuzzy, c-format
 msgid "Storing folder '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Creez dosar nou"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Actualizez dosarul"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Distrug dosarul"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 "Se importă %s.\n"
 "Start %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 #, fuzzy
 msgid "Local Folders"
 msgstr "Dosare speciale"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Primesc mesajul %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Primesc mesaje"
 msgstr[1] "Primesc mesaje"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Salvez mesajele"
 msgstr[1] "Salvez mesajele"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -16240,7 +16837,7 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -16249,11 +16846,11 @@ msgstr ""
 "Eroare la salvarea mesajului: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Salvez anexa"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -16262,17 +16859,17 @@ msgstr ""
 "Nu pot crea fişierul de ieşire: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nu pot scrie data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Deconectare de la %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, fuzzy, c-format
 msgid "Reconnecting to %s"
 msgstr "Deconectare de la %s"
@@ -16339,26 +16936,26 @@ msgstr "Actualizez..."
 msgid "Waiting..."
 msgstr "Aştept..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Operaţie anulată de utilizator."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, fuzzy, c-format
 msgid "Enter Password for %s"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 #, fuzzy
 msgid "Enter Password"
 msgstr "Introduceţi parola pentru %s"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 #, fuzzy
 msgid "_Remember this password"
 msgstr "Memorez această parolă"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -16403,91 +17000,96 @@ msgstr "Mesaje înaintate"
 msgid "Invalid folder: `%s'"
 msgstr "Deschid dosarul %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, fuzzy, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Creez dosar nou"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:235
 #, fuzzy, c-format
-msgid "Updating vfolders for uri: %s"
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Scanez dosarele în \"%s\""
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Scanez dosarele în \"%s\""
+
+#: mail/mail-vfolder.c:959
 #, fuzzy
 msgid "vFolders"
 msgstr "Dosare"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 #, fuzzy
 msgid "Edit VFolder"
 msgstr "Editează dosare V"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Dosar V Nou"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nevăzut"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Văzut"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Răspuns"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Mesaje nevăzute multiple"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Mesaje multiple"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Cea mai scăzută"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Mai scăzută"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Mai mare"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Cea mai mare"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Astăzi %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Ieri %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 #, fuzzy
 msgid "Generating message list"
 msgstr "Salvez mesajele"
@@ -16522,47 +17124,47 @@ msgstr "Primit"
 msgid "Size"
 msgstr "Mărime"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 #, fuzzy
 msgid "Call"
 msgstr "Rechemare"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Mergi înainte în timp"
 
-#: 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
 #, fuzzy
 msgid "For Your Information"
 msgstr "Informaţie sursă"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Înaintează"
 
-#: 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:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Răspunde"
 
-#: mail/message-tag-followup.c:70 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 "Răspunde la toţi"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 #, fuzzy
 msgid "Review"
 msgstr "Previzualizare"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16612,21 +17214,6 @@ msgstr "Abonează"
 msgid "_Unsubscribe"
 msgstr "Dezabonează"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Shell Evolution."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Compozitorul de mailuiri Evolution."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16634,118 +17221,89 @@ msgstr "389"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Redenumeşte acest grup de scurtături"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Comută în timp ce se arată bara folder"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Ascunde bara de scurtături"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "_Prioritate:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "_Prioritate:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Interfaţa de configurare mail"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Deschid dosarul %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Deschid dosarul %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Deschid dosarul %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:10
+msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
+#: shell/apps_evolution_shell.schemas.in.in.h:11
+msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:19
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Deschid dosarul %s"
+msgid "mail"
+msgstr "Email"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:20
-msgid "Whether Evolution should start up in offline mode"
+#: shell/e-shell-about-box.c:45
+msgid "Brought to you by"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
 #, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Comută în timp ce se arată bara folder"
+msgid "Uknown system error."
+msgstr "Eroare necunoscută"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:22
+#: shell/e-shell.c:1101
 #, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Comută în timp ce se arată bara cu scurtături"
+msgid "Invalid arguments"
+msgstr "Conţinut invalid al mesajului"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:23
-msgid "Whether to skip the development warning dialog"
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
-#, fuzzy
-msgid "mail"
-msgstr "Email"
-
-#: shell/e-shell-about-box.c:45
-msgid "Brought to you by"
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
 msgstr ""
 
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Eroare generică"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Fără titlu)"
@@ -16884,11 +17442,11 @@ msgstr "Eşec la decodarea mesajului."
 msgid "_Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Închid conexiunile..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Setări Evolution..."
@@ -16930,11 +17488,35 @@ msgstr "Nu pot deschide directorul cache: %s"
 msgid "'.' and '..' are reserved folder names."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Evolution este în proces de deconectare."
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Mail la %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr ""
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, fuzzy, c-format
 msgid "Error executing %s."
 msgstr "Eroare execuţie filtru: %s: %s"
@@ -16950,7 +17532,7 @@ msgstr "Bug buddy nu poate fi rulat."
 
 #: shell/e-shell-window-commands.c:171
 #, fuzzy
-msgid "About Ximian Evolution"
+msgid "About Evolution"
 msgstr "Despre Evolution..."
 
 #: shell/e-shell-window-commands.c:382
@@ -16958,7 +17540,7 @@ msgstr "Despre Evolution..."
 msgid "_Work Online"
 msgstr "Lucrează offline"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Lucrează deconectat"
 
@@ -16966,52 +17548,6 @@ msgstr "Lucrează deconectat"
 msgid "Work Offline"
 msgstr "Lucrează deconectat"
 
-#: shell/e-shell-window.c:338
-#, fuzzy
-msgid ""
-"Ximian 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:345
-#, fuzzy
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Evolution este în proces de deconectare."
-
-#: shell/e-shell-window.c:351
-#, fuzzy
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-#, fuzzy
-msgid "Invalid arguments"
-msgstr "Conţinut invalid al mesajului"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr ""
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr ""
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Eroare generică"
-
 #: shell/e-storage-set-view.etspec.h:1
 #, fuzzy
 msgid "Checkbox"
@@ -17076,6 +17612,51 @@ msgstr "Conexiuni active"
 msgid "Click OK to close these connections and go offline"
 msgstr "Daţi clic pe OK pentru a închide această conexiune şi a vă deconecta"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Calendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Contacte"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Mail"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Sarcini"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Tip dosar:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Creză dosar nou..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Cont"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Nume dosar:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "Nume utilizator:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 #, fuzzy
 msgid "Evolution Setup Assistant"
@@ -17112,6 +17693,21 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Shell Evolution."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Compozitorul de mailuiri Evolution."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -17180,13 +17776,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution a găsit următoarea sursă de date:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -17212,76 +17808,132 @@ msgstr ""
 "Sperăm să vă bucuraţi de rezultatele eforturilor noastre, şi aşteptăm\n"
 "cu nerăbdare contribuţia dumneavostră!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Vă mulţumim\n"
 "Echipa Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Nu mă întreba din nou"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Nu pot accesa shell-ul Evolution."
-
-#: shell/main.c:400
-#, fuzzy, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Nu pot accesa shell-ul Evolution."
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 #, fuzzy
 msgid "Start in offline mode"
 msgstr "_Data început:"
 
-#: shell/main.c:501
+#: shell/main.c:500
 #, fuzzy
 msgid "Start in online mode"
 msgstr "_Data început:"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 "Trimite ieşirile pentru depanare ale tuturor componentelor într-un fişier."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "conţine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Tipăreşte Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Asistentul de conturi Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID certificat:"
@@ -17533,12 +18185,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID certificat:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID-ul card-ului există deja"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17760,6 +18406,12 @@ msgstr "Subiectul este %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID-ul card-ului există deja"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17804,12 +18456,12 @@ msgstr "Decupează mesajele selectate"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nu pot redenumi dosarul: %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17877,7 +18529,7 @@ msgstr "Selectează toate contactele"
 
 #: ui/evolution-addressbook.xml.h:23
 #, fuzzy
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr "Şterge contactele selectate"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17911,8 +18563,8 @@ msgstr "ora curentă"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Acţiuni"
@@ -17932,7 +18584,7 @@ msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
 #, fuzzy
-msgid "_Save as VCard"
+msgid "_Save as VCard..."
 msgstr "Salvează ca şi card V"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -18074,11 +18726,21 @@ msgstr "ora curentă"
 msgid "Week"
 msgstr "Săptămână"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Săptămâna de lucru"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "Întâlnire"
 
+#: 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 "Închide"
+
 #: 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
@@ -18418,6 +19080,16 @@ 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
+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
+msgid "_Close"
+msgstr "În_chide"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18677,7 +19349,8 @@ msgid "Open the selected message in a new window"
 msgstr "Deschde mesajul selectat într-o fereastră nouă"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Deschide mesajul selectat în compositor pentru a-l retrimite"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18803,65 +19476,52 @@ msgstr "Dosar V pentru _subiect..."
 msgid "_Attached"
 msgstr "Ataşează"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "Copiază în folder"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Crează filtru din mesaj"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 #, fuzzy
 msgid "_Go To"
 msgstr "Mergi la"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 #, fuzzy
 msgid "_Inline"
 msgstr "În linie"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 #, fuzzy
 msgid "_Larger"
 msgstr "Pager"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Afişează mesaj"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Mută in dosar"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 #, fuzzy
 msgid "_Next Message"
 msgstr "Mesaj"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Afişare normală"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Deschide mesajul"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 #, fuzzy
 msgid "_Previous Message"
 msgstr "Tipăreşte mesaj"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 #, fuzzy
 msgid "_Quoted"
 msgstr "Cotat"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Resend..."
-msgstr "_Redenumeşte..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Unelte"
@@ -18870,16 +19530,6 @@ msgstr "_Unelte"
 msgid "_Undelete"
 msgstr "Rec_uperează"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "În_chide"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ataşează"
@@ -19297,6 +19947,11 @@ msgstr "Preferinţe calendar"
 msgid "_Send / Receive"
 msgstr "Trimite / Primeşte"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Legătura DN:"
+
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -19376,11 +20031,6 @@ msgstr "_Data scadentă:"
 msgid "With _Status"
 msgstr "Setează starea"
 
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "Sarcină"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19544,6 +20194,35 @@ msgstr "Alte..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informaţie opţională"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Compozitorul de mailuiri Evolution."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Trimite şi mesajele ciornă"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19670,6 +20349,33 @@ msgstr "Test"
 msgid "Find _Now"
 msgstr "Legătura DN:"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. system:ask-save-file-exists-overwrite secondary
+#: widgets/misc/e-system-errors.xml.h:6
+#, fuzzy
+msgid "Do you wish to overwrite it?"
+msgstr "Doriţi să salvaţi modificările?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Nu pot lua mesajul: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Nu pot lua mesajul: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19681,8 +20387,145 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% complet)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Agendă"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Vizualizor agendă minicard Evolution"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adresa _2"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "întotdeauna"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution calendar iTip/iMip vizualizator"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Editor de ştiri Evolution"
+
+#~ msgid "Snoo_ze"
+#~ msgstr "Sforăie"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nu pot iniţializa gnome-vfs"
+
+#, fuzzy
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nu pot deschide dosarul în `%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI afişat de calendar"
+
+#~ msgid "Display a message"
+#~ msgstr "Afişează un mesaj"
+
+#, fuzzy
+#~ msgid "Alerts"
+#~ msgstr "Alarme"
+
+#~ msgid "Time"
+#~ msgstr "Timp"
+
+#, fuzzy
+#~ msgid "_General"
+#~ msgstr "General"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Alege dosar"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Calendar"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Lista de sarcini"
+
+#, fuzzy
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Nu pot încărca cursorul\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "De afişat URI pentru dosarul sarcini"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nu pot incărca sarcinile în `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Componenta Evolution pentru afişarea mailului."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder în expeditor"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtru pe expeditor"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Eşec la decodarea mesajului."
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Eşec la decodarea mesajului."
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Eşec la decodarea mesajului."
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI afişat de calendar"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Redenumeşte acest grup de scurtături"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Ascunde bara de scurtături"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Deschid dosarul %s"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Deschid dosarul %s"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Deschid dosarul %s"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Deschid dosarul %s"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Comută în timp ce se arată bara folder"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Comută în timp ce se arată bara cu scurtături"
+
+#, fuzzy
+#~ msgid "Cannot register the Ximian Evolution shell."
+#~ msgstr "Nu pot accesa shell-ul Evolution."
+
+#, fuzzy
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Nu pot accesa shell-ul Evolution."
+
+#, fuzzy
+#~ msgid "_Resend..."
+#~ msgstr "_Redenumeşte..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19754,9 +20597,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Soţ/soţie:"
 
-#~ msgid "_Add"
-#~ msgstr "_Adaugă"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Serviciu"
@@ -19810,18 +20650,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Task List Creation Assistant"
 #~ msgstr "Surse agendă"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Data de început:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Data scadentă:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioritate:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19852,14 +20680,6 @@ msgstr "%s (%d%% complet)"
 #~ "Nu pot trunchia fişierul: %s\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nu pot căuta în fişierul: %s\n"
-#~ "%s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19961,10 +20781,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Previzualizează calendar ce va fi tipărit"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Introduceţi parola pentru %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Lista de sarcini"
 
@@ -20038,42 +20854,6 @@ msgstr "%s (%d%% complet)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "C_alendar:"
-#~ msgstr "Calendar"
-
-#, fuzzy
-#~ msgid "_Contacts:"
-#~ msgstr "Contacte"
-
-#, fuzzy
-#~ msgid "_Mail:"
-#~ msgstr "Mail"
-
-#, fuzzy
-#~ msgid "_Tasks:"
-#~ msgstr "Sarcini"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Tip dosar:"
-
-#, fuzzy
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Creză dosar nou..."
-
-#, fuzzy
-#~ msgid "_Account:"
-#~ msgstr "Cont"
-
-#, fuzzy
-#~ msgid "_Folder Name:"
-#~ msgstr "Nume dosar:"
-
-#, fuzzy
-#~ msgid "_User:"
-#~ msgstr "Nume utilizator:"
-
-#, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Aceasta e o cerere de întâlnire."
 
@@ -20428,9 +21208,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Asistent"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Urmatoarele conexiuni sunt actualmente active:"
-
 #, fuzzy
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Caută contacte"
@@ -20686,10 +21463,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr ""
 #~ "Acest mesaj este semnat digital dar nu se poate dovedi că e autentic."
 
-#, fuzzy
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20787,18 +21560,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "informaţie calendar"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Memorator"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "Descriere:"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "informaţie calendar"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Clasificare"
 
@@ -21747,10 +22508,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Componenta Evolution pentru sumarul activităţilor."
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Compozitorul de mailuiri Evolution."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Compozitorul de mailuiri Evolution."
 
@@ -21963,10 +22720,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "August"
 
 #, fuzzy
-#~ msgid "Aspen"
-#~ msgstr "Deschide"
-
-#, fuzzy
 #~ msgid "Asswan"
 #~ msgstr "Asistent"
 
@@ -22515,10 +23268,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Copiez"
 
 #, fuzzy
-#~ msgid "Constantine"
-#~ msgstr "conţine"
-
-#, fuzzy
 #~ msgid "Cordoba"
 #~ msgstr "Corean"
 
@@ -22567,10 +23316,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Întrebare"
 
 #, fuzzy
-#~ msgid "Crestview"
-#~ msgstr "Previzualizare"
-
-#, fuzzy
 #~ msgid "Crotone"
 #~ msgstr "Telefon maşină"
 
@@ -23910,10 +24655,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Normal"
 
 #, fuzzy
-#~ msgid "Nome"
-#~ msgstr "Nume"
-
-#, fuzzy
 #~ msgid "Norfolk"
 #~ msgstr "Normal"
 
@@ -25264,9 +26005,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Shown"
 #~ msgstr "Ploaie torenţială"
 
-#~ msgid "No tasks"
-#~ msgstr "Nu există sarcini"
-
 #, fuzzy
 #~ msgid "(No Description)"
 #~ msgstr "Descriere:"
@@ -26011,10 +26749,6 @@ msgstr "%s (%d%% complet)"
 #~ msgstr "Adaugă o sursă de ştiri"
 
 #, fuzzy
-#~ msgid "_Mail"
-#~ msgstr "Mail"
-
-#, fuzzy
 #~ msgid "_Weather"
 #~ msgstr "Vremea"
 
@@ -27154,9 +27888,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Nu pot deschide directorul pentru serverul de news: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Nu pot să deschid sau să creez fişierul .newsrc pentru %s: %s"
-
 #~ msgid "Could not check POP server for new messages: %s"
 #~ msgstr "Nu pot verifica mesajele noi pe serverul POP: %s"
 
@@ -27555,9 +28286,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Aminteşte de întâlnire la "
 
-#~ msgid "Snooze"
-#~ msgstr "Sforăie"
-
 #~ msgid ""
 #~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
 #~ "to know."
@@ -27801,9 +28529,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "%A, %d %B %Y"
 #~ msgstr "%A, %d %B %Y"
 
-#~ msgid "Print My Evolution"
-#~ msgstr "Tipăreşte Evolution"
-
 #~ msgid "Printing of My Evolution failed"
 #~ msgstr "Tipărirea Evolution nereuşită"
 
@@ -28309,9 +29034,6 @@ msgstr "%s (%d%% complet)"
 #~ msgid "Redo the undone action"
 #~ msgstr "Repetă acţiunea neefectuată"
 
-#~ msgid "Replace"
-#~ msgstr "Înlocuieşte"
-
 #~ msgid "Replace a string"
 #~ msgstr "Înlocuieşte un şir"
 
diff --git a/po/ru.po b/po/ru.po
index 599106b66c..ac2065bc4e 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: ru\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -26,6 +26,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Адресная книга Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакты: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Будильник Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -50,16 +60,6 @@ msgstr "карточек"
 msgid " card"
 msgstr "карточек"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Контакты: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Будильник Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Адрес синхронизации по умолчанию:"
@@ -74,63 +74,20 @@ msgstr "Не удается загрузить адресную книгу"
 msgid "Could not read pilot's Address application block"
 msgstr "Не удается прочитать блок приложения адресов Пилота"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Автозавершение"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Сертификаты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакты"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Адресная книга Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution Addressbook address pop-up"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Addressbook address viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Addressbook card viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Addressbook component"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Addressbook folder viewer"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime Certificate Management Control"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонимное подключение к серверу LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution folder settings configuration control"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Ошибка проверки подлинности.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Здесь можно управлять вашими сертификатами S/Mime"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВведите пароль для %s (пользователь %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -171,41 +128,45 @@ msgstr "_Контакты:"
 msgid "Create a new contacts group"
 msgstr "Создать новую группу ярлыков"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Сбой аутентификации на сервере LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Не удается выполнить запрос в корневом DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Сервер отвечает без поддержки баз поиска"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Ошибка при загрузке информации schema"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Перенос..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Переносится '%s':"
@@ -213,8 +174,8 @@ msgstr "Переносится '%s':"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "На этом компьютере"
 
@@ -222,7 +183,7 @@ msgstr "На этом компьютере"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Личный"
@@ -288,20 +249,42 @@ msgstr ""
 "\n"
 "Производится преобразование папок для новой версии..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонимное подключение к серверу LDAP"
+#: addressbook/gui/component/addressbook-view.c:674
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Ошибка проверки подлинности.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Новая адресная книга"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВведите пароль для %s (пользователь %s)"
+#: 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
+#: 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
+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
+#: 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 "Контакты"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -323,6 +306,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "URI папки, использовавшейся в последний раз в диалоге выбора имен"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Автозавершение"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Сертификаты"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Здесь настраивается автозавершение"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Адресная книга Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution Addressbook address pop-up"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Addressbook address viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Addressbook card viewer"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Addressbook component"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime Certificate Management Control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution folder settings configuration control"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Здесь можно управлять вашими сертификатами S/Mime"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr "  _Показывать поддерживаемые типы "
@@ -344,6 +382,7 @@ msgstr "  _Показывать поддерживаемые типы "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -416,7 +455,7 @@ msgstr "_Контакты:"
 msgid "Address Book Properties"
 msgstr "Свойства адресной книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Всегда"
@@ -431,107 +470,97 @@ msgid "Basic"
 msgstr "Основные"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Цвета"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Подключение"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Отличительное _имя (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Отличительное _имя (DN):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Этот адрес будет использоваться для идентификации вас на сервере"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Поддерживаемые базы поиска"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Общие"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Никогда"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Один"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Выбрать цвет"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "_Диапазон поиска: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Диапазон поиска: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Поиск"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -541,7 +570,7 @@ msgstr ""
 "вашим\n"
 "сервером LDAP только в том случае, если он поддерживает SSL or TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -558,7 +587,7 @@ msgstr ""
 "вы и ваш сервер LDAP находятся за межсетевым экраном, то Evolution не будет\n"
 "использовать SSL/TLS, так как ваше соединение уже достаточно безопасно."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -569,19 +598,19 @@ msgstr ""
 "Выбор этой опции означает, что ваш сервер не поддерживает протоколы SSL\n"
 "и TLS . Это означает, что ваше соединение с сервером будет уязвимым для атак."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Под"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Поддерживаемые базы поиска"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -592,7 +621,7 @@ msgstr ""
 "откуда начнется ваш поиск. Если вы оставите это поле пустым,\n"
 "то поиск начнется с корня дерева каталогов."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -606,13 +635,13 @@ msgstr ""
 "под каталогом начала поиска. Глубина поиска \"one\" включает в себя\n"
 "элементы на один уровень ниже каталога начала поиска.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -622,7 +651,7 @@ msgstr ""
 "Максимальное число элементов для загрузки. Установка очень большого\n"
 "значения может серьезно замедлить работу вашей адресной книги."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -632,7 +661,7 @@ msgstr ""
 "что установка этого параметра в \"Адрес эл. почты\" требует анонимного "
 "доступа к вашему серверу LDAP."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -641,7 +670,7 @@ msgstr ""
 "Это имя сервера будет появляться в списке каталогов Evolution.\n"
 "Оно используется только для отображения."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -652,128 +681,135 @@ msgstr ""
 "Список стандартных портов ранее уже был предоставлен. Спросите вашего\n"
 "системного администратора, какой из них вам необходимо использовать."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат времени:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "И_спользовать SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "По отличительному имени (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "По почтовому адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Когда это возможно"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Контакты:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Ограничение загрузки:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Электронная почта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Метод подключения:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Имя:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Номер порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Приоритет:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_База поиска:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Имя _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Задержка (минут):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Использовать _защищенное соединение (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "карточек"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "вкладка соединения"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "общая вкладка"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "минут"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "вкладка поиска"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Интерфейс выбора имени в адресной книге Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Удалить все"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Удалить все"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Просмотр списка контактов"
@@ -796,22 +832,15 @@ msgstr "Добавить к контактам"
 msgid "Unnamed Contact"
 msgstr "Безымянный контакт"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Источник"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "Выбор контактов из адресной книги"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Интерфейс выбора имени в адресной книге Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -878,142 +907,142 @@ msgid "<b>Work</b>"
 msgstr "<b>К:</b> "
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Адрес _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Адрес:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Годовщина:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Помощник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "День ро_ждения:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Блог"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Календарь:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Город:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Команда:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Редактор контактов"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Страна:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "О_тдел:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL \"_свободен/занят\":"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "По_лное имя..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Домашний"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Электронная почта"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Мeнеджер"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Псевдон_им:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Примечания:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: 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:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Другие"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "Аб.ящик:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1041,9 +1070,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Служебное"
@@ -1076,23 +1105,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Вы действительно хотите\n"
+"удалить эти контакты?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Изменяемый"
 
@@ -2064,92 +2109,110 @@ msgstr "Замбия"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr "Адрес"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Имя пользователя"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Novell GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Книга-источник"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Книга назначения"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Является новым конактом"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Поля для записи"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Изменено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Редактор категорий недоступен."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Этот контакт принадлежит следующим категориям:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Выберите один из следующих вариантов"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Нигер"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 "Не удается найти элемент управления для поля: \"%s\""
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+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
+msgid "Location"
+msgstr "Адрес"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Имя пользователя"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Быстрое добавление контакта"
@@ -2167,22 +2230,6 @@ msgstr "_Полное имя:"
 msgid "E-_mail:"
 msgstr "_Эл. адрес:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить эти контакты?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Вы действительно хотите\n"
-"удалить этот контакт?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адрес _2:"
@@ -2331,8 +2378,8 @@ msgstr "Редактор списка контактов"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Книга"
 
@@ -2393,6 +2440,440 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Расширенный поиск"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Участники списка"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "Эл. почта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Организация"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Группа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Видеоконференции"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "работа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Блог"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Мобильный телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "личный"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Примечание"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Должность"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Эл. почта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Домашняя страничка"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Успешно"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Репозиторий вне сети"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Адресная книга не существует"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Отказ в доступе"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Контакт не найден"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "Идентификатор контакта уже существует"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Протокол не поддерживается"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Отменено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не удается открыть \"%s\": %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Сбой проверки подлинности"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Требуется проверка подлинности"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Нет такого сообщения"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Иная ошибка"
+
+#: 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 ""
+"Не удается открыть эту адресную книгу. Убедитесь, что путь существует и что "
+"у вас имеются необходимые права доступа."
+
+#: 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 ""
+"Не удается открыть эту адресную книгу.  Это значит, что либо введен неверный "
+"URI, либо сервер LDAP недоступен."
+
+#: 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 ""
+"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
+"использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
+"текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
+"ниже ссылке."
+
+#: 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 ""
+"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
+"URI, либо сервер недоступен."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Не удается открыть адресную книгу"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"С этим запросом совпало больше карточек, чем \n"
+"настроено для выдачи в сервере или Evolution.\n"
+"Пожалуйста, точнее определите условия поиска, или\n"
+"поднимите ограничения для выдачи результатов в\n"
+"настройках сервера каталога для этой адресной книги."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Время исполнения запроса превысило ограничения сервера\n"
+"или ограничения, определенного для этой адресной книги.\n"
+"Пожалуйста, точнее определите условия поиска или\n"
+"поднимите ограничения времени в настройках сервера\n"
+"каталога для этой адресной книги."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+"База данных для этой адресной книги не смогла обработать текущий запрос."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "Ошибка добавления списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Ошибка добавления контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Ошибка изменения списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Ошибка изменения контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Ошибка удаления списка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Ошибка удаления контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"Открытие %d контактов также откроет %d новых окон.\n"
+"Вы действительно хотите отобразить все эти контакты?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s уже существует\n"
+"Хотите переписать?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "список"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Переместить контакт в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Копировать контакт в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Переместить контакты в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Копировать контакты в"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Выберите целевую адресную книгу."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Множество VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard для %s"
+
+#.
+#. * 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] "и одна другой контакт."
+msgstr[2] "и одна другой контакт."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Показывать всю карточку"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Показывать компактную карточку"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сохранить в адресной книге"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Нет контактов"
@@ -2408,8 +2889,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Запрос"
 
@@ -2463,9 +2944,10 @@ msgstr "Адресная книга"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Сохранить как VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2530,7 +3012,7 @@ msgid "Cut"
 msgstr "Вырезать"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2541,18 +3023,8 @@ msgstr "Копировать"
 msgid "Paste"
 msgstr "Вставить"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Удалить"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Текущий вид"
 
@@ -2568,7 +3040,7 @@ msgstr ""
 "Необходимо перезапустить Evolution."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Любая категория"
@@ -2609,21 +3081,6 @@ msgstr "Категории"
 msgid "Company Phone"
 msgstr "Телефон компании"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Эл. почта"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Эл. почта 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Эл. почта 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Фамилия"
@@ -2660,29 +3117,14 @@ msgstr "Журнал"
 msgid "Manager"
 msgstr "Мeнеджер"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Мобильный телефон"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Псевдоним"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Примечание"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офис"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Организация"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Другой факс"
@@ -2734,21 +3176,29 @@ msgstr "Подразделение"
 msgid "Web Site"
 msgstr "Веб-сайт"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Высота"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "Поле"
@@ -2765,10 +3215,6 @@ msgstr "Текстовая модель"
 msgid "Max field name length"
 msgstr "Максимальная длина имени поля"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина столбца"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2797,414 +3243,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Участники списка"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "Эл. почта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Должность"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Группа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Видеоконференции"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Факс"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "работа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Блог"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "личный"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Должность"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Домашняя страничка"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Успешно"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Репозиторий вне сети"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Адресная книга не существует"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Отказ в доступе"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Контакт не найден"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "Идентификатор контакта уже существует"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Протокол не поддерживается"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Отменено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не удается открыть \"%s\": %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Сбой проверки подлинности"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Требуется проверка подлинности"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS недоступен"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Нет такого сообщения"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Иная ошибка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Не удается открыть эту адресную книгу.  Это значит, что либо введен неверный "
-"URI, либо сервер LDAP недоступен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"Эта версия Evolution не имеет встроенной поддержки LDAP. Если вы хотите "
-"использовать LDAP в Evolution, вы должны пересобрать программу из исходных "
-"текстов из CVS после установки OpenLDAP; получить его можно по приведенной "
-"ниже ссылке."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Не удается открыть эту адресную книгу. Это значит, что либо введен неверный "
-"URI, либо сервер недоступен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Не удается открыть адресную книгу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"С этим запросом совпало больше карточек, чем \n"
-"настроено для выдачи в сервере или Evolution.\n"
-"Пожалуйста, точнее определите условия поиска, или\n"
-"поднимите ограничения для выдачи результатов в\n"
-"настройках сервера каталога для этой адресной книги."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Время исполнения запроса превысило ограничения сервера\n"
-"или ограничения, определенного для этой адресной книги.\n"
-"Пожалуйста, точнее определите условия поиска или\n"
-"поднимите ограничения времени в настройках сервера\n"
-"каталога для этой адресной книги."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-"База данных для этой адресной книги не смогла обработать текущий запрос."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-"База данных для этой адресной книги отказалась обрабатывать текущий запрос."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Этот запрос завершился с ошибкой."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Хотите сохранить изменения?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Отклонить"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Ошибка добавления списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Ошибка добавления контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Ошибка изменения списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Ошибка изменения контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Ошибка удаления списка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Ошибка удаления контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Открытие %d контактов также откроет %d новых окон.\n"
-"Вы действительно хотите отобразить все эти контакты?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s уже существует\n"
-"Хотите переписать?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Перезаписать"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Ошибка сохранения %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "список"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Переместить контакт в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Копировать контакт в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Переместить контакты в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Копировать контакты в"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Выберите целевую адресную книгу."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Множество VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard для %s"
-
-#.
-#. * 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: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] "и одна другой контакт."
-msgstr[2] "и одна другой контакт."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Показывать всю карточку"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Показывать компактную карточку"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-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"
@@ -3251,11 +3292,6 @@ msgstr "Evolution vCalendar importer"
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 msgid "Print contacts"
 msgstr "Напечатать контакты"
@@ -3265,6 +3301,11 @@ msgstr "Напечатать контакты"
 msgid "Print contact"
 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"
 msgstr "10 pt. Tahoma"
@@ -3449,16 +3490,6 @@ msgstr "Проверка печати контакта"
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Указать файл вместо стандартного вывода"
@@ -3517,6 +3548,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Ошибка при загрузке адресной книги по умолчанию."
@@ -3529,11 +3570,12 @@ msgstr "Файл ввода"
 msgid "No filename provided."
 msgstr "Не указано имя файла."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Безымянный список"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Ввод пароля"
 
@@ -3565,119 +3607,57 @@ msgstr "Приоритет по умолчанию:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Не удается прочитать блок приложения заданий Пилота"
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Календари"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Здесь можно настроить вашу временную зону, календарь и список задач"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Календарь и задачи Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Calendar configuration control"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution Calendar scheduling message viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution Calendar viewer"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Calendar/Task editor"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Просмотр задач Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Компонент календаря Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Компонент задач Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Задачи"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Calendar alarm notification service"
-
-#: 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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Будильник Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "Закрыть"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Напомнить позже"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Напомнить через (минут)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Изменить встречу"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 #, fuzzy
 msgid "Dismiss"
 msgstr "_Закрыть"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 #, fuzzy
 msgid "Dismiss All"
 msgstr "Закрыть _все"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Описание не доступно."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3690,12 +3670,12 @@ msgstr ""
 "Начало в %s\n"
 "Окончание в %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3707,7 +3687,7 @@ msgstr ""
 "Вместо этого Evolution отобразит нормальный диалог\n"
 "напоминания."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3724,19 +3704,19 @@ msgstr ""
 "\n"
 "Вы действительно хотите запустить эту программу?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Calendar alarm notification service"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Не удается инициализировать Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Не удается инициализировать gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Не удается создать фабрику сервиса уведомления о сигнале"
 
@@ -3847,57 +3827,42 @@ 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Запрашивать подтверждение при удалении встречи"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Запрашивать ли подтверждение при очистке папки"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Скрывать ли завершенные задачи"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Показывать ли время в 24-часовом формате вместо am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показывать ли номера недель в навигаторе по датам"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "\"Коротко\" содержит"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Комментарий содержит"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Описание содержит"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Прочее"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Календарь"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3909,118 +3874,128 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "дней"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Календарь '%s' будет удалён. Вы действительно хотите продолжить?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Новый календарь"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Свойства..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Загрузка календаря..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не удаётся открыть календарь '%s' для создания событий и совещаний"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нет доступного календаря для создания событий и совещаний"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Календари"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Новая встреча"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Встреча"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Создать новую встречу"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Собрание"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Создать новое приглашение на собрание"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Новая встреча на весь день"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Еже_дневная встреча"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Создать новую ежедневную встречу"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Новый календарь"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "К_алендарь"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Создать новый календарь"
 
@@ -4050,15 +4025,36 @@ msgstr "Как неделю"
 msgid "Month View"
 msgstr "как месяц"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "\"Коротко\" содержит"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Комментарий содержит"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Описание содержит"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Прочее"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Ошибка при открытии календаря"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Метод открытия календаря не поддерживается"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Отказ в доступе при открытии календаря"
 
@@ -4067,19 +4063,6 @@ msgstr "Отказ в доступе при открытии календаря"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Не удается открыть папку в '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, показываемый календарем"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Показываемый тип для вида"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Параметры звукового сигнала"
@@ -4145,7 +4128,7 @@ msgstr "дополнительное время каждые"
 msgid "hours"
 msgstr "часов"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Действие/Переключатель"
 
@@ -4164,14 +4147,14 @@ msgstr "Основы"
 msgid "Date/Time:"
 msgstr "Дата/Время:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Показать сообщение"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Воспроизвести звук"
 
+#: 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 "Напоминания"
@@ -4186,6 +4169,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
 msgid "Summary:"
 msgstr "Сводка:"
@@ -4224,10 +4208,104 @@ msgstr "минут"
 msgid "start of appointment"
 msgstr "начало встречи"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr "Необходимо указать адрес, откуда можно получить календарь."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Адрес источника '%s' сформирован неверно."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Адрес источника '%s' не является адресом webcal."
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Источник с именем '%s' уже существует в выбранной группе"
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+msgid "Calendar Properties"
+msgstr "Свойства календаря"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Добавление нового календаря"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Включено"
 
@@ -4241,19 +4319,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Включить"
 
@@ -4278,162 +4356,176 @@ msgid "60 minutes"
 msgstr "60 минут"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Предупреждения"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>К:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>К:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "<b>Параметры списка задач</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 "<b>К:</b> "
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Отображение"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Включить"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "Пятница"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Часов"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Минут"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Понедельник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Вск"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Суббота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Показывать _напоминание"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Воскресенье"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Задачи на _сегодняшний день:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Список задач"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Четверг"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Время"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Часовой _пояс:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Формат времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Вторник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Начало недели:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Среда"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Рабочая неделя"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Рабочие дни:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: 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:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "24-часовой"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "_Добавить URL"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Ужимать выходные дни в представлении месяца"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_День начинается:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "Отображение"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4443,140 +4535,46 @@ msgstr "Отображение"
 msgid "_Edit"
 msgstr "_Правка"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Запрос информации о занятости"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "Пят"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Общие"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Скрывать выполненные задачи через"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "Пон"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Просроченные задачи:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "Суб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Разделители времени:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "перед каждой встречей"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "Необходимо указать адрес, откуда можно получить календарь."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Адрес источника '%s' сформирован неверно."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Адрес источника '%s' не является адресом webcal."
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Источник с именем '%s' уже существует в выбранной группе"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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:5
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Добавление нового календаря"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "недели"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4656,81 +4654,81 @@ msgstr "%s Вы сделали изменения. Отменить их?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Вы ничего не изменили. Обновить редактор?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Ошибка проверки: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " к "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Выполнено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Выполнено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (к дате"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "К дате"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Не удается обновить объект"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Изменить встречу"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Нет Краткого описания"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Сохранить как..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Не удается использовать текущую версию!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Ошибка проверки: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " к "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Выполнено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Выполнено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (к дате"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "К дате"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4856,27 +4854,27 @@ msgstr "Поручить:"
 msgid "Enter Delegate"
 msgstr "Ввести представителя"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Встреча"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Напоминание"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Повторение"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Собрание"
 
@@ -4889,7 +4887,7 @@ msgstr "Дата завершения рашьше даты окончания!"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Дата начала неверна"
 
@@ -4975,10 +4973,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4997,15 +4995,15 @@ msgstr "Требуется организатор."
 msgid "At least one attendee is required."
 msgstr "Требуется как минимум один участник"
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "Доверить..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5278,27 +5276,19 @@ msgstr "_Отклонить изменения"
 msgid "Save Event"
 msgstr "Сохранить событие"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Выбрать импортер"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Назначение:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Календарь"
+msgid "_Destination"
+msgstr "Папка _черновиков:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Новый список задач"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Список задач"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5327,38 +5317,44 @@ msgid "% _Complete"
 msgstr "% _Выполнено"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Высокий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Низкий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Нормальный"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Не начато"
 
@@ -5394,11 +5390,11 @@ msgstr "_Веб-страница:"
 msgid "Assignment"
 msgstr "Назначение"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Дата выполнения некорректна"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не удается открыть задачи в '%s'."
@@ -5407,8 +5403,9 @@ msgstr "Не удается открыть задачи в '%s'."
 msgid "Con_fidential"
 msgstr "Кон_фиденциально"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Описание:"
@@ -5562,102 +5559,53 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для неизвестного типа переключателя"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Общее"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Личное"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Конфиденциальное"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Дата"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата начала"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Сводка"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Свободен"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Занят"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Нажмите, чтобы открыть %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ю"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Неозаглавленное"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "В"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Дата начала:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "З"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Дата выполнения:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географическое положение должно быть введено в формате:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Состояние:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Приоритет:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Нет"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Веб-страница:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5703,17 +5651,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Обновление объектов"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Открыть"
 
@@ -5722,41 +5679,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Вст_авить"
 
@@ -5814,78 +5772,158 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Дата начала"
 
+#: 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:11
 msgid "Task sort"
 msgstr "Сортировка задач"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Новая _встреча..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Новое ежедневное событие"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Новое собрание"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Новая задача"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Выделить подшивку"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Выбрать..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опубликовать информацию о занятости"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Копировать в папку..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Переместить в папку..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Назначить собрание..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Переслать как iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Удалить это вхождение"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Удалить все вхождения"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Перейти к сег_одняшнему дню"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Пере_йти к дате..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Настройка..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Дата"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -5909,36 +5947,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "Деления через %02i минут"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "Деления через %02i минут"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6053,10 +6091,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Нет</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Состояние:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6086,7 +6120,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Ок"
 
@@ -6299,63 +6333,59 @@ msgstr "Вложение не содержит правильного сообщ
 msgid "The attachment has no viewable calendar items"
 msgstr "Вложение не содержит пригодных для просмотра элементов календаря."
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Файл календаря не может быть обновлён!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Обновление закончено\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 "Статус участника не может быть обновлён, потому что элемент больше не "
 "существует"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Объект некорректен и не может быть обновлен\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 "Этот ответ пришел не от текущего участника.  Добавить его, как участника?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 "Статус участника не может быть обновлён из-за неверного текущего статуса!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "В системе CORBA произошла ошибка\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Объект не может быть найден!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "У вас нет соответствующих прав для обновления календаря\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Статус участника обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Статус участника не может быть обновлён!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Удаление завершено"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Элемент отправлен!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Элемент не может быть послан!\n"
 
@@ -6472,28 +6502,6 @@ msgstr "Передано"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Вне офиса"
@@ -6554,7 +6562,34 @@ msgstr "Время _начала собрания:"
 msgid "Meeting _end time:"
 msgstr "Время _завершения собрания:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B %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.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, %d.%m.%Y"
+
+#. 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 "%d.%m.%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Введите пароль для %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6563,21 +6598,19 @@ msgstr ""
 "Ошибка в \"%s\":\n"
 "%s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Открытие задач %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6586,52 +6619,106 @@ msgstr ""
 "Ошибка открытия %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Загрузка задач"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Завершение выполнения задач..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Удаление выделенных объектов..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Очистка папки"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задачи"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Встреча - %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Загрузка задач"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Открывается %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Турин"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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 "Календарь и задачи Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Calendar configuration control"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution Calendar scheduling message viewer"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution Calendar/Task editor"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Компонент календаря Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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 "Апрель"
@@ -6777,6 +6864,23 @@ msgstr "Дни рождения и годовщины"
 msgid "On The Web"
 msgstr "В Сети"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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'."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Не удается открыть задачи в '%s'."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1-ое"
@@ -6996,7 +7100,7 @@ msgid "Contacts: "
 msgstr "Контакты: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Предварительный просмотр"
 
@@ -7008,67 +7112,79 @@ msgstr "Напечатать элемент"
 msgid "Print Setup"
 msgstr "Настройка печати"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Список задач '%s' будет удален. Вы действительно хотите продолжить?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Новый список задач"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d контактов"
+msgstr[1] "%d контактов"
+msgstr[2] "%d контактов"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "Удалённое"
+msgstr[1] "Удалённое"
+msgstr[2] "Удалённое"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Загрузка задач"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr "Не удается открыть список задач '%s' для создания событий и собраний"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Задача"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Новая задача"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Группа списка задач"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Создать новую задачу"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Показываемый URI папки задач"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Не удается загрузить задачи в \"%s\""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7080,11 +7196,11 @@ msgstr ""
 "\n"
 "Действительно уничтожить эти задания?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Не задавать больше этот вопрос."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Напечатать задачи"
 
@@ -8733,7 +8849,7 @@ msgstr "Скопировать содержимое папки на локаль
 msgid "Downloading new messages for offline mode"
 msgstr "Новые сообщения загружаются для автономной работы"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Подготовка папки \"%s\" для автономной работы"
@@ -8826,33 +8942,6 @@ msgstr "Недопустимые аргументы для user-tag"
 msgid "Error executing filter search: %s: %s"
 msgstr "Ошибка выполнения поиска фильтра: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Ошибка в регулярном выражении \"%s\":\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Ошибка при выполнении выражения поиска \"%s\":\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(совпадает все) требует единственного логического результата"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Запрашивается неизвестный заголовок: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8886,7 +8975,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Получение %d сообщений"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Ошибка в регулярном выражении \"%s\":\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Ошибка при выполнении выражения поиска \"%s\":\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(совпадает все) требует единственного логического результата"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(совпадает все) требует единственного логического результата"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Запрашивается неизвестный заголовок: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8897,15 +9031,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Ошибка при обработке подсказки gpg userid."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Ошибка при обработке запроса парольной фразы gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8914,30 +9048,30 @@ msgstr ""
 "Введите ключевую фразу, чтобы разблокировать\n"
 "ключ пользователя: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Отменено."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Сбой при разблокировании секретного ключа: указано 3 некорректных парольных "
 "фразы."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неожиданный ответ от GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 "Не удается зашифровать это сообщение: Не определены корректные получатели"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8948,83 +9082,63 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Сбой при кодировании GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Не удается проверить подпись сообщения: не удается создать временный файл: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Эта часть сообщения подписана цифровой подписью"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Зашифрованное содержимое"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Не удается разобрать содержимое сообщения"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не удается создать канал к блокиратору: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Не удается запустить блокиратор: %s"
-
-#: 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 "Не удается заблокировать \"%s\": ошибка протокола с блокиратором"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не удается заблокировать \"%s\""
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9047,6 +9161,26 @@ msgstr "Не удается получить блокировку использ
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не удается получить блокировку используя flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не удается создать канал к блокиратору: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не удается запустить блокиратор: %s"
+
+#: 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 "Не удается заблокировать \"%s\": ошибка протокола с блокиратором"
+
+#: 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"
@@ -9294,7 +9428,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Неверный ответ от сервера при идентификации."
 
@@ -9496,7 +9630,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "ID _сертификата:"
 
 #: camel/camel-smime-context.c:360
@@ -9513,7 +9647,7 @@ msgstr "Не удается заблокировать папку %s: %s"
 msgid "Failed to add data to CMS encoder"
 msgstr "Ошибка сохранения в локальной папке \"Отправленные\": %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Ошибка проверки подлинности.\n"
@@ -9584,98 +9718,98 @@ msgstr "Не удается создать папку: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Не удается получить сообщение %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Ошибка в подписи сертификата"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Подпись действительна"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Подписано: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Сбой команды IMAP: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Созда_ть правило из сообщения"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Не удается заблокировать папку %s: %s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Сбой передачи имени пользователя на сервер"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Команда не реализована"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9692,16 +9826,26 @@ msgstr "Не удается создать папку: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не удается создать папку: недопустимая операция в этом хранилище"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Не удается создать папку: %s: %s"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не удается удалить папку: %s: недопустимая операция"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Не удается переименовать папку: %s: недопустимая операция"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Корзина"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Спам"
@@ -9822,7 +9966,7 @@ msgstr "Использование ключа не обеспечивает по
 msgid "Error in application verification"
 msgstr "Ошибка при проверке приложения"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9835,11 +9979,11 @@ msgstr ""
 "Отпечаток:         %s\n"
 "Подпись:           %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "GOOD"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "BAD"
 
@@ -9862,7 +10006,7 @@ msgstr ""
 "Принять сертификат в любом случае?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9877,7 +10021,7 @@ msgstr ""
 "\n"
 "Всё равно принять?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9886,7 +10030,7 @@ msgstr ""
 "Проблема с сертификатом: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9895,7 +10039,7 @@ msgstr ""
 "Некорректный домен сертификата: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9904,7 +10048,7 @@ msgstr ""
 "Истек срок действия сертификата: %s\n"
 "Поставщик: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9918,17 +10062,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Не удается разобрать URL \"%s\""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Ошибка при хранении \"%s\": %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Нет сообщения %s в %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
@@ -9937,11 +10081,6 @@ msgstr "Не удается скопировать или переместить
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не удается удалить папку: %s: нет такой папки"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Не удается переименовать папку: %s: недопустимая операция"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9958,10 +10097,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Вы не можете копировать сообщения из папки NNTP!"
 
 #: 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 "Проверять новую почту во всех папках"
@@ -9995,6 +10136,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Для доступа к серверам Novell Groupwise"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10016,26 +10158,323 @@ msgstr ""
 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: %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 "Не удается получить папку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не удается создать папку: %s: %s"
+
+#: 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: %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:429
+#, 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
+#, c-format
+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:140
+#: 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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Соединение отменено"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Неизвестная ошибка"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Не удается подключиться к серверу POP %s: Не поддерживается затребованный "
+"механизм идентификации."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sВведите пароль SMTP для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
+
+#: 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: %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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: %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: %s"
+
+#: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Операция отменена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер неожиданно отключился: %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:1089
-msgid "Unknown error"
-msgstr "Неизвестная ошибка"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10080,21 +10519,21 @@ msgstr "Не удается создать каталог %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Не удается загрузить краткую информацию о %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Поиск изменённых сообщений"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -10110,25 +10549,25 @@ msgstr ""
 "Не удается получить сообщение: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Нет такого сообщения"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Это сообщение в настоящий момент недоступно"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Не удается найти тело сообщения в ответе на команду FETCH."
 
@@ -10167,23 +10606,6 @@ msgstr "Использовать свою строку для подключен
 msgid "Command:"
 msgstr "Команда:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Папки"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показывать только те папки, на которые вы подписаны"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Переопределять предлагаемое сервером пространство имён для папок"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Пространство имен"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10207,85 +10629,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для чтения и хранения почты на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Сервис IMAP для %s на %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL недоступен"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Соединение отменено"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Не удается подключиться к серверу IMAP %s в защищенном режиме:%s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Расширение SSL/TLS не поддерживается"
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Сбой согласований SSL"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не удается подключиться командой \"%s\": %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не поддерживает затребованный тип аутентификации %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Вы не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10296,25 +10676,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Нет такой папки %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Имя папки \"%s\" некорректно, так как содержит символ \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Эта папка не может содержать подпапки"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10322,7 +10695,7 @@ msgstr "Эта папка не может содержать подпапки"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не удается создать папку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Неизвестная родительская папка: %s"
@@ -10426,58 +10799,58 @@ msgstr ""
 "спула в формате mbox. Также может использоваться для чтения дерева\n"
 "папок в стиле Elm, Pine или Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Относительный путь к хранилищу %s"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Хранилище %s не является каталогом"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Локальное хранилище не имеет папки Входящие"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локальный почтовый файл %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10543,7 +10916,7 @@ msgstr "Не удается удалить папку \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "не является почтовым каталогом"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10876,7 +11249,7 @@ msgid "Server rejected username/password"
 msgstr "Сервер отверг имя пользователя/пароль"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10885,8 +11258,8 @@ msgid "User cancelled"
 msgstr "Отменено пользователем"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10895,48 +11268,48 @@ msgstr "Отменено пользователем"
 msgid "Cannot get message %s: %s"
 msgstr "Не удается получить сообщение %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Внутренняя ошибка: uid в неверном формате: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Ошибка при автосохранении сообщения: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Вы не можете копировать сообщения из папки NNTP!"
 
@@ -11059,7 +11432,8 @@ msgid "Could not get group: %s"
 msgstr "Не удается получить группу: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Не удается получить сообщения: неуказанная ошибка"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11112,8 +11486,8 @@ msgstr "Нет сообщения с uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Получение сообщения %d по POP"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Неизвестная причина"
 
@@ -11571,7 +11945,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "вложение"
 
@@ -11615,6 +11989,101 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предполагать автоматическое отображение вложения"
 
+#: 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 "Не удается открыть файл"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Не удается получить сообщение из редактора"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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.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 ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать управляющий элемент выбора адреса."
+
+#: 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 ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать компонент редактора HTML.\n"
+"Убедитесь, что у вас установлены необходимые\n"
+"версии пакетов gtkhtml и libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Не удается создать окно редактора:\n"
+"Не удается активировать компонент редактора HTML."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Содержимое редактора не является простым текстом и не может "
+"корректироваться.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Назначение:"
@@ -11697,210 +12166,135 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Attach file(s)"
 msgstr "Вложить файл(ы)"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Всегда подписывать сообщения, когда используется эта учётная запись"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Не удается открыть файл"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Не удается получить сообщение из редактора"
-
-#: composer/e-msg-composer.c:1551
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "Множество сообщений"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Открыть файл"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Создана автоматически"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Подпись:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Новое сообщение"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Вложить файл в сообщение"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать управляющий элемент выбора адреса."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать компонент редактора HTML.\n"
-"Убедитесь, что у вас установлены необходимые\n"
-"версии пакетов gtkhtml и libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Не удается создать окно редактора:\n"
-"Не удается активировать компонент редактора HTML."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Содержимое редактора не является простым текстом и не может "
-"корректироваться.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Непрочитанных сообщений"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Хотите сохранить изменения?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Не удается создать канал: %s"
+msgid "Don't Recover"
+msgstr "Не удалять"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Не удается сохранить файл подписи: %s"
+msgid "Recover"
+msgstr "Удалить"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Не удается сохранить файл подписи: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Отклонить изменения"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Хотите сохранить изменения?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Ошибка сохранения ярлыков."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Не удалять"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Внимание: Изменено сообщение"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Ошибка сохранения ярлыков."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Вы действительно хотите удалить эту неозаглавленную встречу?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Удалить"
+msgid "Discard Changes"
+msgstr "_Отклонить изменения"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Сохранить сообщение ..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Не удается создать канал: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Непрочитанных сообщений"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Не удается сохранить файл подписи: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Внимание: Изменено сообщение"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Вложить файл в сообщение"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Перед созданием нового письма необходимо настроить учетную запись."
 
@@ -12034,7 +12428,8 @@ msgstr ""
 "Файл с таким именем уже существует.\n"
 "Перезаписать его?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Перезаписать файл?"
 
@@ -12218,81 +12613,97 @@ msgstr "Выбрать время для сравнения"
 msgid "_Filter Rules"
 msgstr "Правила фильтра"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Ошибка в регулярном выражении \"%s\":\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Файл \"%s\" не существует или не является обычным файлом."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Обновление собрания"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "Отличительное _имя (DN):"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Необходимо указать имя файла."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Удаление папки \"%s\""
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Файл \"%s\" не существует или не является обычным файлом."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Назначение"
+msgid "Missing folder."
+msgstr "Удаление папки \"%s\""
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Необходимо указать папку."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Не был выбран сервер"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Ошибка в регулярном выражении \"%s\":\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Вы должны указать дату."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Назначение"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Вы должны наименовать этот фильтр"
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Укажите имя этой виртуальной папки."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Необходимо указать имя файла."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Необходимо указать папку."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не был выбран сервер"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12305,66 +12716,11 @@ msgstr "Выберите файл"
 msgid "<b>Then</b>"
 msgstr "<b>К:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Выбрать папку"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Важное"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Выполнить"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Позже"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Проверка"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Имя фильтра: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Неозаглавленное"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>К:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Выполнить действия"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "если удовлетворяет всем критериям"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "если удовлетворяет любому из критериев"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "входящие"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "исходящие"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12455,6 +12811,77 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>К:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "если удовлетворяет всем критериям"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "если удовлетворяет любому из критериев"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Выполнить действия"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Передано"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Получатели"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "В ответ на %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Включить:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "входящие"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "исходящие"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12584,7 +13011,7 @@ msgstr "не отмечено"
 msgid "Junk Test"
 msgstr "Проверка на спам"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Надпись"
@@ -12622,7 +13049,7 @@ msgstr "Выйти из программы"
 msgid "Play Sound"
 msgstr "Воспроизвести звук"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Прочитанное"
 
@@ -12692,9 +13119,9 @@ msgstr "начинается с"
 msgid "Stop Processing"
 msgstr "Остановить обработку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Тема"
@@ -12757,104 +13184,60 @@ msgstr "Тема не содержит"
 msgid "Virtual _Folders"
 msgstr "Виртуальные папки"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Добавить"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Источник виртуальных папок"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Настройка редактора"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Тут настраиваются параметры почты, включая безопасность и отображение "
-"сообщений"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Настройте тут учётные записи почты"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Почта Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution Mail accounts configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Компонент Evolution Mail"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution Mail composer"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution Mail composer configuration control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution Mail folder viewer"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution Mail preferences control"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Почта"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "Настройка почты"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[По умолчанию]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Имя учётной записи"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Протокол"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Без названия"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Язык(и)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Добавить подпись"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Подпись(и)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Пересланное сообщение --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "В сообщении от %d.%m.%Y %H:%M %%s пишет:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Создать _виртуальную папку результатов поиска..."
 
@@ -12889,267 +13272,440 @@ msgstr "<щёлкните здесь, чтобы выбрать папку>"
 msgid "Create New Folder"
 msgstr "Создание новой папки"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Входящие"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Загрузка..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не удается скопировать или переместить сообщения в виртуальную папку"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "Пере_местить"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Отменить задачу"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Выбрать папку"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Копировать"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Создать новую папку"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Переименовать папку \"%s\" в:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Переименование папки"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Вид"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Открыть в _новом окне"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "Пере_местить"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Создать папку..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Пе_реименовать"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+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 ""
+
+#. 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:778
+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
+msgid "Mail"
+msgstr "Почта"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Править как новое сообщение..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Печать"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "О_тветить отправителю"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Ответить в с_писок"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Ответить _всем"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Пе_реслать"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "К _исполнению..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "_Флаг \"Выполнено\""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "О_чистить флаг"
 
-#: mail/em-folder-view.c:787 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 "По_метить как прочитанные"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Пометит_ь как непрочитанные"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Пометить как важное"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Пометить как неважное"
 
-#: mail/em-folder-view.c:791 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 "Пометить как _спам"
 
-#: mail/em-folder-view.c:792 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 "Пометить как _не спам"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "В_осстановить"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Переместить в папку..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копировать в папку..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Добавить отправителя в _адресную книгу"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Применить _фильтры"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правила фильтра"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Созда_ть правило из сообщения"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Виртуальная папка по теме"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Виртуальная папка по отправителю"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Виртуальная папка по получателю"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Виртуальная папка по списку рассылки"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "Виртуальная папка по подшивке"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Фильтр по теме"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Фильтр по отправителю"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Фильтр по получателям"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Фильтр по списку рассылки"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Фильтр по подшивке"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "По умолчанию"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Напечатать сообщение"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Копировать ссылку"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Щёлкните здесь, чтобы добавить задачу"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Копия"
+
+#: 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 "Скр.копия"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Нажмите, чтобы открыть %s"
+msgid "%s attachment"
+msgstr "вложение %s"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не удается разобрать сообщение S/MIME: Неизвестная ошибка"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Неподдерживаемый формат подписи"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Неизвестная ошибка при проверке подписи"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Получение '%s'"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Не подписано"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Подпись действительна"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Подпись недействительна"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Не зашифровано"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Зашифровано"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Часть external-body неверно сформирована"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Указатель на FTP сайт (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Указатель на локальный файл (%s)"
+
+#: 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\")"
+
+#: mail/em-format-html.c:1137
+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 ""
+
+#. 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
@@ -13157,11 +13713,7 @@ msgstr "Нажмите, чтобы открыть %s"
 msgid "Matches: %d"
 msgstr "Совпадения: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Не подписано"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13169,11 +13721,7 @@ msgid ""
 msgstr ""
 "Это сообщение не подписано. Отправитель не может быть аутентифицирован."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Подпись действительна"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13182,11 +13730,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, что удостоверяет "
 "подлинность отправителя."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Подпись недействительна"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13194,11 +13738,11 @@ msgstr ""
 "Подпись этого сообщения не может быть проверена. Возможно, сообщение было "
 "изменено по дороге."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13206,11 +13750,7 @@ msgstr ""
 "Это сообщение подписано действительной подписью, но отправитель сообщения не "
 "может быть проверен."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Не зашифровано"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13219,216 +13759,85 @@ msgstr ""
 "Это сообщение не зашифровано. Его содержимое может быть просмотрено в "
 "процессе передачи по Интернету."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Зашифровано"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Просмотреть сертификат"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Этот сертификат нельзя просмотреть"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 #, fuzzy
 msgid "Overdue:"
 msgstr "Просроченные задачи:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "_Встроенный просмотр"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Скрыть"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страница %d из %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Получение '%s'"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Часть external-body неверно сформирована"
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Указатель на FTP сайт (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Указатель на локальный файл (%s), доступный на сайте \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Указатель на локальный файл (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Указатель на удаленные данные (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Указатель на неизвестные внешние данные (типа \"%s\")"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Форматирование сообщения"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "От"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Обратный адрес"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Кому"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Копия"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Скр.копия"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Почтовый клиент"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "вложение %s"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не удается разобрать сообщение S/MIME: Неизвестная ошибка"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Не удается разобрать сообщение MIME. Отображается как есть."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Неподдерживаемый формат подписи"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Неизвестная ошибка при проверке подписи"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Неизвестная ошибка при проверке подписи"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Каждый год"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Каждую неделю"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "каждый месяц"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13436,25 +13845,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Сбой при создании канала к \"%s\": %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Не удается создать папку: %s: %s"
+
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Не удается скопировать дескриптор файла: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"Не удается создать файл вывода: %s\n"
+" %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Сбой идентификации на сервере POP %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Сбой при создании канала к \"%s\": %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Ошибка при определении узла '%s': %s"
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Не удается создать файл вывода: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13465,90 +13906,76 @@ msgstr "Сохранить как..."
 msgid "untitled_image.%s"
 msgstr "Неозаглавленное сообщение"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Установить как _фон"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "Ответить отп_равителю"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Открыть ссылку в браузере"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Отправить сообщение в список..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "_Добавить в адресную книгу"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Открыть в %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Этот сервер не поддерживает информацию LDAPv3 schema"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Подписан"
 
-#: mail/em-subscribe-editor.c:637 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 "Папка"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Пожалуйста, выберите сервер."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Не был выбран сервер"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Не показывать это сообщение снова."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Настройки фильтров"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Пересланное сообщение --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "В сообщении от %d.%m.%Y %H:%M %%s пишет:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "сообщение"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Сохранить сообщение ..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Добавить адрес"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Почта от %s"
@@ -13566,11 +13993,13 @@ msgid "Check incoming mail being junk"
 msgstr "Проверять, являются ли входящие сообщения спамом"
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Цвет подсветки цитирования"
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Цвет подсветки цитирования."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13675,167 +14104,168 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Список учетных записей"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Список учетных записей"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Регистрировать действия фильтра"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Регистрировать действия фильтра в указанном файле журнала."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Файл журнала действий фильтра"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Файл журнала действий фильтра."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Помечать сообщение как прочитанное через определенное время."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Высота окна сообщения по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Ширина окна сообщения по умолчанию"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Тип отображения сообщения (нормальное, все заголовки, исходный текст)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Звуковой файл извещения о новой почте"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Тип извещения о новой почте"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Предупреждать, если тема пустая"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 "Предупреждать, если пользователь пытается очистить удаленные сообщения в "
 "папке."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 ""
 "Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
 "Subject."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Предупреждать, если пользователь заполнил только поле Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 ""
 "Предупреждать при отправке сообщений в формате HTML тем, кто не желает этого."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 "Предупреждать, когда пользователь пытается отправить нежелательный HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Распознавать ссылки в тексте и заменять их."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Распознавать эмоции в тексте и заменять их значками."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Проверять на спам входящую почту"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "S3kr3t 0pt10n"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "S3kr3t 0pt10n."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Отправлять почту в формате HTML по умолчанию"
@@ -13882,7 +14312,7 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Высота окна сообщения по умолчанию"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -14020,33 +14450,65 @@ msgstr ""
 msgid "spamd port"
 msgstr "Порт spamd"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Настройка редактора"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Тут настраиваются параметры почты, включая безопасность и отображение "
+"сообщений"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Тут настраиваются проверка правописания, подписи и создание сообщений"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Настройте тут учётные записи почты"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Почта Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution Mail accounts configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Компонент Evolution Mail"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution Mail composer"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution Mail composer configuration control"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution Mail preferences control"
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "Настройка почты"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Почта:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14054,15 +14516,15 @@ msgstr "Импорт вашей почты из Elm"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Подождите пожалуйста"
 
@@ -14094,19 +14556,47 @@ msgid "Select folder to import into"
 msgstr "Выберите сертификат для импорта..."
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Импорт"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Импорт файлов"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape Mail importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox importer"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканирование %s"
@@ -14116,7 +14606,7 @@ msgstr "Сканирование %s"
 msgid "Priority Filter \"%s\""
 msgstr "Фильтр приоритета \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14142,7 +14632,7 @@ msgstr ""
 "импортированные фильтры и убедитесь, что они работают, \n"
 "как и предполагалось."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14153,7 +14643,7 @@ msgstr ""
 "используют возможности \"Игнорировать связи\" или \"Соблюдать связи\",\n"
 "не поддерживаемые в Evolution. Эти фильтры будут сброшены."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14166,24 +14656,24 @@ msgstr ""
 "что не поддерживается в Evolution. Эти фильтры будут изменены\n"
 "на проверку наличия (отсутствия) заданной строки в теле письма."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Импорт информации из Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Импорт информации из Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Настройки"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Почтовые фильтры"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14217,128 +14707,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Редактор учетных записей Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Имя пользователя:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "Путь:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Почта к %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Почта от %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "список рассылки %s"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "В ответ на %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Добавить правило фильтра"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "Удалённое"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d дней"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d секунд"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d секунд"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d контактов"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "Удалённое"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Новое почтовое сообщение"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Почтовое сообщение..."
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Создать новое сообщение"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Новая виртуальная папка"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Почтовые фильтры"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Создать новый календарь"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, показываемый календарем"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Подлинность"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14348,12 +14849,12 @@ msgstr ""
 "обязательны для заполнения, если только вы не хотите включать эти сведения в "
 "отправляемую вами почту."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Получение почты"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14362,15 +14863,15 @@ msgstr ""
 "сервера, свяжитесь со своим системным администратором или поставщиком услуг "
 "Интернета."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Выберите один из следующих вариантов"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Отправка почты"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14378,11 +14879,11 @@ msgstr ""
 "Введите информацию о способе отправки электронной почты. Если вы не уверены, "
 "свяжитесь со своим системным администратором или поставщиком услуг Интернета."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Управление учетными записями"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14396,14 +14897,6 @@ msgstr ""
 "учетной записи в строке ниже. Это имя будет использовано только для "
 "отображения."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Проверка сервиса"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Подключение к серверу..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14721,7 +15214,8 @@ msgid "Execute Command..."
 msgstr "Выполнить команду..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Фиксированная ширина:"
 
 #: mail/mail-config.glade.h:82
@@ -15053,351 +15547,456 @@ msgstr "цвет"
 msgid "description"
 msgstr "описание"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Папка с именем \"%s\" Уже существует. Используйте другое имя."
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Вы действительно хотите удалить эту учётную запись?"
+msgid "Invalid authentication"
+msgstr "Проверка подлинности"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Уничтожить все сообщения, помеченные как удаленные, в этой папке"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Сервер SMTP %s не поддерживает затребованный тип идентификации %s"
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Уничтожить все сообщения, помеченные как удаленные,  во всех папках"
+"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-errors.xml.in.h:6
+#. 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 "Вы действительно хотите удалить этот URL?"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
+"Вы посылаете сообщение в формате HTML, но следующие получатели\n"
+"не хотят получать почту в формате HTML:\n"
+
+#: 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-errors.xml.in.h:8
+#. 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 ""
 "Предупреждать, если пользователь пытается отправить сообщение с пустым полем "
 "Subject."
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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 ""
+"Предупреждать при попытке отправить сообщение с пустыми полями To и Cc."
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Не удается скопировать папку: %s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Не удается создать папку: %s: %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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Не удается создать временный каталог: %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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "Не удается создать каталог '%s': %s."
+msgid "Use default drafts folder?"
+msgstr "Путь к папке контактов по умолчанию"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"Не удается удалить папку:\n"
-"%s"
+"Не удается открыть папку черновиков для этой учетной записи.\n"
+"Хотите использовать папку черновиков по умолчанию?"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Не удается удалить папку: %s: нет такой папки"
+msgid "Use _Default"
+msgstr "По умолчанию"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Папка \"%s\" не существует."
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Уничтожить все сообщения, помеченные как удаленные, в этой папке"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Не удается переместить папку: %s"
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Не удается открыть \"%s\": %s"
+msgid "_Expunge"
+msgstr "Уни_чтожить удаленные"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Не удается открыть \"%s\": %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Уничтожить все сообщения, помеченные как удаленные,  во всех папках"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Не удается открыть сообщение"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgid "_Empty Trash"
+msgstr "О_чистить папку \"Удаленные\""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Не удается переименовать папку: %s: нет такой папки"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "У вас есть неотправленные сообщения, вы действительно хотите выйти?"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Не удается создать каталог '%s': %s."
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Не удается сохранить в '%s'\n"
-" %s"
-
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Добавить подпись"
 
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Не удается сохранить файл подписи: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Удалить \"%s\""
+msgid "Error while {0}."
+msgstr ""
+"Ошибка при \"%s\":\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Удалить выбранные контакты"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "_Отклонить изменения"
+msgid "Error while performing operation."
+msgstr ""
+"Ошибка при выполнении операции:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Хотите сохранить изменения?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Не удалять"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Ввод пароля"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Ошибка при загрузке информации фильтра:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Не удается создать каталог '%s': %s."
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
-"Ошибка при выполнении операции:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Ошибка при \"%s\":\n"
-"%s"
+"Не удается сохранить в '%s'\n"
+" %s"
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "Не удается создать каталог '%s': %s."
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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
 msgid "File exists but cannot overwrite it."
 msgstr "Файл существует, перезаписать?"
 
-#: mail/mail-errors.xml.in.h:42
+#. 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-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. 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 "Не удается удалить папку: %s: нет такой папки"
+
+#. mail:no-delete-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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:44
+#. 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 "Действительно удалить папку \"%s\"?"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Проверка подлинности"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Не удается переместить папку: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Не удается открыть \"%s\": %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Вы посылаете сообщение в формате HTML, но следующие получатели\n"
-"не хотят получать почту в формате HTML:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Не удается создать папку: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Действительно удалить папку \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Не удается открыть \"%s\": %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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: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/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"Следующая Виртуальная папка(и):\n"
-"%sиспользовала удаленную папку:\n"
-"    '%s'\n"
-"и была обновлена."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Не удалять"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Следующая Виртуальная папка(и):\n"
-"%sиспользовала удаленную папку:\n"
-"    '%s'\n"
-"и была обновлена."
+msgid "Could not save signature file."
+msgstr "Не удается сохранить файл подписи: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Добавить подпись"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Отклонить изменения"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "Сервер SMTP %s не поддерживает затребованный тип идентификации %s"
+msgid "Do you wish to save your changes?"
+msgstr "Хотите сохранить изменения?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15405,85 +16004,97 @@ msgstr ""
 "\n"
 "Вы хотите сохранить изменения?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Не удается открыть папку черновиков для этой учетной записи.\n"
-"Хотите использовать папку черновиков по умолчанию?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "По умолчанию"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Отклонить изменения"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Путь к папке контактов по умолчанию"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Вы не ввели всю необходимую информацию."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "У вас есть неотправленные сообщения, вы действительно хотите выйти?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Вы не можете создать две учетные записи с одинаковым именем."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Папка \"%s\" не существует."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Отклонить изменения"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "О_чистить папку \"Удаленные\""
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Следующая Виртуальная папка(и):\n"
+"%sиспользовала удаленную папку:\n"
+"    '%s'\n"
+"и была обновлена."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Уни_чтожить удаленные"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Отправить"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Следующая Виртуальная папка(и):\n"
+"%sиспользовала удаленную папку:\n"
+"    '%s'\n"
+"и была обновлена."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-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:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Ping на %s"
@@ -15492,20 +16103,20 @@ msgstr "Ping на %s"
 msgid "Working"
 msgstr "Обработка"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Фильтрация папки"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Получение эл.почты"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Ошибка применения фильтров исходящей почты: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15514,101 +16125,101 @@ msgstr ""
 "Ошибка добавления в %s: %s\n"
 "Производится добавление в локальную папку \"Отправленные\"."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Ошибка сохранения в локальной папке \"Отправленные\": %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Отправка сообщения %d из %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Сбой на сообщении %d из %d"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Выполнено."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Сохранение сообщения в папке"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перемещение сообщений в %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирование сообщений в %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканирование папок на \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Пересланные сообщения"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Открытие папки \"%s\""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Открытие хранилища %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Удаление папки \"%s\""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Сохранение папки \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Обновление папки"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Очистка папки"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Очистка корзины в '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Локальные папки"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Получение сообщения %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15616,7 +16227,7 @@ msgstr[0] "Получение %d сообщений"
 msgstr[1] "Получение %d сообщений"
 msgstr[2] "Получение %d сообщений"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15624,7 +16235,7 @@ msgstr[0] "Сохранение %d сообщений"
 msgstr[1] "Сохранение %d сообщений"
 msgstr[2] "Сохранение %d сообщений"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15633,7 +16244,7 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15642,11 +16253,11 @@ msgstr ""
 "Ошибка сохранения сообщений в: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Сохранение вложения"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15655,17 +16266,17 @@ msgstr ""
 "Не удается создать файл вывода: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не удается записать данные: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Отключение от %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Переподключение к %s"
@@ -15729,24 +16340,24 @@ msgstr "Обновление..."
 msgid "Waiting..."
 msgstr "Ожидание..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Операция отменена пользователем."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введите пароль для %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Ввод пароля"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Запомнить этот пароль"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запомнить этот пароль до завершения этого сеанса"
 
@@ -15788,89 +16399,94 @@ msgstr "Пересланные сообщения"
 msgid "Invalid folder: `%s'"
 msgstr "Неверная папка: '%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Настройка виртуальной папки: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Обновление виртуальных папок для uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Обновление виртуальных папок для uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Править виртуальную папку"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Новая виртуальная папка"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Непрочитано"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Отвечено"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Множество непрочитанных сообщений"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Множество сообщений"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Самый низкий"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Низкий"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Высокий"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Самый высокий"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Сегодня %I:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Вчера %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Создание списка сообщений"
 
@@ -15902,43 +16518,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Пометить к исполнению"
 
@@ -15983,120 +16599,59 @@ msgstr "Подписаться"
 msgid "_Unsubscribe"
 msgstr "Отказаться от подписки"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Оболочка Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution Test component"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Группа ярлыков по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Ширина панели папок по умолчанию"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Ширина панели ярлыков по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Высота окна по умолчанию"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Ширина окна по умолчанию"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Версия конфигурации Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 "Идентификатор или псевдоним компонента, который будет показываться при "
 "запуске по умолчанию."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 "Если этот ключ установлен, Evolution будет запускаться в автономном режиме."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Путь к папке календаря по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Путь к папке контактов по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Путь к папке почты по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Путь к папке задач по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Физический URI папки календаря по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Физический URI папки контактов по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Физический URI почтовой папки по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Физический URI папки задач по умолчанию"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Должен ли Evolution запускаться в автономном режиме"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Показывать ли панель папок"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Показывать ли панель ярлыков"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Пропускать ли предупреждение о тестовой версии"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "почта"
 
@@ -16104,6 +16659,32 @@ msgstr "почта"
 msgid "Brought to you by"
 msgstr "Создана для вас"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Неизвестная ошибка"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Недопустимые аргументы"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Не удается зарегистрировать в OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "База данных настроек не найдена"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Обычная ошибка"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Без заголовка)"
@@ -16239,11 +16820,11 @@ msgstr "Сбой при исполнении gpg."
 msgid "_Import"
 msgstr "_Импорт"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Закрытие соединений..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Параметры Evolution"
 
@@ -16280,11 +16861,35 @@ msgstr "Имя папки не может содержать символ \"#\".
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" и \"..\" -- зарезервированные имена папок."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
+"перехода в режим работы вне сети."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
+"для перехода в режим работы в сети."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Почта к %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Похоже, утилита GNOME Pilot не установлена в этой системе"
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Ошибка выполнения %s."
@@ -16298,14 +16903,15 @@ msgid "Bug buddy could not be run."
 msgstr "Не удается запустить Bug buddy."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "О программе Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Перейти в сетевой режим"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Ав_тономная работа"
 
@@ -16313,48 +16919,6 @@ msgstr "Ав_тономная работа"
 msgid "Work Offline"
 msgstr "Перейти в режим работы вне сети"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution сейчас в сетевом режиме работы. Нажмите на эту кнопку для "
-"перехода в режим работы вне сети."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution в процессе перехода в режим работы вне сети."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution сейчас в автономном режиме работы. Нажмите на эту кнопку "
-"для перехода в режим работы в сети."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Недопустимые аргументы"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Не удается зарегистрировать в OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "База данных настроек не найдена"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Обычная ошибка"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Флажок"
@@ -16427,6 +16991,43 @@ msgstr "Активные соединения"
 msgid "Click OK to close these connections and go offline"
 msgstr "Нажмите OK для закрытия соединения и перехода на работу вне сети"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "К_алендарь:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Контакты: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Почта:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Задачи:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Тип папки:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Открыть папку другого пользователя"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Учетная запись:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Имя _папки:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Пользователь:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Помощник по установке Evolution"
@@ -16469,6 +17070,19 @@ msgstr ""
 "\n"
 "Нажмите \"Применить\" для сохранения параметров. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Оболочка Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution Test component"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16530,13 +17144,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution может импортировать данные из следующих файлов:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16550,57 +17164,48 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "С благодарностью\n"
 "команда Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Не напоминать больше"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Нет доступа к оболочке Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Не удается инициализировать оболочку Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Запуск Evolution с активированием указанного компонента"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Запуск в автономном режиме"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Запуск в режиме подключения к интернету"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Принудительное закрытие всех компонентов evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Записывать отладочный вывод всех компонентов в файл."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16609,13 +17214,79 @@ msgstr ""
 "%s: --online и --offline не могут использоваться одновременно.\n"
 "Используйте %s --help для получения более подробной информации.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Подключение"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Нет доступа к оболочке Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Помощник по учетным записям Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Выберите сертификат для импорта..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Имя сертификата"
 
@@ -16847,11 +17518,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Ваши сертификаты"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Сертификат уже существует"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d.%m.%Y"
@@ -17045,6 +17711,11 @@ msgstr "Уникальный ID темы"
 msgid "Certificate Signature Value"
 msgstr "Значение подписи сертификата"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Сертификат уже существует"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "Пароль файла PKCS12"
@@ -17085,12 +17756,12 @@ msgstr "Тема сообщения по умолчанию."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Не удается выполнить '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Останавливается %s (%s)\n"
@@ -17154,7 +17825,8 @@ msgid "Select all contacts"
 msgstr "Выбрать все контакты"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Отправить сообщение к выбранным контактам."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17186,8 +17858,8 @@ msgstr "Просмотреть текущий контакт"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Действия"
@@ -17205,7 +17877,8 @@ msgid "_Preview Pane"
 msgstr "Панель предварительного просмотра"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Сохранить как VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17332,10 +18005,20 @@ msgstr "Просмотреть текущую встречу"
 msgid "Week"
 msgstr "Неделя"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Рабочая неделя"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 "Закрыть"
+
 #: 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
@@ -17653,6 +18336,16 @@ msgstr "Обратить выделение"
 msgid "_Threaded Message List"
 msgstr "Показывать подшивки в списке сообщений"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Закрыть"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17895,7 +18588,8 @@ msgid "Open the selected message in a new window"
 msgstr "Отправить выбранное сообщение в новом окне"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Открыть выбранные сообщения в редакторе, чтобы вновь отправить их"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18010,58 +18704,46 @@ msgstr "Виртуальную папку по теме..."
 msgid "_Attached"
 msgstr "Как _вложение"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Копировать в папку"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Создать фильтр из сообщения"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Перейти к"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Как вс_троенный текст"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "Больше"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Отображение сообщения"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Переместить в папку"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Следующему сообщению"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Нормальное отображение"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Открыть сообщение"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Предыдущему сообщению"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "Как _цитирование"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "_Переслать..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "С_ервис"
@@ -18070,16 +18752,6 @@ msgstr "С_ервис"
 msgid "_Undelete"
 msgstr "Восстановить"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Закрыть"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Вложить"
@@ -18470,6 +19142,11 @@ msgstr "_Быстрая справка"
 msgid "_Send / Receive"
 msgstr "_Получить и отправить"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Окно"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "По _компании"
@@ -18537,10 +19214,6 @@ msgstr "Дата выполнения:"
 msgid "With _Status"
 msgstr "Установить состояние"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Задачи"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18699,6 +19372,35 @@ msgstr "Другая..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Почта Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Информация о собрании"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Отправленные сообщения и черновики"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -18814,6 +19516,35 @@ msgstr "Текст"
 msgid "Find _Now"
 msgstr "Найти _сейчас"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"Хотите переписать?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Не удается сохранить в '%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Не удается сохранить в '%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18824,15 +19555,140 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% выполнено)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Addressbook folder viewer"
+
 #, fuzzy
-#~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr ""
-#~ "Адресная книга '%s' будет удалена. Вы действительно хотите продолжить?"
+#~ msgid "Address 2:"
+#~ msgstr "Адрес _2:"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Новая адресная книга"
+#~ msgid "Blog:"
+#~ msgstr "Блог"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Calendar viewer"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Просмотр задач Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Не удается инициализировать gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Не удается открыть папку в '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, показываемый календарем"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Показываемый тип для вида"
+
+#~ msgid "Display a message"
+#~ msgstr "Показать сообщение"
+
+#~ msgid "Alerts"
+#~ msgstr "Предупреждения"
+
+#~ msgid "Time"
+#~ msgstr "Время"
+
+#~ msgid "_General"
+#~ msgstr "_Общие"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Выбрать импортер"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Календарь"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Новый список задач"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Файл календаря не может быть обновлён!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Показываемый URI папки задач"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Не удается загрузить задачи в \"%s\""
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution Mail folder viewer"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "Виртуальная папка по подшивке"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Фильтр по подшивке"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Сбой при создании канала к \"%s\": %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Сбой при создании канала к \"%s\": %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Ошибка при определении узла '%s': %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "S3kr3t 0pt10n"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "S3kr3t 0pt10n."
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, показываемый календарем"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Группа ярлыков по умолчанию"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Ширина панели ярлыков по умолчанию"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Путь к папке календаря по умолчанию"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Путь к папке контактов по умолчанию"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Путь к папке почты по умолчанию"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Путь к папке задач по умолчанию"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Физический URI папки календаря по умолчанию"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Физический URI папки контактов по умолчанию"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Физический URI почтовой папки по умолчанию"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Физический URI папки задач по умолчанию"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Показывать ли панель папок"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Показывать ли панель ярлыков"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Не удается инициализировать оболочку Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "_Переслать..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr ""
@@ -19004,9 +19860,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "S_pouse:"
 #~ msgstr "С_упруг(а):"
 
-#~ msgid "_Add"
-#~ msgstr "_Добавить"
-
 #~ msgid "_Business:"
 #~ msgstr "Рабочий:"
 
@@ -19122,15 +19975,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Дата завершения рашьше даты окончания!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Дата начала:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Дата выполнения:"
-
-#~ msgid "Priority:"
-#~ msgstr "Приоритет:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19162,13 +20006,6 @@ msgstr "%s (%d%% выполнено)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Не удается скопировать дескриптор файла: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19313,9 +20150,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Посмотреть на вид календаря на печати"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Введите пароль для %s"
-
 #~ msgid "New task list"
 #~ msgstr "Новый список задач"
 
@@ -19372,30 +20206,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Не удается найти указанную общую папку."
 
-#~ msgid "C_alendar:"
-#~ msgstr "К_алендарь:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Почта:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Задачи:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Тип папки:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Открыть папку другого пользователя"
-
-#~ msgid "_Account:"
-#~ msgstr "_Учетная запись:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Имя _папки:"
-
-#~ msgid "_User:"
-#~ msgstr "_Пользователь:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Создать новое окно"
 
@@ -19696,9 +20506,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "Encryption"
 #~ msgstr "Шифрование"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "В настоящий момент активны следующие соединения:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Найти контакты"
 
@@ -19714,9 +20521,6 @@ msgstr "%s (%d%% выполнено)"
 #~ msgid "Addressbook Sources"
 #~ msgstr "Источники адресных книг"
 
-#~ msgid "No data provided"
-#~ msgstr "Нет данных"
-
 #~ msgid ""
 #~ "Could not open file `%s':\n"
 #~ "%s"
diff --git a/po/sk.po b/po/sk.po
index 2c1e4d886c..b3d3b056b0 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -26,6 +26,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Adresár Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakty: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Okno Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -51,16 +61,6 @@ msgstr "karty"
 msgid " card"
 msgstr "1 karta"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakty: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Okno Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Štandardná adresa pre synchronizáciu:"
@@ -76,67 +76,20 @@ msgstr "Nie je možné načítať %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nie je možné prečítať blok aplikácie Adresa z pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Priečinky automatického dopĺňania"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikátu:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Nastavenie emailových účtov"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakty"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Adresár Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Okno adries adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Prehliadač adries adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Prehliadač kariet adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Komponent Adresár Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Prehliadač priečinku adresára Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Ovládací prvok nastavenia pošty Evolution"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Používam server LDAP anonymne"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Ovládací prvok pre priečinok nastavenia Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Nepodarilo sa prihlásiť.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sZadajte heslo pre %s (používateľ %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -179,42 +132,46 @@ msgstr "_Kontakty:"
 msgid "Create a new contacts group"
 msgstr "Vytvoriť novú skupinu skratiek"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakám..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Prehľadávam %s"
@@ -222,8 +179,8 @@ msgstr "Prehľadávam %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -231,7 +188,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Osobný"
@@ -281,20 +238,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Používam server LDAP anonymne"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Nepodarilo sa prihlásiť.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Adresár"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sZadajte heslo pre %s (používateľ %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -314,6 +293,63 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Priečinky automatického dopĺňania"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakty"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikátu:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Nastavenie emailových účtov"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Adresár Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Okno adries adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Prehliadač adries adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Prehliadač kariet adresára Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponent Adresár Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Ovládací prvok nastavenia pošty Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Ovládací prvok pre priečinok nastavenia Evolution"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "Zobraziť _podporované základy"
@@ -335,6 +371,7 @@ msgstr "Zobraziť _podporované základy"
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -407,7 +444,7 @@ msgstr "_Kontakty:"
 msgid "Address Book Properties"
 msgstr "Zdroje adresára"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Vždy"
@@ -422,106 +459,96 @@ msgid "Basic"
 msgstr "Základné"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Farby"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Pripojenie"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Známe meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Známe meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podporované databáze hľadania"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Všeobecné"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikdy"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jeden"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Vyberte farbu"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "_Rozsah hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Rozsah hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Hľadám"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -530,7 +557,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -545,7 +572,7 @@ msgstr ""
 "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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -556,19 +583,19 @@ 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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Podporované databáze hľadania"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -579,7 +606,7 @@ msgstr ""
 "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:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -594,13 +621,13 @@ 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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -610,7 +637,7 @@ 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:63
+#: 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 "
@@ -619,7 +646,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -629,7 +656,7 @@ msgstr ""
 "Evolution.\n"
 "Používa sa iba na zobrazovanie."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -640,128 +667,136 @@ msgstr ""
 "Zoznam štandardných portov je predvyplnený. Číslo portu by vám\n"
 "mal poskytnúť váš administrátor."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formát času:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Použiť známe meno (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Použiť e-mailovú adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Ak je to možné"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakty:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Obmedzenie _sťahovania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Emailová adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Spôsob _prihlásenia:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Meno:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Priorita:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Oblasť hľadania:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Meno serveru:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "Ča_kanie (minúty):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Použiť _bezpečné pripojenie (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "karty"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minút"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Rozhranie pre výber mena adresára Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Odstrániť všetky"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Odstrániť"
 
+#: 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 "Meno"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Odstrániť všetky"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Zobraziť zoznam kontaktov"
@@ -784,23 +819,15 @@ msgstr "Pridať do kontaktov"
 msgid "Unnamed Contact"
 msgstr "Kontakt bez mena"
 
-#: 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
-msgid "Name"
-msgstr "Meno"
-
 #: 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
 msgid "Source"
 msgstr "Zdroj"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Rozhranie pre výber mena adresára Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -873,143 +900,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresa _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Výročie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Dátum na_rodenia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Boloňa"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Kalen_dár:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Firma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editor kontaktov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Kra_jina:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "O_ddelenie:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "Voľno/zaneprázdnený URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Celé meno..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Domov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Zliať e-mailovú adresu"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Vedúci"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Pre_zývka:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Poznámky:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Iné"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_PO Box:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1037,9 +1064,9 @@ msgstr "Strana"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Zamestnanie"
@@ -1072,23 +1099,37 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Naozaj chcete odstrániť\n"
+"tieto kontakty?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Upraviteľný"
 
@@ -2067,100 +2108,118 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Poslať správu"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Zoznam bez mena"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Služba pripravená"
-
-#: 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 "Umiestnenie:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Po_užívateľ:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Skupina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Zdroj"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nový kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Zapisovateľné polia"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Zmenené"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Tento kontakt patrí do týchto kategórií:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Tieto spojenia sú momentálne aktívne:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Poslať správu"
+
+#: 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 "Služba pripravená"
+
+#: 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 "Umiestnenie:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Po_užívateľ:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Rýchly kontakt"
@@ -2178,20 +2237,6 @@ msgstr "_Celé meno:"
 msgid "E-_mail:"
 msgstr "E_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Naozaj chcete odstrániť\n"
-"tieto kontakty?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "Naozaj chcete odstrániť tento kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2341,8 +2386,8 @@ msgstr "editor-zoznamu-kontaktov"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kniha"
 
@@ -2403,6 +2448,458 @@ 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
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Členovia"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizácia"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Skupina"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Zamestnanie"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Boloňa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobil"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Osobný"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Poznámka"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Činnosť/po_zícia:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Domáci fax"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Úspech"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Sklad off-line"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Prístup zamietnutý"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Karta nenájdená"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokol nepodporovaný"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Zrušený"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Overenie zlyhalo"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Vyžadované overenie"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Taká správa neexistuje"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Iná chyba"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Vášmu dotazu odpovedá viac kariet, než dokáže server\n"
+"poslať alebo Evolution zobraziť. Prosím, upresnite svoj\n"
+"dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
+"serveru pre tento adresár."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Čas pre vykonanie tohto dotazu prekročil limit nastavený na serveri\n"
+"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
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Chyba pri pridávaní karty"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Chyba pri zmene zoznamu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Chyba pri zmene karty"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Chyba pri odstraňovaní karty"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s už existuje.\n"
+"Chcete ho prepísať?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "zoznam"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Presunúť kartu do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopírovať kartu do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Presunúť karty do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopírovať karty do"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Vyberte kontakty z adresára"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Viacero VKariet"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VKartapre %s"
+
+#.
+#. * 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 "(nič)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primárny e-mail"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-mail 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-mail 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Vyberte akciu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Vytvoriť nový kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Otázka pre adresár..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Upraviť kontakt"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Zliať e-mailovú adresu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "a jedna iná karta."
+msgstr[1] "a jedna iná karta."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Zobraziť ú_plné hlavičky"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Uložiť kontakt ako VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Uložiť do adresára"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2418,8 +2915,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Dotaz"
 
@@ -2474,9 +2971,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Uložiť ako VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2544,7 +3042,7 @@ msgid "Cut"
 msgstr "Vystrihnúť"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2555,18 +3053,8 @@ msgstr "Kopírovať"
 msgid "Paste"
 msgstr "Vložiť"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Odstrániť"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktuálny pohľad"
 
@@ -2582,7 +3070,7 @@ msgstr ""
 "spadlo. Aby ste ho mohli znovu použiť, musíte Evolution reštartovať."
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Ľubovoľná kategória"
@@ -2623,21 +3111,6 @@ msgstr "Kategórie"
 msgid "Company Phone"
 msgstr "Firemný felefón"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-mail 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-mail 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Priezvisko"
@@ -2677,29 +3150,14 @@ msgstr "Jordánsko"
 msgid "Manager"
 msgstr "Vedúci"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobil"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Prezývka"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Poznámka"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pracovisko"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizácia"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Ďalší fax"
@@ -2753,21 +3211,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "WWW stránka"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Šírka"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Výška"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Je aktívny"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Výbrané"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Má kurzor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Pole"
@@ -2784,10 +3250,6 @@ msgstr "Model textu"
 msgid "Max field name length"
 msgstr "Maximálna dĺžka mena poľa"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Šírka stĺpca"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2816,432 +3278,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptér"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Výbrané"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Má kurzor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Členovia"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Skupina"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Zamestnanie"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Boloňa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Osobný"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Činnosť/po_zícia:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Domáci fax"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Úspech"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Sklad off-line"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adresár neexistuje"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Prístup zamietnutý"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Karta nenájdená"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "ID karty už existuje"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol nepodporovaný"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Zrušený"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Overenie zlyhalo"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Vyžadované overenie"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Taká správa neexistuje"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Iná chyba"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Nie je možné otvoriť adresár"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Vášmu dotazu odpovedá viac kariet, než dokáže server\n"
-"poslať alebo Evolution zobraziť. Prosím, upresnite svoj\n"
-"dotaz alebo zvýšte obmedzenie v nastavení adresárového\n"
-"serveru pre tento adresár."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Čas pre vykonanie tohto dotazu prekročil limit nastavený na serveri\n"
-"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:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Tento dotaz nebol dokončený úspešne."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Chcete uložiť zmeny?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Zahodiť"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Chyba pri pridávaní zoznamu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Chyba pri pridávaní karty"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Chyba pri zmene zoznamu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Chyba pri zmene karty"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Chyba pri odstraňovaní zoznamu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Chyba pri odstraňovaní karty"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s už existuje.\n"
-"Chcete ho prepísať?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Prepísať"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "zoznam"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Presunúť kartu do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopírovať kartu do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Presunúť karty do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopírovať karty do"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Vyberte kontakty z adresára"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Viacero VKariet"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VKartapre %s"
-
-#.
-#. * 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 "(nič)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primárny e-mail"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Vyberte akciu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Vytvoriť nový kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Pridať adresu do existujúceho kontaktu \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Otázka pre adresár..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Upraviť kontakt"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Zliať e-mailovú adresu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "a jedna iná karta."
-msgstr[1] "a jedna iná karta."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Zobraziť ú_plné hlavičky"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Uložiť kontakt ako VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Uložiť do adresára"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Šírka stĺpca"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3285,11 +3324,6 @@ msgstr "Import formátu VCard do Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Tlačiť obálku"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3301,6 +3335,11 @@ msgstr "Tlačiť vybrané kontakty"
 msgid "Print contact"
 msgstr "Tlačiť vybrané kontakty"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Tlačiť obálku"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bd. Tahoma"
@@ -3487,18 +3526,6 @@ msgstr "Zoznam _kontaktov"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Nie je možné otvoriť správu"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Karta nenájdená"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3556,6 +3583,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Nie je možné otvoriť správu"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Karta nenájdená"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Chyba pri načítavaní štandardného adresára"
@@ -3568,11 +3607,12 @@ msgstr "Vstupný súbor"
 msgid "No filename provided."
 msgstr "Nezadané meno súboru."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Zoznam bez mena"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Zadajte heslo"
@@ -3605,120 +3645,55 @@ msgstr "Štandardná priorita:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nie je možné prečítať blok aplikácie ToDo pilota"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendár a úlohy"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendár"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendár a úlohy Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Prehliadač plánovacích správ kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Prehliadač kalendára Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Kalendár Evolution/Editor úloh"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Prehliadač úloh Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Komponent kalendára a úloh Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Testovací komponent Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Úlohy"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Služba upozornenia kalendára Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Od:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Do:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarm Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Upozornenie na %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Zavrieť"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "O_pakovať"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Čas opakovania (minúty)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Upraviť schôdzku"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "O_pakovať"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvoriť"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Popis nie je k dispozícii."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3727,12 +3702,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Varovanie"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3743,7 +3718,7 @@ msgstr ""
 "pomocou e-mailu, ale toto upozornenie tak bolo nastavené.\n"
 "Evolution preto zobrazí normálny dialóg."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3760,19 +3735,19 @@ msgstr ""
 "\n"
 "Chcete tento program spustiť?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Pre tento program túto správu už nezobrazovať."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Služba upozornenia kalendára Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nie je možné inicializovať Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nie je možné inicializovať gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nie je možné vytvoriť vytváracie rozhranie pre službu upozorňovania"
 
@@ -3885,61 +3860,46 @@ 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 "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Odstrániť dokončené úlohy"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Súhrn obsahuje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentár obsahuje"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Popis obsahuje"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Nenájdené"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendár"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3951,125 +3911,136 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "vráti menej než"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dní"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Vlastnosti..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Načítavam kalendár..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendár"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nová schôdzka"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "S_chôdzka"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Stretnutie"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Vytvorí novú požiadavku na stretnutie"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nová celodenná schôdzka"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Celodenná Schôdzka"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Vytvoriť novú schôdzku"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Nová Kaledónia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Kalen_dár:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Vytvoriť nový priečinok"
@@ -4100,15 +4071,36 @@ msgstr "Týždeň"
 msgid "Month View"
 msgstr "Mesiac"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Súhrn obsahuje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Popis obsahuje"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentár obsahuje"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Popis obsahuje"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Nenájdené"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Chyba pri otváraní kalendára"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Nepodporovaná metóda pri otváraní kalendára"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Prístup zamietnutý pri otváraní kalendára"
 
@@ -4117,19 +4109,6 @@ msgstr "Prístup zamietnutý pri otváraní kalendára"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nie je možné otvoriť priečinok v '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, ktoré bude kalendár zobrazovať"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Typ pohľadu, ktorý sa má zobraziť"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Zvukové alarmy"
@@ -4197,7 +4176,7 @@ msgstr "extra oprakovanie každých"
 msgid "hours"
 msgstr "hodín"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4216,14 +4195,14 @@ msgstr "Základné"
 msgid "Date/Time:"
 msgstr "Dátum a čas:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Zobraziť správu"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Prehrať zvuk"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4239,6 +4218,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
 msgid "Summary:"
 msgstr "Súhrn:"
@@ -4277,10 +4257,109 @@ msgstr "minút"
 msgid "start of appointment"
 msgstr "začiatok schôdzky"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Nová Kaledónia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Zoznam úloh"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Nová Kaledónia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "týždňov"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Povolené"
 
@@ -4296,19 +4375,19 @@ msgstr "Neimportovať"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Zakázať"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Povoliť"
 
@@ -4333,164 +4412,177 @@ msgid "60 minutes"
 msgstr "60 minút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alarmy"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Začína:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Pripomenutia"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Informácie o kalendári"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Termín:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Pracovný týždeň"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Nastavenie kalendára a úloh"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Farba pre nestihnuté úlohy"
 
-#: 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 "Farba pre úlohy do dnešného dňa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Deň _končí:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Zobrazenie"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Povoliť"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Piatok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Hodiny"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minúty"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Pondelok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Ne"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Zobraziť pripomenutie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Zobraziť čí_sla týždňov v navigárovi dátumov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Nedeľa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Úlohy s _dnešným termínom:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "Š_tv"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Zoznam úloh"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Štvrtok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Čas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Časová _zóna:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Formát času:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Utorok"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Týždeň začína:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Streda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Pracovný týždeň"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Pracovné dni:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12-hodinový (am/pm)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 hodín"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Pridať"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Pýtať sa na potvrdenie pri odstraňovaní"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Z_hustiť víkendy v mesačnom pohľade"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Deň začína:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Zobrazenie"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4500,145 +4592,46 @@ msgstr "_Zobrazenie"
 msgid "_Edit"
 msgstr "_Upraviť"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Požiadavka na informácie o voľnom čase"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "P_ia"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Všeobecné"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Skryť dokončené úlohy po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Úlohy _po termíne:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_So"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "Zobraziť _koncové časy schôdzok v týždennom a mesačnom pohľade"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Ro_zdelenie času:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Ut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Str"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "pred každou schôdzkou"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Nová Kaledónia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Zoznam úloh"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Chyba iCalendar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Nová Kaledónia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Typ:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "týždňov"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4717,80 +4710,80 @@ msgstr "%s  Urobili ste zmeny. Zahodiť ich a aktualizovať editor?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Neurobili ste žiadne zmeny. Aktualizovať editor?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Chyba validácie: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr "u do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Dokončený "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Termín do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Termín do "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nepodarilo sa aktualizovať objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Upraviť schôdzku"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Schôdzka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Úloha - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Položka denníka - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Žiadny súhrn"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Uložiť ako..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 "Zmeny tejto položky môžu byť zahodné v prípade, že príde aktualizácia"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Nepodarilo sa získať aktuálnu verziu!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Chyba validácie: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr "u do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Dokončený "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Termín do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Termín do "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4917,27 +4910,27 @@ msgstr "Delegovať na:"
 msgid "Enter Delegate"
 msgstr "Zadajte na koho delegovať"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Schôdzka"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Pripomenutie"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Opakovanie"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Plánovanie"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Stretnutie"
 
@@ -4950,7 +4943,7 @@ msgstr "Koncový dátum je pred dátumom začiatku."
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Dátum začiatku je neplatný"
 
@@ -5039,10 +5032,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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,15 +5054,15 @@ msgstr "Organizátor je vyžadovaný."
 msgid "At least one attendee is required."
 msgstr "Nutný je aspoň jeden účastník."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegovať na..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5355,26 +5348,19 @@ msgstr "_Zahodiť zmeny"
 msgid "Save Event"
 msgstr "Uložiť udalosť"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Vyberte nástroj pre import"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Vyberte cieľový priečinok pre import týchro dát"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalendár"
+msgid "_Destination"
+msgstr "Odstrániť tento priečinok"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Zoznam úloh"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5403,38 +5389,44 @@ msgid "% _Complete"
 msgstr "% hotových"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Dokončený"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Vysoká"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Prebieha"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Nízka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normálny"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nezačal"
 
@@ -5472,11 +5464,11 @@ msgstr "Adresa _WWW stránky:"
 msgid "Assignment"
 msgstr "Priradenie"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Termín je neplatný"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Nie je možné otvoriť adresár"
@@ -5485,8 +5477,9 @@ msgstr "Nie je možné otvoriť adresár"
 msgid "Con_fidential"
 msgstr "_Tajné"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Popis:"
@@ -5641,101 +5634,56 @@ msgstr "%s o %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s pre neznámy typ spustenia"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Verejný"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Súkromný"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Tajný"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Dátum konca"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Dátum štartu"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Súhrn"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Voľný"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zaneprázdnený"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Kliknutím pridáte úlohu"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "J"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Bez mena"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "V"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "_Počiatočný dátum:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Z"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "_Termín:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografické miesto musí byť zadané vo formáte:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stav:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Priorita:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nie"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Adresa _WWW stránky:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Neznámy"
+#: 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 "Verejný"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Opakovanie"
+#: 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 "Súkromný"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Priradené"
+#: 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 "Tajný"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5781,17 +5729,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Voľný"
+
+#: 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 "Zaneprázdnený"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Odstráňujem vybrané objekty"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Otvoriť"
 
@@ -5801,41 +5758,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Vložiť"
 
@@ -5893,78 +5851,157 @@ msgstr "Priorita"
 msgid "Start date"
 msgstr "Dátum štartu"
 
+#: 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 "Súhrn"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Triedenie úloh"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nová _schôdzka..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nová celodenná _udalosť"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nové stretnutie"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Nová úloha"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Vybrať _vlákno"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Odstrániť..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopírovať do priečinku..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Naplánovať _stretnutie..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Poslať ďalej ako i_Calendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Odstrániť tento vý_skyt"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Odstrániť _všetky výskyty"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Prejsť na d_nešný dátum"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Prejsť na dátum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "Nas_tavenie..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Dátum konca"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Neznámy"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Opakovanie"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nie"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "J"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "V"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Z"
+
+#: 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 ""
+"Geografické miesto musí byť zadané vo formáte:\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5988,36 +6025,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i rozdelení minúty"
+#. 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 "dopoludnia"
+
+#. 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 "popoludní"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "dopoludnia"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "popoludní"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i rozdelení minúty"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6125,10 +6162,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Žiadna</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stav:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6158,7 +6191,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6371,61 +6404,57 @@ msgstr "Príloha neobsahuje platnú správu kalendára"
 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:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Súbor kalendára nie je aktualizovať!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Aktualizácia dokončená\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Nastala chyba v systéme CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objekt sa nepodarilo nájsť\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Stav účastníka bol aktualizovaný\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Stav účastníka nie je možné aktualizovať!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Odstránenie dokončené"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Položka poslaná!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Položku nie je možné poslať!\n"
 
@@ -6542,28 +6571,6 @@ msgstr "Delegované"
 msgid "In Process"
 msgstr "Prebieha"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Mimo kancelárie"
@@ -6624,7 +6631,34 @@ msgstr "_Začiatok stretnutia:"
 msgid "Meeting _end time:"
 msgstr "_Koniec stretnutia:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+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
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6633,21 +6667,19 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otváram úlohy na %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6656,53 +6688,109 @@ msgstr ""
 "Chyba pre %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Dokončujem úlohy..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Odstráňujem vybrané objekty..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Čistím"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Úlohy"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Žiadne schôdzky."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Nahrávanie obrázkov"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Otvoriť v %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turín"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendár a úlohy"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Nastavenie časovej zóny, kalendára a zoznamu úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendár a úlohy Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Ovládací prvok pre nastavenie kalendára Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Prehliadač plánovacích správ kalendára Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Kalendár Evolution/Editor úloh"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Komponent kalendára a úloh Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Testovací komponent Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendár"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "Ú_lohy"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Apríl"
@@ -6840,6 +6928,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Prístup zamietnutý pri otváraní kalendára"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Nie je možné otvoriť adresár"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7059,7 +7164,7 @@ msgid "Contacts: "
 msgstr "Kontakty: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Ukážka pred tlačou"
 
@@ -7071,68 +7176,78 @@ msgstr "Tlačiť položku"
 msgid "Print Setup"
 msgstr "Nastavenie tlačiarne"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Nahrávanie obrázkov"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "Ú_loha"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Nová úloha"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Zoznam úloh"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Vytvorí novú úlohu"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI, ktoré bude zobrazovať priečinok úloh"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nepodarilo sa načítať úlohy v `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7144,11 +7259,11 @@ msgstr ""
 "\n"
 "Naozaj odstrániť tieto úlohy?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Túto správu už nezobrazovať."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Tlačiť úlohy"
 
@@ -8797,7 +8912,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripravujem priečinok '%s' pre prácu off-line"
@@ -8890,33 +9005,6 @@ msgstr "Neplatné argumenty pre (používateľské značky)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Chyba pri vykonávaní hľadania filtra: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nie je možné spracovať hľadací výraz: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Chyba pri vykonávaní hľadacieho výrazu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Vykonanie otázky na neznámej hlavičke: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8949,7 +9037,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Získavam %d správ"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nie je možné spracovať hľadací výraz: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Chyba pri vykonávaní hľadacieho výrazu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(odpovedá všetkému) vyžaduje jeden pravdivostný výsledok"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, 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
+#, 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
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Vykonanie otázky na neznámej hlavičke: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8960,15 +9093,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Nepodarilo sa spracovať radu gpg userid."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nepodarilo sa spracovať požiadavku na heslo gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8977,27 +9110,27 @@ msgstr ""
 "Musíte zadať heslo pre odomkntie kľúča\n"
 "pre používateľa: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Zrušené."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nepodarilo sa odomknúť tajný kľúč: zadané 3 neplatné heslá."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočakávaná odpoveď od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nie je možné zašiftovať správu: nezadaní žiadni platní adresáti."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9008,85 +9141,65 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nepodarilo sa použiť GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Nie je možné zapísať dáta: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Nepodarilo sa spustiť gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Nepodarilo sa spustiť gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Nie je možné overiť správu: nie je možné vytvoriť dočasný súbor: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Toto je digitálne podpísaná časť správy"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Vytvoriť index obsahu správ"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Nie je možné získať správu z editora"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nie je možné vytvoriť pomocnú rúru pre zamykanie: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Nie je možné spustiť pomocný program pre zámok: %s"
-
-#: 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 "Nepodarilo sa zamknúť '%s': chyba protokolu s lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nepodarilo sa zamknúť '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9107,6 +9220,26 @@ msgstr "Nepodarilo sa získať zámok pomocou fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nepodarilo sa získať zámok pomocou flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nie je možné vytvoriť pomocnú rúru pre zamykanie: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Nie je možné spustiť pomocný program pre zámok: %s"
+
+#: 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 "Nepodarilo sa zamknúť '%s': chyba protokolu s lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nepodarilo sa zamknúť '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9359,7 +9492,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Neplatná odpoveď na overenie od serveru."
 
@@ -9559,7 +9692,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "ID _certifikátu:"
 
 #: camel/camel-smime-context.c:360
@@ -9576,7 +9709,7 @@ msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 msgid "Failed to add data to CMS encoder"
 msgstr "Nepodarilo sa pridať do lokálneho priečinku \"Odoslené\": %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Nepodarilo sa prihlásiť.\n"
@@ -9647,99 +9780,99 @@ msgstr "Nie je možné získať priečinok: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Nie je možné získať správu %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Zlyhanie podpisu certifikátu"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Upraviť podpis"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Typ: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP príkaz zlyhal: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nepodarilo sa nájsť certifikát pre \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Nepodarilo sa nájsť obvyklý bulk algoritmus."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nepodarilo sa vytvoriť kontext dekódovania S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Príkaz neimplementovaný"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9756,16 +9889,26 @@ msgstr "Nie je možné získať priečinok: %s: %s"
 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, 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:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Odpadky"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9887,7 +10030,7 @@ msgstr "Použitie kľúča nepodporuje podpis certifikátu"
 msgid "Error in application verification"
 msgstr "Chyba pri použití overenia"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9900,11 +10043,11 @@ msgstr ""
 "Fingerprint:       %s\n"
 "Podpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "DOBRE"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "ZLE"
 
@@ -9928,7 +10071,7 @@ msgstr ""
 "Chcete ho aj tak akceptovať?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9943,7 +10086,7 @@ msgstr ""
 "\n"
 "Chcete ho akceptovať?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9952,7 +10095,7 @@ msgstr ""
 "Problém certifikátu: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9961,7 +10104,7 @@ msgstr ""
 "Neplatná doména certifikátu: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9970,7 +10113,7 @@ msgstr ""
 "Platnosť certifikátu vypršala: %s\n"
 "Vydal: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9984,17 +10127,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nie je možné spracovať URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Chyba pri uložení '%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Taká správa neexistuje %s v %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 "Nepodarilo sa skopírovať alebo presunúť správu do virtuálneho priečinku"
@@ -10004,11 +10147,6 @@ msgstr ""
 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:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10025,10 +10163,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Kontrolujem novú poštu"
 
 #: 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 "Kontrolujem novú poštu vo všetkých priečinkoch"
@@ -10063,6 +10203,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10083,26 +10224,323 @@ msgstr ""
 msgid "Checklist"
 msgstr "Hustý opar"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %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 "Server neočakávane zrušil spojenie: %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 "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Nie je možné získať správu: %s z priečinku %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 ""
+"Nie je možné získať správu: %s z priečinku %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Nie je možné pridať správu do priečinok mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Nie je možné pridať správu do priečinok 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 ""
+"Nie je možné získať správu: %s z priečinku %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 ""
+"Nie je možné získať správu: %s z priečinku %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 ""
+"Nie je možné získať správu: %s z priečinku %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 ""
+"Nie je možné získať správu: %s z priečinku %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 "Priečinky"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Zobraziť iba prihlásené priečinky"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Predefinovať mená priečinkov zo serveru"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Priestor mien"
+
+#: 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 "Pre čítanie a ukladanie pošty na IMAP serveroch."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "Služba IMAP pre %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: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/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 "Nie je možné spojenie s %s (port %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Spojenie zrušené"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Neznáma chyba"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nepodarilo sa pripojiť k POP serveru %s. Požadovaný spôsob overenia nie je "
+"podporovaný."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sProsím, zadajte SMTP heslo pre %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nepodarilo sa prihlásiť na POP server %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Meno priečinku \"%s\" nie je platné, pretože obsahuje znak \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Firma"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Nie je možné odstrániť priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Nie je možné premenovať priečinok: %s: Neplatná operácia"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Nie je možné získať priečinok: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočakávaná odpoveď od IMAP serveru: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Žiadne úlohy"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operácia zrušená"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server neočakávane zrušil spojenie: %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:1089
-msgid "Unknown error"
-msgstr "Neznáma chyba"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10147,21 +10585,21 @@ msgstr "Nie je možné vytvoriť priečinok %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nie je možné načítať súhrn pre %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Priečinok bol zničený a znovu vytvorený na serveri."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Hľadám zmenené správy"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nepodarilo sa prijať správu: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10177,25 +10615,25 @@ msgstr ""
 "Nie je možné získať správu: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Taká správa neexistuje"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Táto správa momentálne nie je k dipozícii"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nie je možné nájsť telo správy v odpovedi FETCH."
 
@@ -10237,23 +10675,6 @@ msgstr "Nepodarilo sa pripojiť k serveru LDAP"
 msgid "Command:"
 msgstr "Firma"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Priečinky"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Zobraziť iba prihlásené priečinky"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Predefinovať mená priečinkov zo serveru"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Priestor mien"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10277,86 +10698,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "Služba IMAP pre %s na %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nie je možné spojenie s %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS nie je k dispozícii"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Spojenie zrušené"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Zlyhala dohoda SSL"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Nezadali ste heslo."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10367,25 +10745,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Priečinok %s neexistuje"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Meno priečinku \"%s\" nie je platné, pretože obsahuje znak \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10393,7 +10764,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznámy rodičovský priečinok: %s"
@@ -10499,58 +10870,58 @@ msgstr ""
 "Unix mbox. Je ho možné použiť aj pre čítanie stromu priečinkov Elm, Pine "
 "alebo Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Koreň ukladania %s nie je absolútna cesta"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Koreň ukladania %s nie je normálny priečinok"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Nie je možné získať priečinok: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokálne ukladanie nemá priečinok pre novú poštu"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokálny poštový súbor %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nie je možné premenovať priečinok %s na %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nie je možné premenovať \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nie je možné odstrániť súbor súhrnu priečinku `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nie je možné odstrániť indexový súbor priečinku`%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10616,7 +10987,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10953,7 +11324,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10962,8 +11333,8 @@ msgid "User cancelled"
 msgstr "Používateľ zrušený"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10972,48 +11343,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Chyba pri automatickom ukladaní správ: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Nie je možné zatvoriť dočasný priečinok: %s"
@@ -11138,7 +11509,7 @@ msgstr "Nie je možné získať skupinu: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Nie je možné poslať správu: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11191,8 +11562,8 @@ msgstr "Žiadna správa s uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Získavam POP správu %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Neznámy dôvod"
 
@@ -11644,7 +12015,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "príloha"
 
@@ -11688,6 +12059,101 @@ msgstr "Typ MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Navrhnúť automatické zobrazovanie príloh"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "_Vždy podpisovať správy pri použití tohto účtu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "_Vždy podpisovať správy pri použití tohto účtu"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Nie je možné otvoriť správu"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Nie je možné získať správu z editora"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Správa bez mena)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvoriť súbor"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automaticky generované"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Podpis:"
+
+#: 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.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 "Napísať správu"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
+
+#: 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 ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať komponent HTML editor.\n"
+"Overte, že máte nainštalovanú správnu verziu\n"
+"gtkhtml a libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
+"Nepodarilo sa aktivovať komponent HTML editor."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť.)"
+"<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Cieľ posielania"
@@ -11770,210 +12236,135 @@ msgstr "<kliknutím vyberiete priečinok>"
 msgid "Attach file(s)"
 msgstr "Priložiť súbor"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "_Vždy podpisovať správy pri použití tohto účtu"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Nie je možné otvoriť správu"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Nie je možné získať správu z editora"
-
-#: composer/e-msg-composer.c:1551
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "(Správa bez mena)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Otvoriť súbor"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automaticky generované"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Podpis:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Napísať správu"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Priloží súbor k správe"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
-"Nepodarilo sa aktivovať ovládací prvok pre výber adresy."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
-"Nepodarilo sa aktivovať komponent HTML editor.\n"
-"Overte, že máte nainštalovanú správnu verziu\n"
-"gtkhtml a libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Nepodarilo sa vytvoriť okno pre písanie správ:\n"
-"Nepodarilo sa aktivovať komponent HTML editor."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Editor správ obsahuje netextové telo správy, ktoré nie je možné upraviť.)"
-"<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Nasledujúca _neprečítaná správa"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Chcete uložiť zmeny?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nie je možné vytvoriť rúru: %s"
+msgid "Don't Recover"
+msgstr "Neimportovať"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
+msgid "Recover"
+msgstr "Odstrániť"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zahodiť zmeny"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Chcete uložiť zmeny?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Chyba pri ukladaní skratiek."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Neimportovať"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Varovanie: Zmenená správa"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Chyba pri ukladaní skratiek."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Naozaj chcete odstrániť túto schôdzku bez mena?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Odstrániť"
+msgid "Discard Changes"
+msgstr "_Zahodiť zmeny"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Uložiť správu ako..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nie je možné vytvoriť rúru: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Nasledujúca _neprečítaná správa"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Varovanie: Zmenená správa"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Priloží súbor k správe"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Predtým, ako začnete písať správu, musíte nastaviť účet."
 
@@ -12105,7 +12496,8 @@ msgstr ""
 "Súbor s týmto menom už existuje\n"
 "Prepísať ho?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Prepísať súbor?"
 
@@ -12282,81 +12674,97 @@ msgstr "Vyberte čas, s ktorým sa má porovnávať"
 msgid "_Filter Rules"
 msgstr "Pravidlá filtra"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Chyba v regulárnom výraze '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Aktualizácia stretnutia"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Musíte vybrať dátum."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "_Známe meno:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Musíte zadať meno súboru."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Odstraňujem priečinok %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Priradenie"
+msgid "Missing folder."
+msgstr "Odstraňujem priečinok %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Musíte zadať meno priečinku."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Nebol vybraný žiadny server"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Chyba v regulárnom výraze '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Musíte vybrať dátum."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Priradenie"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Musíte tento filter pomenovať."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Musíte tento vpriečinok pomenovať."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Musíte zadať meno súboru."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Musíte zadať meno priečinku."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nebol vybraný žiadny server"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12369,66 +12777,11 @@ msgstr "Vyberte súbor"
 msgid "<b>Then</b>"
 msgstr "<b>Termín:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Vybrať priečinok"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Dôležité"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Urobiť"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Neskôr"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Meno pravidla: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Bez mena"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Termín:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Spustiť akcie"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "ak odpovedajú všetky kritériá"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ak zodpovedá niektoré kritérium"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "prijatá"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "odoslaná"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12521,6 +12874,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Neskôr"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Meno pravidla: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Termín:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "ak odpovedajú všetky kritériá"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ak zodpovedá niektoré kritérium"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Spustiť akcie"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegované"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Adresáti"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Odpovedaná"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Vložiť:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "prijatá"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "odoslaná"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12651,7 +13075,7 @@ msgstr "nie je označený"
 msgid "Junk Test"
 msgstr "Jún"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Popis"
@@ -12691,7 +13115,7 @@ msgstr "Ukončí program"
 msgid "Play Sound"
 msgstr "Zahrať zvuk"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Prečítaná"
 
@@ -12761,9 +13185,9 @@ msgstr "začína na"
 msgid "Stop Processing"
 msgstr "Zastaviť spracovanie"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12826,102 +13250,62 @@ msgstr "Predmet neobsahuje"
 msgid "Virtual _Folders"
 msgstr "Virtuálne priečinky"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Pridať"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Zdroj vPriečinku"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Nastavenie editora správ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Nastavenie pošty vrátane zabezpečenia a zobrazovania správ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Nastavenie kontroly pravopisu, podpisov a editora správ"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Nastavenie emailových účtov"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Pošta Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Ovládací prvok pre nastavenie poštových účtov Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Poštový komponent Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Editor správ Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Zobrazenie poštového priečinku Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Ovládací prvok nastavenia pošty Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštové účty"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Nastavenie pošty"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "{Štandardný]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Meno účtu"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Bezmena"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Jazyky"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Pridať podpis"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Podpisy"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Predaná správa"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Vytvoriť _virtuálny priečinok z hľadania..."
 
@@ -12959,275 +13343,455 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Zadajte, kde vytvoriť priečinok"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Meno priečinku:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VPriečinky"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Doručená pošta"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Načítavam..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Presunúť"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Zrušiť úlohu"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Vybrať priečinok"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopírovať"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Premenovať priečinok \"%s\" na:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Premenovať priečinok"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Pohľad"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Otvoriť v novom okne"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Presunúť"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "Nový _priečinok..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Premenovať"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VPriečinky"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Doručená pošta"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Upraviť ako novú správu..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Tlačiť"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odpovedať _zoznamu"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odpovedať _všetkým"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Poslať ď_alej"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "_Odpoveď..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Označiť ako _Dokončený"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Vyčistiť _značku"
 
-#: mail/em-folder-view.c:787 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 "Označiť ako _prečítanú"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Označiť ako nedô_ležitú"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označiť ako _neprečítanú"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označiť ako _dôležitú"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Obnoviť _zmazané"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Pre_sunúť do priečinka..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopírovať do priečinku..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Pridať odosielateľa do _adresára"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "_Použiť filtre"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Pravidlá filtra"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Vytvoriť pra_vidlo zo správy"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Vpriečinok na _predmet"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Vpriečinok na _odosielateľa"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Vpriečinok na _adresátov"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VPriečinok na _konferenciu"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "Vpriečinok na _odosielateľa"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter na _predmet"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter na o_dosielateľovi"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter na _adresátoch"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter na _konferenciu"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filter na o_dosielateľovi"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Štandard"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Tlačiť správu"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopírovať umiestnenie odkazu"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknutím pridáte úlohu"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Od"
+
+#: 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 "Reply-To"
+
+#: 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 "Komu"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s príloha"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Nepodporovaná schéma"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Nepodarilo sa overiť listový podpis"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Nepodarilo sa overiť listový podpis"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Kliknutím pridáte úlohu"
+msgid "Retrieving `%s'"
+msgstr "Získavam správu %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Priradené"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Upraviť podpis"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Upraviť podpis"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Prerušené"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "Šifrovanie PGP"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Nesprávna časť externého tela."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Odkaz na FTP server (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Odkaz na lokálny súbor (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Odkaz na vzdialené dáta (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Presúvam správy"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Poštový klient"
+
+#. 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 ""
+
+#. 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
@@ -13235,282 +13799,126 @@ msgstr "Kliknutím pridáte úlohu"
 msgid "Matches: %d"
 msgstr "Odpovedá:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Priradené"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Upraviť podpis"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Upraviť podpis"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
 "cannot be verified."
 msgstr "input_token obsahuje neplatný podpis alebo podpis nie je možné overiť."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Prerušené"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "Šifrovanie PGP"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "ID _certifikátu:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikát ešte nie je platný"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Po termíne:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%B %d, %Y, %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Zobraziť v texte"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Skryť"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Stránka %d z %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Získavam správu %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Nesprávna časť externého tela."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Odkaz na FTP server (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Odkaz na lokálny súbor (%s) platný na serveri \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Odkaz na lokálny súbor (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Odkaz na vzdialené dáta (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Odkaz na neznáme externé dáta (typ \"%s\")"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Presúvam správy"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Reply-To"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Komu"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Poštový klient"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Dátum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s príloha"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nie je možné spracovať správu MIME. Zobrazujem ako zdrojový kód."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodporovaná schéma"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Nepodarilo sa overiť listový podpis"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Nepodarilo sa overiť listový podpis"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Každý rok"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Jeden deň"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Jeden _týždeň"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Jeden _mesiac"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13518,25 +13926,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Nepodarilo sa uložiť správu do vyrovnávacej pamäti %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Nepodarilo sa uložiť správu do vyrovnávacej pamäti %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Nepodarilo sa skopírovať deskriptor súboru: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Nepodarilo sa nájsť meno hostiteľa '%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Nepodarilo sa vytvoriť rúru do '%s': %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 #, fuzzy
@@ -13548,99 +13988,83 @@ msgstr "Uložiť _ako..."
 msgid "untitled_image.%s"
 msgstr "Správa bez mena"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "_Odpovedať odosielateľovi"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Otvoriť odkaz v prehliadači"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Poslať _správu zoznamu..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Pridať odosielateľa do adresára"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvoriť v %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Tento server nepodporuje informácie schém LDAPv3"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prihlásiť si"
 
-#: mail/em-subscribe-editor.c:637 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 "Priečinok"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Prosím, vyberte server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nebol vybraný žiadny server"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Túto správu už nezobrazovať."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtre"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Predaná správa"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, 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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Správa"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Uložiť správu ako..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Adresa"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Pošta od %s"
@@ -13658,11 +14082,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13775,131 +14199,140 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Poštové účty"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Poštové účty"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Spustiť akcie"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Štandardná priorita:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Upozornenie na novú poštu"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -13907,33 +14340,25 @@ msgid ""
 msgstr ""
 "_Pýtať sa pri posielaní HTML správ kontaktom, ktoré nechcú tento formát"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Pýtať sa pri posielaní správ s adresátmi iba v _Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13989,8 +14414,9 @@ msgid "Spell check inline"
 msgstr "Kontrola _pravopisu"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Štandardná priorita:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14133,33 +14559,63 @@ msgstr ""
 msgid "spamd port"
 msgstr "Import"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Import Elm pre Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Import Netscape Mail pre Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Nastavenie editora správ"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Import Outlook Express 4 pre Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Nastavenie pošty vrátane zabezpečenia a zobrazovania správ"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Import z Pine pre Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Nastavenie kontroly pravopisu, podpisov a editora správ"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Import formátu mbox pre Evolution"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Nastavenie emailových účtov"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Pošta Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Ovládací prvok pre nastavenie poštových účtov Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Poštový komponent Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Editor správ Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Ovládací prvok pre nastavenie editora správ Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Ovládací prvok nastavenia pošty Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštové účty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Nastavenie pošty"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14167,15 +14623,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prosím, čakajte"
 
@@ -14207,19 +14663,47 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importujem"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importujem súbory"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Import Elm pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Import Netscape Mail pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Import Outlook Express 4 pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Import z Pine pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Import formátu mbox pre Evolution"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Prehľadávam %s"
@@ -14229,7 +14713,7 @@ msgstr "Prehľadávam %s"
 msgid "Priority Filter \"%s\""
 msgstr "Filter priority \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14252,7 +14736,7 @@ msgstr ""
 "Zodpovedajúce importované filtre budú používať skóre.\n"
 "Overte naimportované filtre, že všetky funguje tak, ako má."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14263,7 +14747,7 @@ msgstr ""
 "\"Ignorovať vlákno\" a \"Sledovať vlákno\", ktorú\n"
 "Evolution nepodporuje. Tieto filtre budú zahodené."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14277,24 +14761,24 @@ msgstr ""
 "Tieto filtre boli upravené, aby testovali, či\n"
 "je reťazec je alebo nie je v tele správy."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution importuje vaše staré dáta Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Nastavenie"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Poštové filtre"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14328,128 +14812,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Editor účtov Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Hostiteľ:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Po_užívateľ:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Cesta:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta pre %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Predmet je %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s konferencia"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Odpovedaná"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Pridať pravidlo filtra"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d vybraných"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d neposlaných"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Koncepty"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d poslaných"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlaných"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "celkovo %d"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d neposlaných"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d vybraných"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nová správa"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Poslať správu"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Napísať novú správu"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nový vPriečinok"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Poštové filtre"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Vytvoriť nový priečinok"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, ktoré bude kalendár zobrazovať"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Kontrolujem službu"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Pripájam sa na server..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identita"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14458,12 +14953,12 @@ msgstr ""
 "Prosím, zadajte vaše meno a e-mailovú adresu. \"Nepovinné\" informácie\n"
 "nemusíte zadať, iba ak chcete, aby boli posielané vo vašich správach."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Prijem pošty"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14472,15 +14967,15 @@ msgstr ""
 "ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
 "poskytovateľa pripojenia na Internet."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Prosím, vyberte si z týchto možností"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Posielanie pošty"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14489,11 +14984,11 @@ msgstr ""
 "ktorý typ serveru použiť, kontaktujte vášho administrátora alebo "
 "poskytovateľa pripojenia na Internet."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Správa účtu"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14506,14 +15001,6 @@ msgstr ""
 "Prosím, zadajte meno pre tento účet. Toto meno bude používané iba pre "
 "zobrazenie."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Kontrolujem službu"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Pripájam sa na server..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14833,7 +15320,8 @@ msgid "Execute Command..."
 msgstr "Vykonať príkaz..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Pe_vná šírka:"
 
 #: mail/mail-config.glade.h:82
@@ -15160,351 +15648,456 @@ msgstr "farba"
 msgid "description"
 msgstr "popis"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+msgid "Invalid authentication"
+msgstr "Overenie"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Naozaj chcete odstrániť tento účet?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú\n"
+"dostávať takto formátovanú poštu:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
+msgid "_Send"
+msgstr "Poslať"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Naozaj chcete znovu poslať všetkých %d správ?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Nie je možné skopírovať priečinok: %s"
+msgid "Use default drafts folder?"
+msgstr "Otváram štandardný priečinok úloh"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Nie je možné získať priečinok: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
+"Chcete použiť štandardný priečinok na koncepty?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
+msgid "Use _Default"
+msgstr "Štandard"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Nie je možné vytvoriť priečinok\n"
-"%s\n"
-"Chyba: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Naozaj chcete otvoriť všetkých %d správ v samostatných oknách?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Nie je možné odstrániť priečinok:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
+msgid "_Expunge"
+msgstr "_Vyčistiť"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Priečinok `%s' neexistuje."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Trvalo odstrániť všetky zmazané správy zo všetkých priečinkov"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Nie je možné presunúť priečinok: %s"
+msgid "_Empty Trash"
+msgstr "Vyprázdniť _Odpadky"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Máte neodoslané správy. Chcete skončiť aj tak?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
+msgid "Error while {0}."
+msgstr ""
+"Chyba počas '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Nie je možné otvoriť správu"
+msgid "Error while performing operation."
+msgstr ""
+"Chyba pri vykonávaní operácie:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
+msgid "Enter password."
+msgstr "Zadajte heslo"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Chyba pri načítavaní informácie o filtroch:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nie je možné vytvoriť priečinok %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Nie je možné uložiť do %s\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Pridať podpis"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Nie je možné vytvoriť priečinok\n"
+"%s\n"
+"Chyba: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Odstrániť \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Odstrániť vybrané kontakty"
+msgid "Cannot create temporary save directory."
+msgstr "Nie je možné vytvoriť dočasný priečinok: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Zahodiť zmeny"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Chcete uložiť zmeny?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Neodstraňovať"
+msgid "File exists but cannot overwrite it."
+msgstr "Súbor existuje, prepísať ho?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Zadajte heslo"
+msgid "File exists but is not a regular file."
+msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Chyba pri načítavaní informácie o filtroch:\n"
+"Nie je možné odstrániť priečinok:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Chyba pri vykonávaní operácie:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Nie je možné odstrániť priečinok: %s: Priečinok neexistuje"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Chyba počas '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Súbor existuje, prepísať ho?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Nie je možné premenovať priečinok: %s: Priečinok neexistuje"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Súbor \"%s\" neexistuje alebo nie je normálny súbor."
+msgid "Delete \"{0}\"?"
+msgstr "Odstrániť \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Naozaj odstrániť priečinok \"%s\"?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "Priečinok \"%s\" už existuje. Prosím, zadajte iné meno."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Overenie"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Nie je možné presunúť priečinok: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Nie je možné otvoriť zdieľaný priečinok: %s."
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Nie je možné otvoriť správu"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Nie je možné skopírovať priečinok: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Posielate správu formátovanú ako HTML, ale nasledujúci adresáti nechcú\n"
-"dostávať takto formátovanú poštu:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Nie je možné získať priečinok: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Naozaj odstrániť priečinok \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Nie je možné otvoriť zdieľaný priečinok: %s."
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Nevyplnili ste všetky povinné informácie."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Odstrániť vybrané kontakty"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Naozaj chcete odstrániť tento účet?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Tieto vpriečinky:\n"
-"%spoužívali odstránený priečinok:\n"
-"    '%s'\n"
-"A boli aktualizované."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Neodstraňovať"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Tieto vpriečinky:\n"
-"%spoužívali odstránený priečinok:\n"
-"    '%s'\n"
-"A boli aktualizované."
+msgid "Could not save signature file."
+msgstr "Nepodarilo sa uložiť súbor podpisu: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Pridať podpis"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Zahodiť zmeny"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "Požadovaný spôsob overenia %s nie je podporovaný SMTP serverom %s."
+msgid "Do you wish to save your changes?"
+msgstr "Chcete uložiť zmeny?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15512,85 +16105,97 @@ msgstr ""
 "\n"
 "Chcete uložiť zmeny?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Nei je možné otvoriť priečinok na koncepty pre tento účet.\n"
-"Chcete použiť štandardný priečinok na koncepty?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Štandard"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Zahodiť zmeny"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Otváram štandardný priečinok úloh"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Nevyplnili ste všetky povinné informácie."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Máte neodoslané správy. Chcete skončiť aj tak?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Nemôžete vytvoriť dva účty s rovnakým menom."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Priečinok `%s' neexistuje."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Zahodiť zmeny"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Vyprázdniť _Odpadky"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Tieto vpriečinky:\n"
+"%spoužívali odstránený priečinok:\n"
+"    '%s'\n"
+"A boli aktualizované."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Vyčistiť"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Poslať"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Tieto vpriečinky:\n"
+"%spoužívali odstránený priečinok:\n"
+"    '%s'\n"
+"A boli aktualizované."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Prepísať"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Prehľadávam %s"
@@ -15599,20 +16204,20 @@ msgstr "Prehľadávam %s"
 msgid "Working"
 msgstr "Pracujem"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrujem priečinok"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Prijímam poštu"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Nepodarilo sa použiť filtre pre odosielanú poštu : %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15621,115 +16226,115 @@ msgstr ""
 "Nepodarilo sa pridať do %s: %s\n"
 "Namiesto toho sa pridá do priečinka `Odoslané'."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Posielam správu %d z %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nepodarilo sa dekódovať správu."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Dokončené."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Ukladám správu do priečinku"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Presúvam správy do %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopírujem správy do %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Prechádzam priečinky v \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Správy predané ďalej"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Otváram sklad %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstraňujem priečinok %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Ukladám priečinok '%s'"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Aktualizujem priečinok"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Čistím priečinok"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Vyprázdňujem kôš v '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokálne priečinky"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Získavam správu %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15738,7 +16343,7 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15747,11 +16352,11 @@ msgstr ""
 "Chyba pri ukladaní správ do `%s':\n"
 "%s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Ukladám prílohu"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15760,17 +16365,17 @@ msgstr ""
 "Nepodarilo sa vytvoriť výstupný súbor: %s\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nie je možné zapísať dáta: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odpojujem sa od %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znovu sa pripojujem na %s"
@@ -15835,24 +16440,24 @@ msgstr "Obnovujem..."
 msgid "Waiting..."
 msgstr "Čakám..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Používateľ zrušil operáciu."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Zadajte vaše heslo pre %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Zadajte heslo"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Uložiť toto heslo"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamätať si heslo pre zvyšok tohto sedenia"
 
@@ -15894,89 +16499,94 @@ msgstr "Predaná správa"
 msgid "Invalid folder: `%s'"
 msgstr "Otváram priečinok %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavujem vpriečinok: '%s'"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Aktualizujem vpriečinky pre uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Aktualizujem vpriečinky pre uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vPriečinky"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Upraviť vpriečinok"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nový vPriečinok"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nevidené"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Videné"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Odpovedané"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Viacero neprečítaných správ"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Viacero správ"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Najnižšia"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Nižšia"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Vyššia"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Najvyššia"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Dnes %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Včera %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Generujem zoznam správ"
 
@@ -16008,43 +16618,43 @@ msgstr "Prijaté"
 msgid "Size"
 msgstr "Veľkosť"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Volať"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Nepreposielať"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Follow Up"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Pre vašu informáciu"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Poslať ďalej"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Odpoveď nie je nutná"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odpovedať"
 
-#: mail/message-tag-followup.c:70 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 "Odpovedať všetkým"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Revízia"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Značka pre Follow Up"
 
@@ -16089,20 +16699,6 @@ msgstr "_Prihlásiť si"
 msgid "_Unsubscribe"
 msgstr "O_dhlásiť"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Shell Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Testovací komponent Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16110,111 +16706,55 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Premenuje túto skupinu skratiek"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Prepne, či sa má zobrazovať panel priečinkov"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Skryť panel skratiek"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Štandardná priorita:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Štandardná priorita:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Rozhranie pre nastavenie pošty Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Označiť prílohu, že má byť zobrazená štandardne v texte."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Otváram štandardný priečinok úloh"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Otváram štandardný priečinok úloh"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Otváram štandardný priečinok úloh"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Otváram štandardný priečinok úloh"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Prepne, či sa má zobrazovať panel priečinkov"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Prepne, či sa má zobrazovať panel skratiek"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-mail"
@@ -16223,6 +16763,32 @@ msgstr "E-mail"
 msgid "Brought to you by"
 msgstr "Pre vás vytvoril"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Neznáma chyba"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Neplatné argumenty"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Nie je možné zaregistrovať u OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Konfiguračná databáza nenájdená"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Všeobecná chyba"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bez mena)"
@@ -16367,11 +16933,11 @@ msgstr "Nepodarilo sa spustiť gpg."
 msgid "_Import"
 msgstr "Import"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Zatváram spojenia..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Nastavenie Evolution"
 
@@ -16413,11 +16979,35 @@ msgstr "Meno priečinku nesmie obsahovať znak \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "'.' a '..' sú rezervované mená priečinkov."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta pre %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Chyba pri vykonávaní %s."
@@ -16431,14 +17021,15 @@ msgid "Bug buddy could not be run."
 msgstr "Nedá sa spustiť nástroj pre oznamovanie chýb"
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "O Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Pracovať _on-line"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Pracovať off-line"
 
@@ -16446,48 +17037,6 @@ msgstr "_Pracovať off-line"
 msgid "Work Offline"
 msgstr "Pracovať off-line"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution prechádza do módu off-line."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Neplatné argumenty"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Nie je možné zaregistrovať u OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfiguračná databáza nenájdená"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Všeobecná chyba"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Zaškrtávacie tlačidlo"
@@ -16561,6 +17110,43 @@ msgstr "Aktívne spojenia"
 msgid "Click OK to close these connections and go offline"
 msgstr "Stlačením OK tieto spojenia zatvoríte a prejdete do módu off-line"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "Kalen_dár:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Kontakty: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Pošta:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "Ú_lohy:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Typ priečinku:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Otvoriť priečinok iného používateľa"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "Úče_t:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Meno priečinku:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Používateľ:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Asistent pre nastavenie"
@@ -16603,6 +17189,20 @@ msgstr ""
 "\n"
 "Stlačením \"Použiť\" uložíte tieto nastavenia."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Shell Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Testovací komponent Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite na \"Import\" pre spustenie importu súboru do Evolution."
@@ -16667,13 +17267,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution našiel tieto súbory dát pre import:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16702,57 +17302,48 @@ msgstr ""
 "Dúfame, že si užijete výsledky našej tvrdej práce a\n"
 "uvítame vaše príspevky.\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Ďakujeme\n"
 "Tím Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Túto správu už nezobrazovať"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Nie je možné inicializovať shell Ximian Evolution."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Spustiť v režime off-line"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Spustiť v režime on-line"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Vynútiť ukončenie všetkých komponentov Evolution"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Poslať ladiaci výstup zo všetkých komponent od súboru."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16761,14 +17352,80 @@ msgstr ""
 "%s: --online a --offline nie je možné použiť naraz.\n"
 "  Použite %s --help pre zobrazenie dalších informácií.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Nie je možné inicializovať shell Ximian Evolution."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Sprievodca účtom Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikátu:"
@@ -17021,12 +17678,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID _certifikátu:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID karty už existuje"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17246,6 +17897,12 @@ msgstr "Predmet je %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID karty už existuje"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17287,12 +17944,12 @@ msgstr "Štandardný predmet pre správu."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nie je možné spustiť '%s': %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Vypínam %s (%s)\n"
@@ -17356,7 +18013,8 @@ msgid "Select all contacts"
 msgstr "Vybrať všetky kontakty"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Pošle správu vybraným kontaktom."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17388,8 +18046,8 @@ msgstr "Zobraziť aktuálny kontakt"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "A_kcie"
@@ -17407,7 +18065,8 @@ msgid "_Preview Pane"
 msgstr "_Náhľad"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Uložiť ako vKartu"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17538,11 +18197,21 @@ msgstr "Zobraziť aktuálny kontakt"
 msgid "Week"
 msgstr "Týždeň"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Pracovný týždeň"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "S_chôdzka"
 
+#: 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 "_Zavrieť"
+
 #: 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
@@ -17863,6 +18532,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Zavrieť"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18109,7 +18788,8 @@ msgid "Open the selected message in a new window"
 msgstr "Otvorí aktuálnu správu v novom okne"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Otvorí vybranú správu v composeri pre nové poslanie"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18226,58 +18906,46 @@ msgstr "Vpriečinok na _predmet..."
 msgid "_Attached"
 msgstr "_Priložené"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopírovať do priečinku"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Vytvoriť _filter zo správy"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Prejsť na"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_V texte"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Väčšie"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Zobrazenie _správy"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Presunúť do priečinku"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Nasledujúca správa"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normálne zobrazenie"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Otvoriť správu"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Predchádzajúca správa"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citované"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Poslať _znovu..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Nástroje"
@@ -18286,16 +18954,6 @@ msgstr "_Nástroje"
 msgid "_Undelete"
 msgstr "Obnoviť _zmazané"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Zavrieť"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priložiť"
@@ -18693,6 +19351,11 @@ msgstr "Nastavenie pošty"
 msgid "_Send / Receive"
 msgstr "_Poslať / Prijať"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Nájsť teraz"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Podľa _firmy"
@@ -18766,10 +19429,6 @@ msgstr "_Termín:"
 msgid "With _Status"
 msgstr "Nastaviť stav"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "Ú_lohy"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18928,6 +19587,34 @@ msgstr "Iné..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Chyba Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Pošta Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informácie o stretnutí"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Súhrn Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Odoslané a koncepty"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19047,6 +19734,35 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Nájsť"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 už existuje.\n"
+"Chcete ho prepísať?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Nie je možné uložiť do %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Nie je možné uložiť do %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19057,9 +19773,132 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hotových)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Prehliadač priečinku adresára Evolution"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Adresár"
+#~ msgid "Address 2:"
+#~ msgstr "Adresa _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Boloňa"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Prehliadač kalendára Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Prehliadač úloh Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nie je možné inicializovať gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nie je možné otvoriť priečinok v '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, ktoré bude kalendár zobrazovať"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Typ pohľadu, ktorý sa má zobraziť"
+
+#~ msgid "Display a message"
+#~ msgstr "Zobraziť správu"
+
+#~ msgid "Alerts"
+#~ msgstr "Alarmy"
+
+#~ msgid "Time"
+#~ msgstr "Čas"
+
+#~ msgid "_General"
+#~ msgstr "_Všeobecné"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Vyberte nástroj pre import"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalendár"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Zoznam úloh"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Súbor kalendára nie je aktualizovať!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI, ktoré bude zobrazovať priečinok úloh"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nepodarilo sa načítať úlohy v `%s'"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Zobrazenie poštového priečinku Evolution"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "Vpriečinok na _odosielateľa"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter na o_dosielateľovi"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Nepodarilo sa uložiť správu do vyrovnávacej pamäti %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Nepodarilo sa uložiť správu do vyrovnávacej pamäti %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Nepodarilo sa nájsť meno hostiteľa '%s': %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, ktoré bude kalendár zobrazovať"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Premenuje túto skupinu skratiek"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Skryť panel skratiek"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Otváram štandardný priečinok úloh"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Otváram štandardný priečinok úloh"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Otváram štandardný priečinok úloh"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Otváram štandardný priečinok úloh"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Prepne, či sa má zobrazovať panel priečinkov"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Prepne, či sa má zobrazovať panel skratiek"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Nie je možné inicializovať shell Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Poslať _znovu..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19230,9 +20069,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "S_pouse:"
 #~ msgstr "Ma_nžel(ka):"
 
-#~ msgid "_Add"
-#~ msgstr "_Pridať"
-
 #~ msgid "_Business:"
 #~ msgstr "_Zamestnanie:"
 
@@ -19346,18 +20182,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Koncový dátum je pred dátumom začiatku."
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "_Počiatočný dátum:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "_Termín:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Priorita:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19389,13 +20213,6 @@ msgstr "%s (%d%% hotových)"
 #~ " %s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nepodarilo sa skopírovať deskriptor súboru: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19539,10 +20356,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr "Ukážka kalendára pred tlačou"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Zadajte vaše heslo pre %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Zoznam úloh"
 
@@ -19601,30 +20414,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Nepodarilo sa nájsť zadaný zdieľaný priečinok."
 
-#~ msgid "C_alendar:"
-#~ msgstr "Kalen_dár:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Pošta:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "Ú_lohy:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Typ priečinku:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Otvoriť priečinok iného používateľa"
-
-#~ msgid "_Account:"
-#~ msgstr "Úče_t:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Meno priečinku:"
-
-#~ msgid "_User:"
-#~ msgstr "_Používateľ:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Vytvorí novú požiadavku na stretnutie"
@@ -19936,9 +20725,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Ukončiť sprievodcu"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Tieto spojenia sú momentálne aktívne:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Hľadať kontakty"
 
@@ -20173,9 +20959,6 @@ msgstr "%s (%d%% hotových)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "Táto správa je digitálne podpísaná ale podpis nie je platný."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Chyba Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20305,18 +21088,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgstr "Informácie o kalendári"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Pripomenutia"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Začína:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Informácie o kalendári"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klasifikácia"
 
@@ -21374,9 +22145,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Tu nastavte vzhľad súhrnu Evolution"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Súhrn Evolution"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Komponent súhrnu Evolution"
 
@@ -21779,9 +22547,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Asia"
 #~ msgstr "Ázia"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22832,9 +23597,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22898,9 +23660,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25883,9 +26642,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28688,9 +29444,6 @@ msgstr "%s (%d%% hotových)"
 #~ msgid "Shown"
 #~ msgstr "Zobrazený"
 
-#~ msgid "No tasks"
-#~ msgstr "Žiadne úlohy"
-
 #~ msgid "blue"
 #~ msgstr "modrá"
 
diff --git a/po/sl.po b/po/sl.po
index 02e27a876e..85fef77544 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -5,7 +5,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -20,6 +20,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolucijin adresarjev veznik"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Stiki: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Okno Evolucije"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -45,16 +55,6 @@ msgstr "ni vizitk"
 msgid " card"
 msgstr "1 vizitka"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Stiki: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Okno Evolucije"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Privzet usklajevalni naslov:"
@@ -70,74 +70,21 @@ msgstr "Nisem mogel naložiti %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisem mogel prebrati Pilotovega adresarja"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Krajevne mape"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "ID _certifikata:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Nastavi mapo..."
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Stiki"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolucijin adresarjev veznik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolucijin veznik Koledarja"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr ""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
 #, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Nastavitev Evolucijine pošte"
+msgid "Failed to authenticate.\n"
+msgstr "Nisem mogel preveriti certifikatov."
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, fuzzy, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "Vpišite geslo za %s (uporabnik %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -182,12 +129,16 @@ msgstr "Skupina _stikov"
 msgid "Create a new contacts group"
 msgstr "Ustvari novo skupino bližnjic"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 #, fuzzy
 msgid "Failed to authenticate with LDAP server"
 msgstr ""
@@ -195,39 +146,39 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: 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:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr ""
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Čakam..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Ustvarjam \"%s\""
@@ -235,8 +186,8 @@ msgstr "Ustvarjam \"%s\""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -244,7 +195,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 #, fuzzy
 msgid "Personal"
@@ -295,21 +246,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
+#: addressbook/gui/component/addressbook-view.c:761
 #, fuzzy
-msgid "Failed to authenticate.\n"
-msgstr "Nisem mogel preveriti certifikatov."
+msgid "New Address Book"
+msgstr "Adresar"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, fuzzy, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "Vpišite geslo za %s (uporabnik %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -329,6 +301,69 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Krajevne mape"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Stiki"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "ID _certifikata:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Nastavi mapo..."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolucijin adresarjev veznik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: 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
 #, fuzzy
 msgid "  S_how Supported Bases "
@@ -351,6 +386,7 @@ msgstr "_Preveri za podprte vrste  "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 ""
@@ -424,7 +460,7 @@ msgstr "Skupina _stikov"
 msgid "Address Book Properties"
 msgstr "Viri adresarja"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Vedno"
@@ -440,122 +476,112 @@ msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Zapri"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 #, fuzzy
 msgid "Connecting"
 msgstr "Connecticut"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 #, fuzzy
 msgid "Distinguished _name:"
 msgstr "_Razločno ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Razločno ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: addressbook/gui/component/ldap-config.glade.h:28
 #, 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Shranjena iskanja"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikoli"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Ena"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Izberi barvo"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 #, fuzzy
 msgid "S_earch scope: "
 msgstr "_Doseg iskanja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Doseg iskanja:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Iskanje"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -566,7 +592,7 @@ msgid ""
 "secure."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -575,20 +601,20 @@ msgid ""
 "exploits. "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 #, fuzzy
 msgid "Supported Search Bases"
 msgstr "Shranjena iskanja"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -596,7 +622,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -606,13 +632,13 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -622,7 +648,7 @@ 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:63
+#: 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 "
@@ -632,7 +658,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 #, fuzzy
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
@@ -642,7 +668,7 @@ msgstr ""
 "To ime bo uporabljeno za identifikacijo vašega računa. Uporablja se le za "
 "prikaz."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -650,139 +676,146 @@ msgid ""
 "what port you should specify."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Oblika izpisa časa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 #, fuzzy
 msgid "Using distinguished name (DN)"
 msgstr "Razločno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 #, fuzzy
 msgid "Using email address"
 msgstr "E-poštni naslov"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kadar je možno"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "Skupina _stikov"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 #, fuzzy
 msgid "_Download limit:"
 msgstr "_Omejitev prenosov"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "_E-poštni naslov:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 #, fuzzy
 msgid "_Port number:"
 msgstr "Številka vrat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Vrata:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 #, fuzzy
 msgid "_Search base:"
 msgstr "Iskanje v _zbirki:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Ime _strežnika:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Strežniki"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 #, fuzzy
 msgid "_Timeout (minutes):"
 msgstr "Čas podaljška spanja (minut)"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Uporabi _varno povezavo (SSL)"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 #, fuzzy
 msgid "cards"
 msgstr "ni vizitk"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: 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:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "general-tab"
 msgstr "Splošno"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "searching-tab"
 msgstr "Iskanje"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Odstrani vse"
+msgid "Select Contacts from Address Book"
+msgstr "Izberi stike iz adresarja"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Odstrani"
 
+#: 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 "Ime"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Odstrani vse"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -807,23 +840,16 @@ msgstr "Dodaj k stikom"
 msgid "Unnamed Contact"
 msgstr "Neimenovan stik"
 
-#: 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
-msgid "Name"
-msgstr "Ime"
-
 #: 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
 msgid "Source"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Izberi stike iz adresarja"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolucijin vmesnik za izibro imen iz adresarja."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -896,59 +922,50 @@ msgid "<b>Work</b>"
 msgstr "Delavni teden"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Naslov _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Naslov:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Ob_letnica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Pomočnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Rojstni dan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Koledar"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Podjetje"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -956,84 +973,94 @@ msgstr "Podjetje"
 msgid "Contact"
 msgstr "Stiki"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Urejevalnik stikov"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Držav_a:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "O_ddelek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL zasedenosti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Polno ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Doma"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-poštni naslov:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravljalec"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Vzdevek:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Opom_be:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Drugo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Poštni predal:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1061,9 +1088,9 @@ msgstr "Stran"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 #, fuzzy
 msgid "Work"
@@ -1099,24 +1126,41 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+#, fuzzy
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ste prepričani, \n"
+"da želite zbrisati ta stik?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Ste prepričani, \n"
+"da želite zbrisati ta stik?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 #, 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 #, fuzzy
 msgid "Editable"
 msgstr "Vključi"
@@ -2096,102 +2140,120 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Na_tisni sporočilo"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Neimenovan seznam stikov"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Dodaj storitev"
-
-#: 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 "_Lega:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Uporabniško ime:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Idaho"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Skupina"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Izvorna koda"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Nov stik"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 #, fuzzy
 msgid "Writable Fields"
 msgstr "Virtualne mape"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 #, fuzzy
 msgid "Changed"
 msgstr "Čad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Stik pripada sledečim kategorijam:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Sledeče povezave so trenutno aktivne:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "Na_tisni sporočilo"
+
+#: 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 "Dodaj storitev"
+
+#: 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 "_Lega:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Uporabniško ime:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Hitro dodaj stik"
@@ -2214,23 +2276,6 @@ msgstr ""
 "\n"
 "E-naslov:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-#, fuzzy
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ste prepričani, \n"
-"da želite zbrisati ta stik?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ste prepričani, \n"
-"da želite zbrisati ta stik?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Naslov _2:"
@@ -2384,8 +2429,8 @@ msgstr "Urejevalnik stikov"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr ""
 
@@ -2447,6 +2492,454 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredno iskanje"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Člani"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizacija"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Poklic"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Skupina"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Telefon v avtu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Delam"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Prenosni telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Priština"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Opomba"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Službeni _naziv:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Domači faks"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Uspeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+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
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Nimate dovoljenja"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, 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
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokol ni podprt"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "preklicano"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Nisem mogel preimenovati mape: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+#, fuzzy
+msgid "Authentication Failed"
+msgstr "Avtentifikacija ni uspela."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+#, fuzzy
+msgid "Authentication Required"
+msgstr "Potrebna je avtentifikacija"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr ""
+
+#. E_BOOK_ERROR_CORBA_EXCEPTION
+#. E_BOOK_ERROR_NO_SUCH_SOURCE
+#: addressbook/gui/widgets/eab-gui-util.c:68
+#, fuzzy
+msgid "No such source"
+msgstr "Ni takšnega sporočila"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Drugačna napaka"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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:168
+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:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Napaka ob dodajanju vizitke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Napaka ob spreminjanju seznama"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Napaka ob spreminjanju vizitke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Napaka ob odstranjevanju vizitke"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s že obstaja\n"
+"Jo želite prepisati?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+#, 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
+msgid "card.vcf"
+msgstr "vizitka.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "seznam"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Prestavi vizitko v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopiraj vizitko v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Prestavi vizitke v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopiraj vizitke v"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Izberi stike iz adresarja"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Več vVizitk"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VVizitka za %s"
+
+#.
+#. * 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 "(brez)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "prvi e-naslov"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-naslov 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-naslov 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Izberi dejanje"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Ustvari nov stik \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Poizvedujem v adresarju..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Uredi podatke stika"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Zlij E-poštne naslove"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "in ena druga vizitka."
+msgstr[1] "in ena druga vizitka."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Kaži celotne _glave"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Shrani stik kot vVizitko"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Shranite v adresarju"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2462,8 +2955,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 #, fuzzy
 msgid "Query"
 msgstr "Vsak"
@@ -2521,9 +3014,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Shrani kot vVizitko"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2597,7 +3091,7 @@ msgid "Cut"
 msgstr "Izreži"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2608,18 +3102,8 @@ msgstr "Kopiraj"
 msgid "Paste"
 msgstr "Prilepi"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Zbriši"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 #, fuzzy
 msgid "Current View"
 msgstr "_Trenutni pogled"
@@ -2633,7 +3117,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "katerakoli kategorija"
@@ -2674,21 +3158,6 @@ msgstr "kategorije"
 msgid "Company Phone"
 msgstr "Telefon podjetja"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-naslov 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-naslov 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Družinsko ime"
@@ -2728,29 +3197,14 @@ msgstr "Jordanija"
 msgid "Manager"
 msgstr "Upravljalec"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Prenosni telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Vzdevek"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Opomba"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Pisarna"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizacija"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -2804,23 +3258,33 @@ msgstr "Enote: "
 msgid "Web Site"
 msgstr "Spletna stran"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 #, fuzzy
 msgid "Width"
 msgstr "Širina:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 #, fuzzy
 msgid "Height"
 msgstr "Višina:"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+#, fuzzy
+msgid "Selected"
+msgstr "Zbrisano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+#, fuzzy
+msgid "Has Cursor"
+msgstr "Sortiranje opravil"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 #, fuzzy
 msgid "Field"
@@ -2840,11 +3304,6 @@ msgstr "_Velikost besedila"
 msgid "Max field name length"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-#, fuzzy
-msgid "Column Width"
-msgstr "Kolumbija"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2874,430 +3333,10 @@ msgstr ""
 msgid "Adapter"
 msgstr "po"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-#, fuzzy
-msgid "Selected"
-msgstr "Zbrisano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-#, fuzzy
-msgid "Has Cursor"
-msgstr "Sortiranje opravil"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Člani"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Poklic"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Skupina"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Telefon v avtu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Delam"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Priština"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Službeni _naziv:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Domači faks"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Uspeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Skladišče, ki ni na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Nimate dovoljenja"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Vizitka ni bila najdena"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "ID vizitke že obstaja"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol ni podprt"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "preklicano"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Nisem mogel preimenovati mape: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-#, fuzzy
-msgid "Authentication Failed"
-msgstr "Avtentifikacija ni uspela."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-#, fuzzy
-msgid "Authentication Required"
-msgstr "Potrebna je avtentifikacija"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr ""
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Ni takšnega sporočila"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Drugačna napaka"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Kliknite tu za odprtje adresarja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Želite shraniti spremembe"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-#, fuzzy
-msgid "_Discard"
-msgstr "_Prikaz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Napaka ob dodajanju seznama"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Napaka ob dodajanju vizitke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Napaka ob spreminjanju seznama"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Napaka ob spreminjanju vizitke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Napaka ob odstranjevanju seznama"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Napaka ob odstranjevanju vizitke"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s že obstaja\n"
-"Jo želite prepisati?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-#, fuzzy
-msgid "Overwrite"
-msgstr "Prepiši datoteko?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "vizitka.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "seznam"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Prestavi vizitko v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopiraj vizitko v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Prestavi vizitke v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopiraj vizitke v"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Izberi stike iz adresarja"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Več vVizitk"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VVizitka za %s"
-
-#.
-#. * 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 "(brez)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "prvi e-naslov"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Izberi dejanje"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Ustvari nov stik \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj naslov k obstoječemu stiku \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Poizvedujem v adresarju..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Uredi podatke stika"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Zlij E-poštne naslove"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "in ena druga vizitka."
-msgstr[1] "in ena druga vizitka."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Kaži celotne _glave"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
 #, fuzzy
-msgid "Show Compact VCard"
-msgstr "Shrani stik kot vVizitko"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Shranite v adresarju"
+msgid "Column Width"
+msgstr "Kolumbija"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3346,11 +3385,6 @@ msgstr "Evolucijin setavljalnik pošte."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Natisni kuverto"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3362,6 +3396,11 @@ msgstr "Na_tisni stike..."
 msgid "Print contact"
 msgstr "Na_tisni stike..."
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Natisni kuverto"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pik Tahoma"
@@ -3548,18 +3587,6 @@ msgstr "Seznam _stikov"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Ne morem dobiti sporočila"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Vizitka ni bila najdena"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3618,6 +3645,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Ne morem dobiti sporočila"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Vizitka ni bila najdena"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Napaka ob nalaganju privzetega adresarja."
@@ -3630,12 +3669,13 @@ msgstr "Vhodna datoteka"
 msgid "No filename provided."
 msgstr "Ime datoteke ni navedeno."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 #, fuzzy
 msgid "Unnamed List"
 msgstr "Neimenovan seznam stikov"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Vpišite geslo"
@@ -3668,128 +3708,55 @@ msgstr "Privzeta prioriteta:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisem mogel prebrati Pilotovega seznama opravil"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-#, fuzzy
-msgid "Calendar and Tasks"
-msgstr "Nastavitve koledarja in nalog"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Koledar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucijin veznik koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolucijin pregledovalnik iTip/iMip"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Urejevalnik Evolucijinih novic"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolucijin veznik Koledarja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolucijin veznik opravil"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Naloge"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Tovarna za storitev opozorlinega alarma"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pričetek ob:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Konec ob:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarm Evolucije"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarmi ob %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Zapri"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Podal_jšek spanja"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Čas podaljška spanja (minut)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Uredi sestanek"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Podaljšek spanja"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Odpri"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Opis ni na voljo."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3798,12 +3765,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Opozorilo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3815,7 +3782,7 @@ msgstr ""
 "bilo nastavljeno, da pošlje e-pošto. Evolucija bo\n"
 "prikazala običajen opozorilni dialog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3832,19 +3799,20 @@ msgstr ""
 "\n"
 "Ste prepričani, da želite pognati ta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "O tem programu me ne sprašuj več."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Tovarna za storitev opozorlinega alarma"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nisem mogel inicializirati Bonoba"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nisem mogel inicializirati gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisem mogel ustvariti tovarne opozorilnega alrama"
 
@@ -3958,61 +3926,46 @@ 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 "_Vprašaj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Vprašaj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Zbriši izbrana opravila"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Povzetek vsebuje"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentar vsebuje"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Opis vsebuje"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Brez zadetka"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Koledar"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4024,126 +3977,137 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "je manjše"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dni"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Lastnosti..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Nalagam koledar..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Koledar"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Sestanek"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Ustvari nov zahtevek za sestanek"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nov sestanek"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 #, fuzzy
 msgid "All _Day Appointment"
 msgstr "_Sestanek"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Ustvari nov sestanek"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Nova Kaledonija"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Koledar"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Ustvari nov koledar"
 
@@ -4173,16 +4137,37 @@ msgstr "Tedenski pogled"
 msgid "Month View"
 msgstr "Mesečni pogled"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Povzetek vsebuje"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Opis vsebuje"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentar vsebuje"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Opis vsebuje"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Brez zadetka"
+
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "Napaka ob komuniciranju s strežnikom koledarja"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "Nimate dovoljenja"
@@ -4192,20 +4177,6 @@ msgstr "Nimate dovoljenja"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nisem mogel odpreti imenika v '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, ki naj ga prikaže brskalnik map"
-
-#: calendar/gui/control-factory.c:201
-#, fuzzy
-msgid "The type of view to show"
-msgstr "Spremeni pogled na %s"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Možnosti zvočnega alarma"
@@ -4277,7 +4248,7 @@ msgstr "dodatnih ponovitev vsakih"
 msgid "hours"
 msgstr "ur"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4296,14 +4267,14 @@ msgstr "Osnove"
 msgid "Date/Time:"
 msgstr "Datum/ura:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Kaži sporočilo"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Predvajaj zvok"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4319,6 +4290,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
 msgid "Summary:"
 msgstr "Povzetek:"
@@ -4357,10 +4329,110 @@ msgstr "minut"
 msgid "start of appointment"
 msgstr "pričetek sestanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Navedite ime datoteke:"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Dodaj _koledarju"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Seznam _nalog"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj _koledarju"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Vrsta:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "tedenov"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Vključeno"
 
@@ -4376,19 +4448,19 @@ msgstr "Ne odstrani"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Izključi"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Vključi"
 
@@ -4414,168 +4486,179 @@ msgstr "60 minut"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
 #, fuzzy
-msgid "Alerts"
-msgstr "Alberta"
+msgid "<b>Alerts</b>"
+msgstr "Stanje:"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Opomnilniki"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Podatki o kodledarju"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "končano "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Delavni teden"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Nastavitve koledarja in nalog"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Barva za opravila, katerim je rok že pretekel"
 
-#: 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 "Barva za opravila, ki so na vrsti danes"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 #, fuzzy
 msgid "Day _ends:"
 msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+msgid "Display"
+msgstr "Prikaz"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Vključi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "petek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Ur"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "ponedeljek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 #, fuzzy
 msgid "S_un"
 msgstr "_ned"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "sobota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Kaži številke tednov v navigatorju po dnevih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "nedeljo"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 #, fuzzy
 msgid "T_asks due today:"
 msgstr "Nalo_ge z današnjim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "č_et"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Seznam _nalog"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "četrtek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Čas"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Časovni _pas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Oblika izpisa časa:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "torek"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Delavni teden"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 urna (dop./pop.)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 urna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Dodaj"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Vprašaj za potrditev ob brisanju predmetov"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Skrči vikende v mesečnem pogledu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 #, fuzzy
 msgid "_Day begins:"
 msgstr "Konec dneva:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Prikaz"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4585,151 +4668,51 @@ msgstr "_Prikaz"
 msgid "_Edit"
 msgstr "_Uredi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Zahtevek po podatkih o zasedenosti"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Splošno"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Skrij opravljene naloge po"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "po_n"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 #, fuzzy
 msgid "_Overdue tasks:"
 msgstr "Naloge s p_rekoračenim rokom"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "so_b"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 #, fuzzy
 msgid "_Show appointment end times in week and month views"
 msgstr "Kaži čase _koncev sestankov v tedenskih in mesečnih pogledih"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 #, fuzzy
 msgid "_Time divisions:"
 msgstr "Časovne _delitve:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 #, fuzzy
 msgid "_Tue"
 msgstr "_tor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 #, fuzzy
 msgid "before every appointment"
 msgstr "pred koncem sestanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Navedite ime datoteke:"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Dodaj _koledarju"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Seznam _nalog"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Napaka iKoledarja"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj _koledarju"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Vrsta:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tedenov"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4804,81 +4787,81 @@ msgstr "%s  Naredili ste spremembe. Pozabi spremembe in posodobi urejevalnik?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Ničesar niste spremenili, posodobi urejevalnik?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, fuzzy, c-format
-msgid "Validation error: %s"
-msgstr "Neznana napaka: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Končano "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "končano "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Rok "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Rok"
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 #, fuzzy
 msgid "Could not update object"
 msgstr "Nisem mogel posodobiti predmeta!"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Uredi sestake"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Sestanek - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Naloga - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Vpis v dnevniku - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Ni povzetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Shrani kot..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Ne morem dobiti trenutne različice!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, fuzzy, c-format
+msgid "Validation error: %s"
+msgstr "Neznana napaka: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Končano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "končano "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Rok "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Rok"
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -5009,27 +4992,27 @@ msgstr "Delegirano komu:"
 msgid "Enter Delegate"
 msgstr "Vnesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Sestanek"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Opomnilnik"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Ponovitev"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Načrtovanje časa"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Sestanek"
 
@@ -5041,7 +5024,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 #, fuzzy
 msgid "Start date is wrong"
 msgstr "Datum pričetka"
@@ -5134,10 +5117,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5156,15 +5139,15 @@ msgstr "Potreben je organizator."
 msgid "At least one attendee is required."
 msgstr "Potreben je vsaj en udeleženec."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegiraj komu..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5460,26 +5443,19 @@ msgstr "Zavrzi to sporočilo"
 msgid "Save Event"
 msgstr "Sporočilo koledarja"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Izberi mapo"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Izberite ciljno mapo za uvoz teh podatkov"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Koledar"
+msgid "_Destination"
+msgstr "Zbriši to mapo"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Seznam _nalog"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5510,38 +5486,44 @@ msgid "% _Complete"
 msgstr "% končano"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "končano"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "visoka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "v teku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "nizka"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "običajna"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "ni pričeto"
 
@@ -5579,11 +5561,11 @@ msgstr "Naslov _spletne strani:"
 msgid "Assignment"
 msgstr "Dodelitev"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kliknite tu za odprtje adresarja"
@@ -5592,8 +5574,9 @@ msgstr "Kliknite tu za odprtje adresarja"
 msgid "Con_fidential"
 msgstr "_Zaupno"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Opis:"
@@ -5746,101 +5729,55 @@ msgstr "%s ob %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za neznano vrsto sprožilca"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "javno"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "osebno"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "zaupno"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Datum konca"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Datum pričetka"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Povzetek"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Prost"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zaseden"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Kliknite tu za dodajanje opravila"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Neimenovan"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Datum _pričetka:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Do datuma:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Zemljepisna lega mora biti zapisana v obliki: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stanje:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioriteta:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Naslov _spletne strani:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "neznano"
+#: 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 "javno"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Ponovi se"
+#: 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 "osebno"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Določena"
+#: 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 "zaupno"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5886,17 +5823,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Prost"
+
+#: 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 "Zaseden"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Odpri"
 
@@ -5906,41 +5852,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Prilepi"
 
@@ -6001,83 +5948,162 @@ msgstr "Prioriteta"
 msgid "Start date"
 msgstr "Datum pričetka"
 
+#: 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 "Povzetek"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Sortiranje opravil"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nov _sestanek..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _dogodek"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 #, fuzzy
 msgid "New Meeting"
 msgstr "Nov sestanek"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 #, fuzzy
 msgid "New Task"
 msgstr "Nova _naloga"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izberi ni_t"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Zbriši..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi podatek o zasedenosti"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiraj v mapo..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Presta_vi v mapo..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 #, fuzzy
 msgid "_Schedule Meeting..."
 msgstr "_Načrtuj sestanek"
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 #, fuzzy
 msgid "_Forward as iCalendar..."
 msgstr "Posreduj naprej kot i_Koledar"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Zbriši to _pojavitev"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Zbriši _vse pojavitve"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Pojdi na _danes"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Pojdi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 #, fuzzy
 msgid "_Settings..."
 msgstr "_Nastavitve pošte..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Datum konca"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "neznano"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Ponovi se"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Ne"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Zemljepisna lega mora biti zapisana v obliki: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -6101,36 +6127,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i deljenj minute"
+#. 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 "dop"
+
+#. 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 "pop"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "dop"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pop"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i deljenj minute"
 
 #: calendar/gui/e-itip-control.c:592
 #, fuzzy
@@ -6243,10 +6269,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Nič</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stanje:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6276,7 +6298,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "V redu"
 
@@ -6489,62 +6511,58 @@ msgstr "Priloga ne vsebuje veljavnega sporočila koledarja"
 msgid "The attachment has no viewable calendar items"
 msgstr "Priloga nima gledljivih predmetov koledarja"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Posodobitev končana\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 #, fuzzy
 msgid "There was an error on the CORBA system\n"
 msgstr "Napaka ob prenašanju podatkov za"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 #, fuzzy
 msgid "Object could not be found\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Stanje udeleženca posodobljeno\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanja udeleženca ni bilo možno posodobiti!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Odstranjevanje končano"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Predmet poslan!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Predmeta ni bilo mogoče poslati!\n"
 
@@ -6662,28 +6680,6 @@ msgstr "Delegirano"
 msgid "In Process"
 msgstr "V obdelavi"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Iz pisarne"
@@ -6744,7 +6740,34 @@ msgstr "Čas pričetka sestanka:"
 msgid "Meeting _end time:"
 msgstr "Čas zaključka sestanka:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Vpišite geslo za %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, fuzzy, c-format
 msgid ""
 "Error on %s:\n"
@@ -6753,21 +6776,19 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Odpiram naloge v %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6776,55 +6797,117 @@ msgstr ""
 "Napaka ob '%s':\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Naloži _slike"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 #, fuzzy
 msgid "Completing tasks..."
 msgstr "Datum zaključka"
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 #, fuzzy
 msgid "Deleting selected objects..."
 msgstr "Brišem izbrane predmete"
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Uničujem"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Naloge"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Ni sestankovov"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Naloži _slike"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Odpiram '%s'"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Odhodna"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+#, fuzzy
+msgid "Calendar and Tasks"
+msgstr "Nastavitve koledarja in nalog"
+
+#: 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
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucijin veznik koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolucijin veznik Koledarja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolucijin veznik opravil"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Koledar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+#, fuzzy
+msgid "_Tasks"
+msgstr "_Naloga"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -6962,6 +7045,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Nimate dovoljenja"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Kliknite tu za odprtje adresarja"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7181,7 +7281,7 @@ msgid "Contacts: "
 msgstr "Stiki: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Predogled tiskanja"
 
@@ -7193,68 +7293,78 @@ msgstr "Natisni predmet"
 msgid "Print Setup"
 msgstr "Nastavitev tiskanja"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d izbranih"
+msgstr[1] "%d izbranih"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Naloži _slike"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Nova naloga"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Naloga"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Viri novic"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Seznam _nalog"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Ustvari nov posel"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI mape nalog, ki naj se kaže"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nisem mogel naložiti nalog v `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7266,11 +7376,11 @@ msgstr ""
 " \n"
 "Resnično zbriši te naloge? "
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ne sprašuj me več."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Natisni naloge"
 
@@ -8932,7 +9042,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Odstranjujem mapo %s"
@@ -9027,33 +9137,6 @@ msgstr "Neveljavni argumenti"
 msgid "Error executing filter search: %s: %s"
 msgstr "Napaka ob izvajanju iskanja s filtrom: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Nisem mogel razčleniti iskalnega izraza %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Napaka ob izvajanju iskalnega izraza %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) zahteva enojen booleanov rezultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Opravljam poizvedbo na neznani glavi: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9087,7 +9170,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Prenašam %d sporočil"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Nisem mogel razčleniti iskalnega izraza %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Napaka ob izvajanju iskalnega izraza %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) zahteva enojen booleanov rezultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) zahteva enojen booleanov rezultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) zahteva enojen booleanov rezultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Opravljam poizvedbo na neznani glavi: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9095,43 +9223,43 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Preklicano."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Nepričakovan odgovor strežnika POP: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 #, fuzzy
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Ne morem zašifirati tega sporočila: naslovniki niso navedeni"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9139,90 +9267,70 @@ msgid ""
 "%s"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, fuzzy, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisem uspel predpomniti sporočila %s: %s"
 
-#: camel/camel-gpg-context.c:1246 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 "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: camel/camel-gpg-context.c:1273 camel/camel-gpg-context.c:1702
+#: camel/camel-gpg-context.c:1753
 #, fuzzy, c-format
 msgid "Failed to execute gpg: %s"
 msgstr "Nisem mogel izvršiti %s: %s\n"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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
 #, fuzzy
 msgid "Failed to execute gpg."
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
 "datoteke: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, fuzzy, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Nisem mogel preveriti tega sporočila: nisem mogel ustvariti začasne "
 "datoteke: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "To je digitalno podpisan del sporočila"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Šifrirano sporočilo"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Od urejevalnika nisem uspel dobiti sporočila"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
-
-#: 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 "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisem se mogel zakleniti '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9245,6 +9353,26 @@ msgstr "Nisem uspel zakleniti s pomočjo fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisem uspel zakleniti s pomočjo flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Nisem mogel ustvariti cevi za pomoč pri zaklepanju: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne morem razvejiti pomočnika za zaklepanje: %s"
+
+#: 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 "Nisem mogel zakleniti '%s': napaka v protokolu s programom lock-helper"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisem se mogel zakleniti '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9492,7 +9620,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Strežnik je sporočil slab odgovor avtentifikaciji."
 
@@ -9697,7 +9825,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "ID _certifikata:"
 
 #: camel/camel-smime-context.c:360
@@ -9714,7 +9842,7 @@ msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 msgid "Failed to add data to CMS encoder"
 msgstr "Nisem uspel shraniti pošte v začasno datoteko %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Nisem mogel preveriti certifikatov."
@@ -9785,99 +9913,99 @@ msgstr "Nisem mogel izvesti skripte podpisa"
 msgid "Cannot set message digests"
 msgstr "Ne morem dobiti sporočila %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Vključi v seznamu na_ključnih podpisov"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Strežnik: %s, vrsta: %s:"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Ukaz IMAP ni uspel: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nisem mogel najti certifikata za \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Nisem mogel najti skupnega algoritma."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nisem mogel ustvariti konteksta dešifriranja S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Nisem uspel poslati uporabniškega imena strežniku"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Ukaz ni implementiran"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9894,16 +10022,26 @@ msgstr "Ne morem dobiti mape: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne morem ustvariti mape: neveljavno dejanje na tej shrambi"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Smeti"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -10036,7 +10174,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -10049,11 +10187,11 @@ msgstr ""
 "Prstni odtis:      %s\n"
 "Podpis:            %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "V REDU"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "SLABO"
 
@@ -10075,7 +10213,7 @@ msgstr ""
 "Ga želite vseeno sprejeti?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10090,28 +10228,28 @@ msgstr ""
 "\n"
 "Ga želite vseeno sprejeti?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10123,17 +10261,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Ne morem odpreti razčleniti URLja '%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, fuzzy, c-format
 msgid "Error storing `%s': %s"
 msgstr "Napaka ob zagonu %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Ni takšnega sporočila %s v %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 #, fuzzy
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Preveri za nova sporočila v vseh mapah"
@@ -10143,11 +10281,6 @@ msgstr "Preveri za nova sporočila v vseh mapah"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10164,10 +10297,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Ne morete kopirati sporočil iz te mape smeti."
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Preverjam za novo pošto"
 
 #: 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 "Preveri za nova sporočila v vseh mapah"
@@ -10201,6 +10336,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10220,26 +10356,321 @@ msgstr "Ta možnost narekuje povezavo s strežnikom IMAP z nešifriranim geslom.
 msgid "Checklist"
 msgstr "Goste meglice"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %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 "Povezava s strežnikom je bila nepričakovano prekinjena: %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 "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne morem dobiti sporočila: %s iz mape %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 ""
+"Ne morem dobiti sporočila: %s iz mape %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne morem dodati sporočila v mapo vrste mh: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne morem dodati sporočila v mapo vrste 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 ""
+"Ne morem dobiti sporočila: %s iz mape %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 ""
+"Ne morem dobiti sporočila: %s iz mape %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 ""
+"Ne morem dobiti sporočila: %s iz mape %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 ""
+"Ne morem dobiti sporočila: %s iz mape %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 "Mape"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Kaži le naročene mape"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Povozi imenski prostor map, ki ga nudi strežnik"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Imenski prostor"
+
+#: 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 "Za branje in hranjenje pošte na strežnikih IMAP."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, fuzzy, c-format
+msgid "IMAP service for %s on %s"
+msgstr "storitev %s za %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: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/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 "Nisem se mogel povezati z %s (vrata %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:815
+#: 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/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezava prekinjena"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Neznana napaka"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Ne morem se povezati s strežnikom POP.\n"
+"Ni podpore za zahtevan avtentifikacijski mehanizm."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sProsim vpišite geslo SMTP za %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Strežniku KPOP se nisem mogel avtentificirati: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime mape ne more vsebovati znaka return"
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "_Podjetje:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Ne morem zbrisati mape: %s: neveljavno dejanje"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne morem dobiti mape: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne morem preimenovati mape %s: neveljavno dejanjea"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Prekliči naročnino na mapo \"%s\""
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Nepričakovan odgovor strežnika IMAP: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Brez nalog"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operacija razveljavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Povezava s strežnikom je bila nepričakovano prekinjena: %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:1089
-msgid "Unknown error"
-msgstr "Neznana napaka"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, fuzzy, c-format
@@ -10282,21 +10713,21 @@ msgstr "Nisem mogel ustvariti imenika %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nisem mogel naložiti povzetka za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mapa je bila uničena in na novo ustvarjena na strežniku."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Pregledujem za spremenjenimi sporočili"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, fuzzy, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Nisem uspel prenesti sporočila"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10312,25 +10743,25 @@ msgstr ""
 "Ne morem dobiti sporočila: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Ni takšnega sporočila"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "To sporočilo trenutno ni na voljo"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Prenašam povzetke novih sporočil"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nisem mogel najti telesa sporočila v odgovoru FETCH."
 
@@ -10372,23 +10803,6 @@ msgstr "Nisem se mogel povezati s strežnikom LDAP."
 msgid "Command:"
 msgstr "_Podjetje:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mape"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Kaži le naročene mape"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Povozi imenski prostor map, ki ga nudi strežnik"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Imenski prostor"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Uveljavi filtre na novih sporočiliv v mapi INBOX tega strežnika"
@@ -10411,85 +10825,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:424
-#, fuzzy, c-format
-msgid "IMAP server %s"
-msgstr "Strežnik SMTP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, fuzzy, c-format
-msgid "IMAP service for %s on %s"
-msgstr "storitev %s za %s na %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nisem se mogel povezati z %s (vrata %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezava prekinjena"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Pogajanje SSL ni uspelo"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Nistve vpisali gesla."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10500,25 +10872,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Ni takšne mape %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime mape ne more vsebovati znaka return"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10526,7 +10891,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Neznana napaka: %s"
@@ -10631,58 +10996,58 @@ msgid ""
 msgstr ""
 "Za branje in shranjevanje krajevne pošte v običajnih Unix mbox datotekah"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Korenski imenik shrambe %s ni absolutna pot"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Korenski imenik shrambe %s ni običajnen imenik"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Ne morem dobiti mape: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Krajevno shrambe nimajo vhodnega predala"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Krajevna datoteka s pošto %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisem mogel preimenovati mape %s v %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, fuzzy, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisem mogel preimenovati mape: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nisem mogel zbrisati datoteke povzetka mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nisem mogel zbrisati datoteke kazala mape `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10748,7 +11113,7 @@ msgstr "Nisem mogel zbrisati mape `%s': %s"
 msgid "not a maildir directory"
 msgstr "ni imenik vrste maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11086,7 +11451,7 @@ 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:258
+#: 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
@@ -11095,8 +11460,8 @@ msgid "User cancelled"
 msgstr "Uporabnik je preklical"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11105,49 +11470,49 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Notranja napaka: uid ima neveljavno obliko: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Napaka ob samodejnem shranjevanju sporočila: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne morete kopirati sporočil iz te mape smeti."
@@ -11266,7 +11631,7 @@ msgstr "Nisem mogel dobiti skupine: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Nisem mogel dobiti sporočila: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11319,8 +11684,8 @@ msgstr "Ni sporočila z uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Prenašam sporočilo POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Neznan razlog"
 
@@ -11777,7 +12142,7 @@ msgstr "%.1fM"
 msgid "%.0fG"
 msgstr "%.1fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "priloga"
 
@@ -11822,6 +12187,99 @@ msgstr "Vrsta MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predlagan samodejen prikaz priloge"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne morem dobiti sporočila"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Od urejevalnika nisem uspel dobiti sporočila"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Neimenovano sporočilo)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Odpri datoteko"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr ""
+
+#: composer/e-msg-composer.c:2097
+#, fuzzy
+msgid "Signature:"
+msgstr "Podpisi"
+
+#: 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.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 "Sestavi novo sporočilo"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Nisem mogel aktivirati gradnika za izbiro naslova."
+
+#: composer/e-msg-composer.c:3175
+#, fuzzy
+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 ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Ne morem aktivirati komponente urejevalnika HTML."
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nisem mogel ustvariti okna skladatelja:\n"
+"Ne morem aktivirati komponente urejevalnika HTML."
+
+#: 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
 #, fuzzy
 msgid "Posting destination"
@@ -11907,209 +12365,135 @@ msgstr "<kliknite tukaj za izbiro mape>"
 msgid "Attach file(s)"
 msgstr "Priloži datoteko"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Ob uporabi tega računa _vedno podpiši odhodno pošto"
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Ne morem zašifirati tega sporočila: ni besedila za zašifriranje"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Ne morem dobiti sporočila"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Od urejevalnika nisem uspel dobiti sporočila"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Neimenovano sporočilo)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Odpri datoteko"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Priloži datoteko k sporočilu"
 
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:2087
-#, fuzzy
-msgid "Signature:"
-msgstr "Podpisi"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Sestavi novo sporočilo"
-
-#: composer/e-msg-composer.c:3137
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"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 ""
-"Nisem mogel ustvariti okna skladatelja:\n"
-"Nisem mogel aktivirati gradnika za izbiro naslova."
 
-#: composer/e-msg-composer.c:3165
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-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 ""
-"Nisem mogel ustvariti okna skladatelja:\n"
-"Ne morem aktivirati komponente urejevalnika HTML."
-
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"Nisem mogel ustvariti okna skladatelja:\n"
-"Ne morem aktivirati komponente urejevalnika HTML."
-
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Naslednje _neprebrano sporočilo"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+msgid "Do you want to recover unfinished messages?"
+msgstr "Želite shraniti spremembe"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nisem mogel ustvariti povzetka"
+msgid "Don't Recover"
+msgstr "Ne odstrani"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nisem mogel shraniti datoteke s podpisom."
+msgid "Recover"
+msgstr "Odstrani"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "Zavrzi to sporočilo"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Želite shraniti spremembe"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Napaka ob shranjevanju bližnjic."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ne odstrani"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Opozorilo: Spremenjeno sporočilo"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Napaka ob shranjevanju bližnjic."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Ste prepričani, želite zbrisati ta neimenovan sestanek?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Odstrani"
+msgid "Discard Changes"
+msgstr "Zavrzi to sporočilo"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Shrani sporočilo kot..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nisem mogel ustvariti povzetka"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Naslednje _neprebrano sporočilo"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Opozorilo: Spremenjeno sporočilo"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Priloži datoteko k sporočilu"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12241,7 +12625,8 @@ msgstr ""
 "Datoteka z enakim imenom že obstaja.\n"
 "Naj jo prepišem?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Prepiši datoteko?"
 
@@ -12419,84 +12804,100 @@ msgstr "Izberi čas s katerim naj se primerja"
 msgid "_Filter Rules"
 msgstr "Pravila filtriranja"
 
-#: filter/filter-errors.xml.in.h:1
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Napaka v regularnem izrazu '%s':\n"
-"%s"
+msgid "Missing date."
+msgstr "Posodobitev sestanka"
 
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+#, fuzzy
+msgid "You must choose a date."
+msgstr "Pozabili ste izbrati datum."
 
-#: filter/filter-errors.xml.in.h:3
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
+msgid "Missing file name."
+msgstr "_Razločno ime:"
 
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
 #, fuzzy
-msgid "Missing date."
-msgstr "Posodobitev sestanka"
+msgid "You must specify a file name."
+msgstr "Navedite ime datoteke:"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing file name."
-msgstr "_Razločno ime:"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Odstranjujem mapo %s"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
 #, fuzzy
-msgid "Missing name."
-msgstr "Dodelitev"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+msgid "You must specify a folder."
+msgstr "vMapi morate dati ime."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Strežnik ni bil izbran"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Napaka v regularnem izrazu '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
 #, fuzzy
-msgid "You must choose a date."
-msgstr "Pozabili ste izbrati datum."
+msgid "Missing name."
+msgstr "Dodelitev"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Filtru morate dati ime."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "vMapi morate dati ime."
 
-#: filter/filter-errors.xml.in.h:14
-#, fuzzy
-msgid "You must specify a file name."
-msgstr "Navedite ime datoteke:"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
+
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
 #, fuzzy
-msgid "You must specify a folder."
-msgstr "vMapi morate dati ime."
+msgid "No sources selected."
+msgstr "Strežnik ni bil izbran"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12510,68 +12911,11 @@ msgstr "Odpri datoteko"
 msgid "<b>Then</b>"
 msgstr "končano "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Izberi mapo"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Pomembno"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-#, fuzzy
-msgid "To Do"
-msgstr "Seznam opravil"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-#, fuzzy
-msgid "Later"
-msgstr "po"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Preizkus"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Ime pravila: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Neimenovan"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "končano "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Izvrši dejanja"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "če je zadoščeno vsem pogojem"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "če je zadoščeno kateremukoli pogoju"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "dohodna"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "odhodna"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -12667,6 +13011,79 @@ 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
+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
+#, 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
+#, fuzzy
+msgid "Later"
+msgstr "po"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Preizkus"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Ime pravila: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "končano "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "če je zadoščeno vsem pogojem"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "če je zadoščeno kateremukoli pogoju"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Izvrši dejanja"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegirano"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Zamenjaj"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Odgovorjeno na"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Vključi:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "dohodna"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "odhodna"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -12799,7 +13216,7 @@ msgstr "ni označeno"
 msgid "Junk Test"
 msgstr "junij"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 #, fuzzy
 msgid "Label"
@@ -12840,7 +13257,7 @@ msgstr "Izhod iz programa"
 msgid "Play Sound"
 msgstr "Predvajaj zvok"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Beri"
 
@@ -12912,9 +13329,9 @@ msgstr "se začne z"
 msgid "Stop Processing"
 msgstr "Prenehaj z obdelavo"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12979,119 +13396,68 @@ msgstr "Zadeva ne vsebuje"
 msgid "Virtual _Folders"
 msgstr "Virtualne mape"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "Viri vMap"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-#, fuzzy
-msgid "Composer Preferences"
-msgstr "Nastavitve koledarja"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-#, fuzzy
-msgid "Configure your email accounts here"
-msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolucija "
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Nastavitev Evolucijine pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolucijin setavljalnik pošte."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Nastavitev Evolucijine pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolucijina komponenta za poštne mape."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolucijin veznik Koledarja"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-#, fuzzy
-msgid "Mail Accounts"
-msgstr "Poštni račun"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-#, fuzzy
-msgid "Mail Preferences"
-msgstr "Nastavitve"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 #, fuzzy
 msgid "[Default]"
 msgstr "Privzeto"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 #, fuzzy
 msgid "Account name"
 msgstr "Ime _računa:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 #, fuzzy
 msgid "Protocol"
 msgstr "Portoriko"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Neimenovan"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 #, fuzzy
 msgid "Language(s)"
 msgstr "Jezik"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Podpisi"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 #, fuzzy
 msgid "Signature(s)"
 msgstr "Podpisi"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Posredovano sporočilo"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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):"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Iz iskanja ustvari na_videzno mapo..."
 
@@ -13130,568 +13496,593 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedi kje naj se ustvarimapa:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Ustvari pravilo"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Ime mape:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "vMape"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Dohodna pošta"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Nalagam..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Izbiram sporočila v mapi \"%s\""
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Preveri za nova sporočila v vseh mapah"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Prestavi"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Prekliči opravilo"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Izberi mapo"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopiraj"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Ustvari novo mapo"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj mapo \"%s\" v:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Preimenuj mapo"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "Po_gled"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Odpri v novem oknu"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Prestavi"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "_Nova mapa"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "P_reimenuj"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "vMape"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Dohodna pošta"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kot novo sporočilo..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Na_tisni"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljatelju"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _seznam"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _vsem"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Posreduj naprej"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Nave_zuj se..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Postavi zastavico končano"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Zb_riši zastavico"
 
-#: mail/em-folder-view.c:787 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 "Označi kot _prebrano"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Označi kot _nepomembno"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Označi kot _neprebrano"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Označi kot po_membno"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "O_dbriši"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Presta_vi v mapo..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj v mapo..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Pošiljatelja dodaj v _adresar"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Uveljavi filtre"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Pravila filtriranja"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Iz sporočila ustvari _pravilo"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "vMapa glede na p_redmet"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "vMapa glede na _pošiljatelja"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "vMapa glede na pre_jemnike"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "vMapa glede na poštni se_znam"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "vMapa glede na Pošiljatelja"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filter glede na za_devo"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filter glede na pošilja_telja"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filter glede na preje_mnike"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filter glede na p_oštni seznam"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filter glede na pošilja_telja"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Privzeto"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Natisni sporočilo"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiraj lokacijo povezave"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite tu za dodajanje opravila"
 
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Kliknite tu za dodajanje opravila"
+#: 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 "Od"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Ustreza:"
+#: 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 "Odgovori-na:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Določena"
+#: 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 "Za"
 
-#: mail/em-format-html-display.c:646
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr ""
-"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+#: 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-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Seznam podpisov"
+#: 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-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr ""
-"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
+#: 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-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
 #, fuzzy
-msgid "Invalid signature"
-msgstr "Seznam podpisov"
+msgid "Newsgroups"
+msgstr "Viri novic"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "priloga %s"
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format.c:1024 mail/em-format.c:1143
 #, fuzzy
-msgid "Valid signature, cannot verify sender"
-msgstr "Uredi vsebino podpisa v urejevalniku"
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/em-format-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "šifriranje"
-
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
+#: mail/em-format.c:1298
 #, fuzzy
-msgid "Encrypted, weak"
-msgstr "Šifrirano sporočilo"
-
-#: mail/em-format-html-display.c:656
-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 ""
+msgid "Unsupported signature format"
+msgstr "Nepodprta shema"
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Encrypted"
-msgstr "šifriranje"
-
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+msgid "Error verifying signature"
+msgstr "Nisem mogel preveriti certifikatov."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
+#: mail/em-format.c:1306
 #, fuzzy
-msgid "Encrypted, strong"
-msgstr "Šifrirano sporočilo"
+msgid "Unknown error verifying signature"
+msgstr "Nisem mogel preveriti certifikatov."
 
-#: mail/em-format-html-display.c:658
-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.c:452 mail/em-format-html.c:454
+#, fuzzy, c-format
+msgid "Retrieving `%s'"
+msgstr "Prenašam sporočilo %s"
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
-msgid "_View Certificate"
-msgstr "ID _certifikata:"
+msgid "Unsigned"
+msgstr "Določena"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
-msgid "This certificate is not viewable"
-msgstr "To sporočilo trenutno ni na voljo"
+msgid "Valid signature"
+msgstr "Seznam podpisov"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "%d %b %l:%M %p"
+msgid "Invalid signature"
+msgstr "Seznam podpisov"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html.c:562
 #, fuzzy
-msgid "Overdue:"
-msgstr "Naloge s prekoračenim rokom:"
+msgid "Valid signature but cannot verify sender"
+msgstr "Uredi vsebino podpisa v urejevalniku"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "%d %b %l:%M %p"
+msgid "Unencrypted"
+msgstr "šifriranje"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 #, fuzzy
-msgid "_View Inline"
-msgstr "Poglej vsebino"
+msgid "Encrypted, weak"
+msgstr "Šifrirano sporočilo"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
-msgid "_Hide"
-msgstr "Skrij"
-
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "Stran %d od %d"
+msgid "Encrypted"
+msgstr "šifriranje"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Prenašam sporočilo %s"
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+#, fuzzy
+msgid "Encrypted, strong"
+msgstr "Šifrirano sporočilo"
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "Napačno oblikovano dodatno telo sporočila."
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "Kazalec na FTP povezavo (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "Kazalec na krajevno datoteko (%s) veljaven na strežniku \"%s\""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "Kazalec na lokalno datoteko (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "Kazalec na oddaljen podatek (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "Kazalec na neznane zunanje podatke (vrsta \"%s\")"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "Prestavljam sporočila"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Odgovori-na:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Za"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc:"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
 #, fuzzy
 msgid "Mailer"
 msgstr "Pošta"
 
 #. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Ustreza:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
+#: mail/em-format-html-display.c:644
 #, fuzzy
-msgid "Newsgroups"
-msgstr "Viri novic"
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr ""
+"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "priloga %s"
+#: mail/em-format-html-display.c:645
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr ""
+"To sporočilo ima elektronski podpis, a se ne da dokazati, da je avtentično."
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
+msgstr ""
+
+#: mail/em-format-html-display.c:647
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
+msgid "Valid signature, cannot verify sender"
+msgstr "Uredi vsebino podpisa v urejevalniku"
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: 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."
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisem mogel razčleniti sporočila MIME. Kažem izvorno besedilo."
+#: mail/em-format-html-display.c:653
+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."
+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."
+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 ""
 
-#: mail/em-format.c:1339
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Nepodprta shema"
+msgid "_View Certificate"
+msgstr "ID _certifikata:"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Nisem mogel preveriti certifikatov."
+msgid "This certificate is not viewable"
+msgstr "To sporočilo trenutno ni na voljo"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Nisem mogel preveriti certifikatov."
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/em-format-html-display.c:1015
+#, fuzzy
+msgid "Overdue:"
+msgstr "Naloge s prekoračenim rokom:"
+
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "%d %b %l:%M %p"
+
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "Poglej vsebino"
+
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "Skrij"
+
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr "Stran %d od %d"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Vsak "
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_En dan"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "En _teden"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "En _mesec"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13699,25 +14090,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Nisem uspel predpomniti sporočila %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Ne morem dobiti mape: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Nisem uspel predpomniti sporočila %s: %s"
+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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Nisem uspel predpomniti sporočila %s: %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Nisem mogel ustvariti cevi do %s: %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13728,98 +14149,82 @@ msgstr "Shrani kot..."
 msgid "untitled_image.%s"
 msgstr "Neimenovano sporočilo"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Ozadje:"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Odgovori pošiljatelju"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Odpri povezavo v brskalniku"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Pošlji _sporočilo na seznam..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Dodaj adresar"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Odpri v %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Naročen"
 
-#: mail/em-subscribe-editor.c:637 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 "Mapa"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Prosimo izberite strežnik."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Strežnik ni bil izbran"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Tega sporočila ne kaži več."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtri"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Posredovano sporočilo"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, 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):"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Sporočilo"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Shrani sporočilo kot..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "_Naslov:"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Odpri sporočilo iz \"%s\""
@@ -13839,11 +14244,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13957,134 +14362,143 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Poštni račun"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Poštni račun"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Zapisuj dejanja filtra v:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Privzeta prioriteta:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Opozorilo o novi pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -14092,33 +14506,25 @@ msgid ""
 msgstr ""
 "Zahtevaj potrditev ob pošiljanju v obliki HTML tistim stikom, ki tega nočejo"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Zahtevaj potrditev ob pošiljanju sporočil, ki imajo le BCC prejemnike"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14173,8 +14579,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Privzeta prioriteta:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14317,37 +14724,72 @@ msgstr ""
 msgid "spamd port"
 msgstr "Uvozi"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolucijin setavljalnik pošte."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucijin setavljalnik pošte."
+msgid "Composer Preferences"
+msgstr "Nastavitve koledarja"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Configure your email accounts here"
+msgstr "Ustvari ali uredi poštne račune in ostale nastavitve"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Mail"
+msgstr "Evolucija "
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Nastavitev Evolucijine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Evolucijin setavljalnik pošte."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Nastavitev Evolucijine pošte"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolucijin veznik Koledarja"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+#, fuzzy
+msgid "Mail Accounts"
+msgstr "Poštni račun"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+#, fuzzy
+msgid "Mail Preferences"
+msgstr "Nastavitve"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Pošta"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14355,15 +14797,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Prosim pokačajte"
 
@@ -14395,19 +14837,51 @@ msgid "Select folder to import into"
 msgstr "Izberi mapo"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Uvažam"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Uvažam datoteke"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolucijin setavljalnik pošte."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Pregledujem %s"
@@ -14417,7 +14891,7 @@ msgstr "Pregledujem %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioriteta: %s"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14432,7 +14906,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14440,7 +14914,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14449,25 +14923,25 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolucija uvaža vaše podatke iz Netscapea"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Nastavitve"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 #, fuzzy
 msgid "Mail Filters"
 msgstr "Uredi filtre"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14501,130 +14975,141 @@ msgid "Pine"
 msgstr "Program Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Urejevalnik Evolucijinih računov"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Gostitelj:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 #, fuzzy
 msgid "User_name:"
 msgstr "_Uporabniško ime:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Pot:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Zadeva je %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s poštnih seznamov"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Odgovorjeno na"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Filtru dodaj pravilo"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d izbranih"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d neposlanih"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Osnutki"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d poslanih"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlanih"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "skupaj %d"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr " (XXX neprebran)"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d izbranih"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Novo poštno sporočilo"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Pošlji sporočilo"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 #, fuzzy
 msgid "Compose a new mail message"
 msgstr "Sestavi novo sporočilo"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Nova vMapa"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Uredi filtre"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Ustvari nov koledar"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, ki naj ga prikaže brskalnik map"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Preverjam storitev"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Vzpostavljam povezavo s strežnikom..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identiteta"
 
-#: mail/mail-config-druid.c:366
+#: mail/mail-config-druid.c:364
 #, fuzzy
 msgid ""
 "Please enter your name and email address below. The \"optional\" fields "
@@ -14635,12 +15120,12 @@ msgstr ""
 "potrebno izpolniti, razen, če ne želite vključiti te podatke v e-pošto, ki "
 "jo boste pošiljali."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-config-druid.c:374
+#: mail/mail-config-druid.c:372
 #, fuzzy
 msgid ""
 "Please enter information about your incoming mail server below. If you are "
@@ -14650,15 +15135,15 @@ msgstr ""
 "veste se obrnite na vašega sistemskega administratorja ali ponudnika dostopa "
 "do interneta."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Prosim, izberite med naslednjimi možnostmi"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Pošiljanje pošte"
 
-#: mail/mail-config-druid.c:386
+#: mail/mail-config-druid.c:384
 #, fuzzy
 msgid ""
 "Please enter information about the way you will send mail. If you are not "
@@ -14668,11 +15153,11 @@ msgstr ""
 "se obrnite na vašega sistemskega administratorja ali ponudnika dostopa do "
 "interneta."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Upravljanje z računom"
 
-#: mail/mail-config-druid.c:393
+#: mail/mail-config-druid.c:391
 #, fuzzy
 msgid ""
 "You are almost done with the mail configuration process. The identity, "
@@ -14688,14 +15173,6 @@ msgstr ""
 "Prosim, v prostor spodaj vpišite ime za ta račun. Ime bo uporabljeno le za "
 "prikaz."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Preverjam storitev"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Vzpostavljam povezavo s strežnikom..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -15023,7 +15500,7 @@ msgstr "Izvrši ukaz..."
 
 #: mail/mail-config.glade.h:81
 #, fuzzy
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr "se konča z"
 
 #: mail/mail-config.glade.h:82
@@ -15368,351 +15845,455 @@ msgstr " barvo"
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Avtentifikacija"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Ste prepričani, da želite zbrisati ta račun?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
+"takšne pošte:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
+msgid "_Send"
+msgstr "Pošlji"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Ste prepričani, da želite znova poslati vseh %d sporočil?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ne morem kopirati mape: %s"
+msgid "Use default drafts folder?"
+msgstr "Odpiram mapo %s"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ne morem dobiti mape: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Ni mogoče odpreti mape osnutkov za ta račun.\n"
+"Želite uporabiti privzeto mapo osnutkov?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nisem mogel ustvariti začasnega imenika: %s"
+msgid "Use _Default"
+msgstr "Privzeto"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Ne morem ustvariti imenika\n"
-"%s\n"
-"Napaka: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Ste prepričani, želite odpreti vseh %d sporočil v ločenih oknih?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Nisem mogel zbrisati mape:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
+msgid "_Expunge"
+msgstr "_Uniči"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Mapa `%s' ne obstaja."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Trajno odstrani vsa zbrisana sporočila iz vseh map"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ne morem prestaviti mape: %s"
+msgid "_Empty Trash"
+msgstr "Sprazni _smeti"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Nisem mogel preimenovati mape: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
-#, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Nisem mogel preimenovati mape: %s"
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Ne morem dobiti sporočila"
+msgid "Error while {0}."
+msgstr ""
+"Napaka ob '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
+msgid "Error while performing operation."
+msgstr ""
+"Napaka ob opravljanju dejanja:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:27
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Nisem mogel ustvariti imenika %s: %s"
+msgid "Enter password."
+msgstr "Vpišite geslo"
 
-#: mail/mail-errors.xml.in.h:28
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
-msgid "Cannot save to file \"{0}\"."
+msgid "Error loading filter definitions."
 msgstr ""
-"Nisem mogel odpreti URIja `%s':\n"
+"Napaka ob nalaganju podatkov o filtrih:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Nisem mogel izvesti skripte podpisa"
+msgid "Cannot save to directory \"{0}\"."
+msgstr "Nisem mogel ustvariti imenika %s: %s"
 
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:31
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "Nisem mogel shraniti datoteke s podpisom."
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"Nisem mogel odpreti URIja `%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:32
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Zbriši \"%s\""
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"Ne morem ustvariti imenika\n"
+"%s\n"
+"Napaka: %s"
 
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Resnično zbriši račun?"
+msgid "Cannot create temporary save directory."
+msgstr "Nisem mogel ustvariti začasnega imenika: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "Zavrzi to sporočilo"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Želite shraniti spremembe"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ne zbriši"
+msgid "File exists but cannot overwrite it."
+msgstr "Datoteka obstaja, prepiši?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Vpišite geslo"
+msgid "File exists but is not a regular file."
+msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Napaka ob nalaganju podatkov o filtrih:\n"
+"Nisem mogel zbrisati mape:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Napaka ob opravljanju dejanja:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne morem zbrisati mape: %s: mapa ne obstaja"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Napaka ob '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Datoteka obstaja, prepiši?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ne morem preimenovati mape: %s: mapa ne obstaja"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Datoteka vrste 'spool' `%s' ne obstaja ali ni običajna datoteka"
+msgid "Delete \"{0}\"?"
+msgstr "Zbriši \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Zbriši mapo '%s'"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Avtentifikacija"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ne morem prestaviti mape: %s"
 
-#: mail/mail-errors.xml.in.h:48
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Samodejno posodobi"
+msgid "Cannot open source \"{2}\"."
+msgstr "Nisem mogel preimenovati mape: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Ne morem dobiti sporočila"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Ne morem kopirati mape: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Pošiljate pošto v obliki HTML, a naslednji prejemniki ne želijo prejemati "
-"takšne pošte:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ne morem dobiti mape: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Zbriši mapo '%s'"
+msgid "Cannot open source \"{1}\""
+msgstr "Nisem mogel preimenovati mape: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Niste vpisali vseh potrebnih podatkov."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Ne morete ustvariti dveh računov z enakim imenom."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Resnično zbriši račun?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Ste prepričani, da želite zbrisati ta račun?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Sledeče vMape:\n"
-"%s so uporabljale odstranjeno mapo:\n"
-"    '%s'\n"
-"in so bile posodobljene."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ne zbriši"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Sledeče vMape:\n"
-"%s so uporabljale odstranjeno mapo:\n"
-"    '%s'\n"
-"in so bile posodobljene."
+msgid "Could not save signature file."
+msgstr "Nisem mogel shraniti datoteke s podpisom."
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Nisem mogel izvesti skripte podpisa"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "Zavrzi to sporočilo"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "Strežnik SMTP %s ne podpira zahtevanega načina avtentifikacije %s"
+msgid "Do you wish to save your changes?"
+msgstr "Želite shraniti spremembe"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15720,87 +16301,100 @@ msgstr ""
 "\n"
 "Želite shraniti spremembe?"
 
-#: mail/mail-errors.xml.in.h:63
+#: mail/mail-errors.xml.h:184
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Ni mogoče odpreti mape osnutkov za ta račun.\n"
-"Želite uporabiti privzeto mapo osnutkov?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Privzeto"
+msgid "_Discard changes"
+msgstr "Zavrzi to sporočilo"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Odpiram mapo %s"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Niste vpisali vseh potrebnih podatkov."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Ne morete ustvariti dveh računov z enakim imenom."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Mapa `%s' ne obstaja."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-#, fuzzy
-msgid "_Discard changes"
-msgstr "Zavrzi to sporočilo"
-
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Sprazni _smeti"
-
-#: mail/mail-errors.xml.in.h:73
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Uniči"
+msgid "vFolders automatically updated."
+msgstr "Samodejno posodobi"
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Send"
-msgstr "Pošlji"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Sledeče vMape:\n"
+"%s so uporabljale odstranjeno mapo:\n"
+"    '%s'\n"
+"in so bile posodobljene."
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
 #, fuzzy
-msgid "vFolders automatically updated."
+msgid "Mail filters automatically updated."
 msgstr "Samodejno posodobi"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Sledeče vMape:\n"
+"%s so uporabljale odstranjeno mapo:\n"
+"    '%s'\n"
+"in so bile posodobljene."
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. 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-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Prepiši datoteko?"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Pošlji"
+
+#: mail/mail-folder-cache.c:787
 #, fuzzy, c-format
 msgid "Pinging %s"
 msgstr "Pregledujem %s"
@@ -15809,135 +16403,135 @@ msgstr "Pregledujem %s"
 msgid "Working"
 msgstr "Delam"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Mapa filtrov"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Sprejemanje pošte"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Pošiljam sporočilo %d od %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nisem uspel dešifrirati sporočila"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Končano."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Shranjujem sporočilo v mapo"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Prestavljam sporočila v %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram sporočila v %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pregledujem mape v \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Posredovana sporočila"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Odpiram shrambo %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Odstranjujem mapo %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Osvežujem mapo"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Uničujem mapo"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Uvažam %s kot %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Krajevne mape"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Prenašam sporočilo %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15946,7 +16540,7 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15955,11 +16549,11 @@ msgstr ""
 "Napaka ob shranjevanju sporočil v: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Shranjujem prilogo"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15968,17 +16562,17 @@ msgstr ""
 "Nisem mogel ustvariti izhodne datoteke: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisem model pisati podatkov: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Odklapljam se od %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Znova se povezujem z %s"
@@ -16044,24 +16638,24 @@ msgstr "Posodabljam..."
 msgid "Waiting..."
 msgstr "Čakam..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Uporabnik je dejanje preklical."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Vpišite geslo za %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Vpišite geslo"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Zapomni si to geslo"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 #, fuzzy
 msgid "_Remember this password for the remainder of this session"
 msgstr "Pomni geslo do konca seje"
@@ -16106,89 +16700,94 @@ msgstr "Posredovano sporočilo"
 msgid "Invalid folder: `%s'"
 msgstr "Odpiram mapo %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Nastavljam vMapo: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Posodabljam vmape za uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Posodabljam vmape za uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vMape"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Uredi VMapo"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Nova vMapa"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Nevideno"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Videno"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Odgovorjeno"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "več nevidenih sporočil"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Več sporočil"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "najnižja"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "nizka"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "visoka"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "najvišja"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Danes %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Včeraj %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Ustvarjam seznam sporočil"
 
@@ -16221,48 +16820,48 @@ msgstr "Sprejeto"
 msgid "Size"
 msgstr "Velikost"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 #, fuzzy
 msgid "Call"
 msgstr "Povratni klic"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 #, fuzzy
 msgid "Do Not Forward"
 msgstr "Posreduj naprej"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 #, fuzzy
 msgid "Follow-Up"
 msgstr "Navezava"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 #, fuzzy
 msgid "For Your Information"
 msgstr "Podatki o izvorni kodi"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Posreduj naprej"
 
-#: 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:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 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 "Odgovori vsem"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 #, fuzzy
 msgid "Review"
 msgstr "Predogled"
 
-#: mail/message-tag-followup.c:283 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 "FIXME: _Zastavica za nadaljevanje..."
@@ -16311,21 +16910,6 @@ msgstr "_Naroči se"
 msgid "_Unsubscribe"
 msgstr "_Prekliči naročnino"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolucijina lupina."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolucija"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolucijin veznik opravil"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16333,112 +16917,54 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Preimenuj to skupino bližnjic"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Preklopi prikaz vrstice z mapami"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Skrij vrstico z bližnjicami"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Privzeta prioriteta:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Privzeta prioriteta:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Vmesnik za nastavitev pošte"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-#, fuzzy
-msgid "Path to the default calendar folder"
-msgstr "Krajevno hranjenje nima privzete mape"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Odpiram mapo %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Krajevno hranjenje nima privzete mape"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Odpiram mapo %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-#, fuzzy
-msgid "Physical URI to the default mail folder"
-msgstr "Krajevno hranjenje nima privzete mape"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Odpiram mapo %s"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Preklopi prikaz vrstice z mapami"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Preklopi prikaz vrstice z bližnjicami"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-pošta"
@@ -16447,6 +16973,32 @@ msgstr "E-pošta"
 msgid "Brought to you by"
 msgstr "K vam prinešeno od"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Neznana napaka"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Neveljavni argumenti"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Ne morem se registrirati pri OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Podatkovna zbirka nastavitev ni bila najdena"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Generična napaka"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Neimenovana)"
@@ -16588,11 +17140,11 @@ msgstr "Nisem uspel dešifrirati sporočila"
 msgid "_Import"
 msgstr "Uvozi"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Prekinjam povezave..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 #, fuzzy
 msgid "Evolution Settings"
 msgstr "Evolucija "
@@ -16632,11 +17184,34 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Napaka ob izvajanju %s."
@@ -16651,14 +17226,15 @@ msgid "Bug buddy could not be run."
 msgstr "Programa 'Bug buddy' ni bilo mogoče pognati."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "_O Ximian Evoluciji..."
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Delaj na _mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Delaj _brez mreže"
 
@@ -16666,47 +17242,6 @@ msgstr "Delaj _brez mreže"
 msgid "Work Offline"
 msgstr "Delaj brez mreže"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolucija je v procesu odklapljanja od mreže."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Neveljavni argumenti"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Ne morem se registrirati pri OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Podatkovna zbirka nastavitev ni bila najdena"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Generična napaka"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -16781,6 +17316,51 @@ msgstr "Aktivne povezave"
 msgid "Click OK to close these connections and go offline"
 msgstr "Kliknite \"V redu\" za zaprtje povezav in nadalnje delo brez mreže"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "Koledar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Stiki: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "_Pošta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Naloge"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Vrsta mape:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "Ustvari _novo mapo..."
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Račun"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Ime mape:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Uporabniško ime:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolucijin druid za nastavitev"
@@ -16824,6 +17404,21 @@ msgstr ""
 "nastavitev Evolucije. \n"
 "Kliknite gumb \"Končaj\" za shranitev vaših nastavitev. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolucijina lupina."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolucija"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolucijin veznik opravil"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Kliknite \"Uvozi\" za pričetek uvoza datoteke v Evolucijo. "
@@ -16888,13 +17483,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija lahko uvozi podatke iz sledečih datotek:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16920,61 +17515,51 @@ msgstr ""
 "Upamo, da boste uživali sadove našega trdega dela in nestrpno\n"
 "pričakujemo vaše prispevke!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
 #, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Hvala,\n"
 "skupina Evolucije\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 #, fuzzy
 msgid "Don't tell me again"
 msgstr "Ne sprašuj me več"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ne morem dostopati do lupine Ximian Evolucije."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 #, fuzzy
 msgid "Start Evolution activating the specified component"
 msgstr "Evolucijina komponenta za povzetke."
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Začni v ne-mrežnem načinu"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Začni v mrežnem načinu"
 
-#: shell/main.c:504
+#: shell/main.c:503
 #, fuzzy
 msgid "Forcibly shut down all evolution components"
 msgstr "Tovarna komponent Evolucije zaznamkov."
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošlji razhroščevalna sporočila vseh komponent v datoteko."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16983,14 +17568,80 @@ msgstr ""
 "%s: --online in --ofline ne moreta biti uporabljena skupaj.\n"
 "  Uporabite %s --help za več podatkov.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Natisni Mojo evolucijo"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolucijin druid za račune"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "ID _certifikata:"
@@ -17239,12 +17890,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "ID _certifikata:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID vizitke že obstaja"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d/%m/%Y"
@@ -17466,6 +18111,12 @@ msgstr "Zadeva je %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID vizitke že obstaja"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17510,12 +18161,12 @@ msgstr "Zbriši to sporčilo"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nisem mogel izvršiti %s: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17579,7 +18230,8 @@ msgid "Select all contacts"
 msgstr "Izberi vse stike"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Pošlji poročilo izbranim stikom."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17611,8 +18263,8 @@ msgstr "Poglej trenutni stik"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Dejanja"
@@ -17630,7 +18282,8 @@ msgid "_Preview Pane"
 msgstr "Pano _predogleda"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Shrani kot vVizitko"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17765,11 +18418,21 @@ msgstr "Poglej trenutni stik"
 msgid "Week"
 msgstr "Teden"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Delavni teden"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Sestanek"
 
+#: 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 "_Zapri"
+
 #: 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
@@ -18102,6 +18765,16 @@ msgstr "_Obrni izbor"
 msgid "_Threaded Message List"
 msgstr "_Niten seznam sporočil"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Zapri"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18348,7 +19021,8 @@ msgid "Open the selected message in a new window"
 msgstr "Odpri izbrano sporočilo v novem oknu"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Odpri izbrano sporočilo v skladatelju za vnovično pošiljanje"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18468,59 +19142,46 @@ msgstr "vMapa glede na p_redmet"
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiraj v mapo"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "Iz sporočila _ustvari filter"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Po_jdi na"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Kot _del sporočila"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Večje"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Prikaz _sporočila"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Prestavi v mapo"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Naslednje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Običajen prikaz"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Odpri sporočilo"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Prejšnje sporočilo"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:127
-#, fuzzy
-msgid "_Resend..."
-msgstr "_Preimenuj..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Orodja"
@@ -18529,16 +19190,6 @@ msgstr "_Orodja"
 msgid "_Undelete"
 msgstr "O_dbriši"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Zapri"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -18944,6 +19595,11 @@ msgstr "Hitro iskanje"
 msgid "_Send / Receive"
 msgstr "_Oddaja / sprejem"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Išči sedaj"
+
 #: views/addressbook/galview.xml.h:1
 #, fuzzy
 msgid "By _Company"
@@ -19024,11 +19680,6 @@ msgstr "_Do datuma:"
 msgid "With _Status"
 msgstr "Nastavi stanje"
 
-#: views/tasks/galview.xml.h:3
-#, fuzzy
-msgid "_Tasks"
-msgstr "_Naloga"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19190,6 +19841,34 @@ msgstr "Drugo..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Napaka Evolucije"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolucija "
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Podatki o sestanku"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Alarm Evolucije"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Poslana sporočila in osnutki"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19312,6 +19991,35 @@ msgstr "Preizkus"
 msgid "Find _Now"
 msgstr "Išči sedaj"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 že obstaja\n"
+"Jo želite prepisati?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Nisem mogel odpreti URIja `%s':\n"
+"%s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Nisem mogel odpreti URIja `%s':\n"
+"%s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19323,8 +20031,152 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% končano)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Adresar"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolucijin pregledovalnik mini vizitk adresarja"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Naslov _2:"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolucijin pregledovalnik iTip/iMip"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Urejevalnik Evolucijinih novic"
+
+#~ msgid "Snoo_ze"
+#~ msgstr "Podal_jšek spanja"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nisem mogel inicializirati gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nisem mogel odpreti imenika v '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, ki naj ga prikaže brskalnik map"
+
+#, fuzzy
+#~ msgid "The type of view to show"
+#~ msgstr "Spremeni pogled na %s"
+
+#~ msgid "Display a message"
+#~ msgstr "Kaži sporočilo"
+
+#, fuzzy
+#~ msgid "Alerts"
+#~ msgstr "Alberta"
+
+#~ msgid "Time"
+#~ msgstr "Čas"
+
+#~ msgid "_Display"
+#~ msgstr "_Prikaz"
+
+#~ msgid "_General"
+#~ msgstr "_Splošno"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Izberi mapo"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Koledar"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Seznam _nalog"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Datoteke koledarja ni bilo mogoče posodobiti!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI mape nalog, ki naj se kaže"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nisem mogel naložiti nalog v `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolucijina komponenta za poštne mape."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "vMapa glede na Pošiljatelja"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filter glede na pošilja_telja"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Nisem uspel predpomniti sporočila %s: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, ki naj ga prikaže brskalnik map"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Preimenuj to skupino bližnjic"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Skrij vrstico z bližnjicami"
+
+#, fuzzy
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Krajevno hranjenje nima privzete mape"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Odpiram mapo %s"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Krajevno hranjenje nima privzete mape"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Odpiram mapo %s"
+
+#, fuzzy
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Krajevno hranjenje nima privzete mape"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Odpiram mapo %s"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Preklopi prikaz vrstice z mapami"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Preklopi prikaz vrstice z bližnjicami"
+
+#, fuzzy
+#~ msgid "Cannot register the Ximian Evolution shell."
+#~ msgstr "Ne morem dostopati do lupine Ximian Evolucije."
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ne morem inicializirati lupine Ximian Evolucije: %s"
+
+#, fuzzy
+#~ msgid "_Resend..."
+#~ msgstr "_Preimenuj..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19421,9 +20273,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Partner(ka):"
 
-#~ msgid "_Add"
-#~ msgstr "_Dodaj"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "_Službeni"
@@ -19474,17 +20323,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Task List Creation Assistant"
 #~ msgstr "Nastavitev"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Datum _pričetka:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Do datuma:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioriteta:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19515,14 +20353,6 @@ msgstr "%s (%d%% končano)"
 #~ "Nisem mogel odsekati datoteke: %s\n"
 #~ "%s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Nisem mogel izvesti klica 'seek' na datoteki: %s\n"
-#~ " %s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19676,10 +20506,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Predogled koledarja, ki bo natisnjen"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Vpišite geslo za %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Seznam _nalog"
 
@@ -19752,38 +20578,6 @@ msgstr "%s (%d%% končano)"
 #~ "%s"
 
 #, fuzzy
-#~ msgid "C_alendar:"
-#~ msgstr "Koledar"
-
-#, fuzzy
-#~ msgid "_Contacts:"
-#~ msgstr "Stiki: "
-
-#, fuzzy
-#~ msgid "_Mail:"
-#~ msgstr "_Pošta"
-
-#, fuzzy
-#~ msgid "_Tasks:"
-#~ msgstr "Naloge"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Vrsta mape:"
-
-#, fuzzy
-#~ msgid "_Account:"
-#~ msgstr "Račun"
-
-#, fuzzy
-#~ msgid "_Folder Name:"
-#~ msgstr "Ime mape:"
-
-#, fuzzy
-#~ msgid "_User:"
-#~ msgstr "_Uporabniško ime:"
-
-#, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Ustvari _nov sestanek"
 
@@ -20133,9 +20927,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Pomočnik"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Sledeče povezave so trenutno aktivne:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Išči po kontaktih"
 
@@ -20380,9 +21171,6 @@ msgstr "%s (%d%% končano)"
 #~ "To sporočilo ima elektronski podpis, a se ne da dokazati, da je "
 #~ "avtentično."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Napaka Evolucije"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20489,18 +21277,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Podatki o kodledarju"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Opomnilniki"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "Stanje:"
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Podatki o kodledarju"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Uvrstitev"
 
@@ -21581,10 +22357,6 @@ msgstr "%s (%d%% končano)"
 #~ msgstr "Mapa, ki vsebuje povzetek Evolucije"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Alarm Evolucije"
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolucijin setavljalnik pošte."
 
@@ -21701,9 +22473,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Connecticut"
 #~ msgstr "Connecticut"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Denver"
 #~ msgstr "Denver"
 
@@ -22341,9 +23110,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Shown"
 #~ msgstr "Sneži"
 
-#~ msgid "No tasks"
-#~ msgstr "Brez nalog"
-
 #~ msgid "(No Description)"
 #~ msgstr "(ni opisa)"
 
@@ -23333,10 +24099,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Move this folder to another place"
 #~ msgstr "Prestavi to mapo na drugo mesto"
 
-#, fuzzy
-#~ msgid "Open Other _User's Folder..."
-#~ msgstr "Ustvari _novo mapo..."
-
 #~ msgid "Open this folder in an other window"
 #~ msgstr "Odpri to mapo v drugem oknu"
 
@@ -23438,9 +24200,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Delete news feed"
 #~ msgstr "Vsi viri _novic:"
 
-#~ msgid "_Mail"
-#~ msgstr "_Pošta"
-
 #~ msgid "_Weather"
 #~ msgstr "_Vreme"
 
@@ -24185,9 +24944,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Delete selected signature"
 #~ msgstr "Zbriši izbran podpis"
 
-#~ msgid "Display"
-#~ msgstr "Prikaz"
-
 #~ msgid "E_mail address:"
 #~ msgstr "_E-poštni naslov:"
 
@@ -24891,9 +25647,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Nisem mogel odpreti imenika za novičkarski strežnik: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Ne morem odpreti ali ustvariti .newsrc datoteke za %s: %s"
-
 #~ msgid "Message was received"
 #~ msgstr "Sporočilo je bilo sprejeto"
 
@@ -25053,9 +25806,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Opomin na sestanek ob "
 
-#~ msgid "Snooze"
-#~ msgstr "Podaljšek spanja"
-
 #~ msgid ""
 #~ "It is %s.  The Unix time is %ld right now.  We just thought you may like "
 #~ "to know."
@@ -25109,9 +25859,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "No ciphertext to decrypt."
 #~ msgstr "Ni šifriranega besedila za dešifriranje."
 
-#~ msgid "IMAPv4"
-#~ msgstr "IMAPv4"
-
 #~ msgid "Standard Unix mailbox file"
 #~ msgstr "Običajna Unix datoteka poštnega predala"
 
@@ -25480,9 +26227,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Getting store for \"%s\""
 #~ msgstr "Dobivam shrambo za \"%s\""
 
-#~ msgid "Print My Evolution"
-#~ msgstr "Natisni Mojo evolucijo"
-
 #~ msgid "Printing of My Evolution failed"
 #~ msgstr "Tiskanje Moje evolucije ni uspelo"
 
@@ -25848,9 +26592,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Redo the undone action"
 #~ msgstr "Obnovi razveljavljeno dejanje"
 
-#~ msgid "Replace"
-#~ msgstr "Zamenjaj"
-
 #~ msgid "Replace a string"
 #~ msgstr "Zamenjaj niz"
 
@@ -26215,9 +26956,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Calendar Preferences..."
 #~ msgstr "Nastavitve koledarja..."
 
-#~ msgid "Create Rule"
-#~ msgstr "Ustvari pravilo"
-
 #~ msgid "Filter on Rec_ipients"
 #~ msgstr "Filtriraj glede na Prejemnike"
 
@@ -26281,9 +27019,6 @@ msgstr "%s (%d%% končano)"
 #~ msgid "Get store for \"%s\""
 #~ msgstr "Dobi shrambo za \"%s\""
 
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Prekliči naročnino na mapo \"%s\""
-
 #~ msgid ""
 #~ "\n"
 #~ "Mr.\n"
diff --git a/po/sq.po b/po/sq.po
index d534bd4c22..4b8aa3b1d0 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -23,6 +23,15 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Libri i adresave të Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr ""
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Alarmi i Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,15 +56,6 @@ msgstr "cards"
 msgid " card"
 msgstr "cards"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr ""
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Alarmi i Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Adresa sync e prezgjedhur:"
@@ -70,63 +70,20 @@ msgstr "I pamundur ngarkimi i librit të adresave"
 msgid "Could not read pilot's Address application block"
 msgstr "Nuk arrij të lexoj bllokun e adresave të pilot-it"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Plotësim automatik"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Çertifikimet"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Konfiguro këtu plotësimin automatik"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakte"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Libri i adresave të Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Pop-up i librit të adresave të Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Shikuesi i adresave të librit të adresave të Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Shikuesi i card nga libri i adresave të Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Komponenti i librit të adresave të Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Shikuesi i kartelave të librit të adresave të Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Hyrje anonime tek server-i LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Kontrolli i konfigurimit të rregullimit të kartelave të Evolution"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Autentifikimi dështoi.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Manazho këtu çertifikatat tuaja S/Mime"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sShkruaj password për %s (përdoruesi %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -167,42 +124,46 @@ msgstr "_Kontakt"
 msgid "Create a new contacts group"
 msgstr "Krijo një grup të ri shtigjesh"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Duke ngarkuar..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr ""
@@ -210,8 +171,8 @@ msgstr ""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Në këtë kompjuter"
 
@@ -219,7 +180,7 @@ msgstr "Në këtë kompjuter"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personale"
@@ -268,20 +229,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Hyrje anonime tek server-i LDAP"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Autentifikimi dështoi.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Rubrikë e re"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sShkruaj password për %s (përdoruesi %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -303,6 +286,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Plotësim automatik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakte"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Çertifikimet"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfiguro këtu plotësimin automatik"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Libri i adresave të Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Pop-up i librit të adresave të Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Shikuesi i adresave të librit të adresave të Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Shikuesi i card nga libri i adresave të Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Komponenti i librit të adresave të Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Kontrolli i konfigurimit të rregullimit të kartelave të Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -324,6 +362,7 @@ msgstr "  S_hfaq bazat e suportuara "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -396,7 +435,7 @@ msgstr "_Kontakt"
 msgid "Address Book Properties"
 msgstr "Buruesit e Librit të Adresave"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Gjithmonë"
@@ -411,107 +450,97 @@ msgid "Basic"
 msgstr "Të përgjithshme"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "N_gjyra"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Duke lidhur"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_Emri dallues:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_Emri dallues:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limiti i _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Adresa Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Adresa Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Bazat e suportuara të kërkimit"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Të përgjithshme"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Asnjëherë"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Një"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Zgjidh një ngjyrë"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: 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:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "F_usha e kërkimit: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Duke kërkuar"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -521,7 +550,7 @@ msgstr ""
 "in tuaj LDAP vetëm\n"
 "nëqoftëse serveri juaj LDAP suporton SSL apo TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -539,7 +568,7 @@ msgstr ""
 "është e\n"
 "sigurtë."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -553,19 +582,19 @@ msgstr ""
 "jeni i pambrojtur ndaj\n"
 "exploits. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Sub"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Bazat e suportuara të kërkimit"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -577,7 +606,7 @@ msgstr ""
 "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:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -592,7 +621,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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -600,7 +629,7 @@ 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -611,7 +640,7 @@ msgstr ""
 "numër \n"
 "tepër të madh do të ngadalsoni në menyrë të ndjeshme rubrikën tuaj."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -621,7 +650,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -630,7 +659,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -643,127 +672,135 @@ msgstr ""
 "tuaj të sistemit\n"
 "se çfarë porte duhet të përdorni."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Formati i orës:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Duke përdorur emër të përveçëm (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Duke përdorur adresën email"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Sa herë të jetë e mundur"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakt"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Limiti i _download:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Adresa Email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Metoda e _identifikimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Emri:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Numri i _portës:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Prioriteti i prezgjedhur:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Baza e _kërkimit:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Emri i _server-it:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "Emri i _server-it:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (në minuta):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "cards"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "gjuhëza-lidhjes"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "gjuhëza-e përgjithshme"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "gjuhëza-kërkimit"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Interfaqja për zgjedhjen e emrave të rubrikës së Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Hiqi të gjithë"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Hiq"
 
+#: 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 "Emri"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Hiqi të gjithë"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Shfaq listën e kontakteve"
@@ -786,23 +823,15 @@ msgstr "Shtoje tek kontaktet"
 msgid "Unnamed Contact"
 msgstr "Kontakt pa emër"
 
-#: 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
-msgid "Name"
-msgstr "Emri"
-
 #: 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
 msgid "Source"
 msgstr "Buruesi"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Interfaqja për zgjedhjen e emrave të rubrikës së Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -875,141 +904,142 @@ msgid "<b>Work</b>"
 msgstr "Java punuese"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresa _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Për_kujtimore:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Asistenti"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Ditë_lindja:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr ""
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alendari:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Qy_teti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Shoqëria"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Editori i kontakteve"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Shtet_i:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Dipartimenti:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL i lirë/i zënë:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Emri dhe _mbiemri..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Shtëpi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Bashko adresën E-Mail"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Manazhuesi"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nickname:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Shë_nime:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Tjetër"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Kutia e postës:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1037,9 +1067,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Punësim"
@@ -1071,23 +1101,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Jeni i sigurt që dëshiron\n"
+"të eleminosh këto kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Jeni i sigurt që dëshiron\n"
+"të eleminosh këtë kontakt?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "I ndryshueshëm"
 
@@ -2066,97 +2112,113 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr ""
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Buruesi"
-
-#: 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 "Pozicioni:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "Riemërto"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grupi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Buruesi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Kontakt i Ri"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Fusha të ndryshueshme"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Ndryshuar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ky kontak u takon këtyre kategorive:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+msgid "Please select an image for this contact"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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-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 "Buruesi"
+
+#: 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 "Pozicioni:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "Riemërto"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Shtimi i shpejtë i një kontakti"
@@ -2174,22 +2236,6 @@ msgstr "Emri dhe _mbiemri:"
 msgid "E-_mail:"
 msgstr "E-_mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Jeni i sigurt që dëshiron\n"
-"të eleminosh këto kontakte?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Jeni i sigurt që dëshiron\n"
-"të eleminosh këtë kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2339,8 +2385,8 @@ msgstr "editor i listës së kontakteve"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Libri"
 
@@ -2401,6 +2447,465 @@ 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
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Anëtarë"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizata"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Përshkrimi:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupi"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Telefoni në makinë"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Punësim"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Celulari"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Personale"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Shënim"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Titulli:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax në shtëpi"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Në rregull"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Depozita është jashtë linje"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Leja nuk u pranua"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, 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
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokoll i pasuportuar"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Anulluar"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Identifikimi dështoi"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Është i nevojshëm identifikimi"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+msgid "No such source"
+msgstr ""
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Gabim tjetër"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Nuk arrijmë të hapim këtë libër adresash.  Kjo do të thotë\n"
+"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
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Nuk arrijmë të hapim këtë libër adresash.  Kjo do të thotë\n"
+"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
+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 ""
+"Kësaj kërkese i përgjigjet një numër më i madh cards nga sa \n"
+"ky server është konfiguruar të përgjigjet apo Evolution është \n"
+"konfiguruar të shfaqë. Ju lutem kryeni një kërkim më preciz ose\n"
+"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
+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 ""
+"Koha e ekzekutimit të kësaj kërkese ka kapërcyer limitin e server-it apo\n"
+"limitin që keni konfiguruar për këtë libër adresash.  Ju lutem kryeni një "
+"kërkim\n"
+"më preciz ose rikonfiguro limitin e kohës tek preferimet e server-it të "
+"directory\n"
+"për këtë libër adresash."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Gabim gjatë shtimit të card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Gabim gjatë ndryshimit të listës"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Gabim gjatë ndryshimit të card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Gabim gjatë eleminimit të card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s ekziston\n"
+"Dëshiron t'a mbishkruash?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Lëviz card tek"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopjo card tek"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Lëviz cards tek"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopjo cards tek"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Zgjidh kontaktet nga rubrika"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "VCards shumëfishe"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard për %s"
+
+#.
+#. * 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 "(asnjë)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Email kryesor"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Zgjidh një veprim"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Krijo një kontakt të ri \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Shtoja adresën një kontakti ekzistues \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Duke konsultuar Librin e Adresave..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Ndrysho informacionet e kontaktit"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Bashko adresën E-Mail"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "dhe një card tjetër."
+msgstr[1] "dhe një card tjetër."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "VCards shumëfishe"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Ruaj kontaktin si VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Ruaje në rubrikë"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2416,8 +2921,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Pyetje"
 
@@ -2472,9 +2977,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Ruaje si VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2542,7 +3048,7 @@ msgid "Cut"
 msgstr "Prije"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2553,18 +3059,8 @@ msgstr "Kopjo"
 msgid "Paste"
 msgstr "Ngjit"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Elemino"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Paraqitja aktuale"
 
@@ -2580,7 +3076,7 @@ msgstr ""
 "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:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Çdo kategori"
@@ -2621,21 +3117,6 @@ msgstr "Kategoritë"
 msgid "Company Phone"
 msgstr "Telefoni i ndërmarrjes"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Mbiemri"
@@ -2675,29 +3156,14 @@ msgstr "Jordan"
 msgid "Manager"
 msgstr "Manazhuesi"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Celulari"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nickname"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Shënim"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Zyrë"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizata"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax tjetër"
@@ -2751,21 +3217,29 @@ msgstr "Pa titull"
 msgid "Web Site"
 msgstr "Siti web"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Gjerësia"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Lartësia"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Ka fokusin"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "I zgjedhur"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Ka kursorin"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Fusha"
@@ -2782,10 +3256,6 @@ msgstr "Modeli i tekstit"
 msgid "Max field name length"
 msgstr "Gjatësia maksimum e emrit të fushës"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Gjërësia e kollonës"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2814,439 +3284,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adaptues"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "I zgjedhur"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Ka kursorin"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Anëtarë"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Email"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Përshkrimi:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupi"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Telefoni në makinë"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Punësim"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Personale"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Titulli:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax në shtëpi"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Në rregull"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Depozita është jashtë linje"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Rubrika nuk ekziston"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Leja nuk u pranua"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Card nuk u gjet"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "ID e card ekziston"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokoll i pasuportuar"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Anulluar"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Identifikimi dështoi"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Është i nevojshëm identifikimi"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-msgid "No such source"
-msgstr ""
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Gabim tjetër"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Nuk arrijmë të hapim këtë libër adresash.  Kjo do të thotë\n"
-"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:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Nuk arrijmë të hapim këtë libër adresash.  Kjo do të thotë\n"
-"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:140
-msgid "Unable to open addressbook"
-msgstr "E pamundur hapja e librit të adresave"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Kësaj kërkese i përgjigjet një numër më i madh cards nga sa \n"
-"ky server është konfiguruar të përgjigjet apo Evolution është \n"
-"konfiguruar të shfaqë. Ju lutem kryeni një kërkim më preciz ose\n"
-"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:167
-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 ""
-"Koha e ekzekutimit të kësaj kërkese ka kapërcyer limitin e server-it apo\n"
-"limitin që keni konfiguruar për këtë libër adresash.  Ju lutem kryeni një "
-"kërkim\n"
-"më preciz ose rikonfiguro limitin e kohës tek preferimet e server-it të "
-"directory\n"
-"për këtë libër adresash."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Kjo kërkesë nuk u plotësua me sukses."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Dëshiron të ruash ndryshimet e kryera?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Anullo"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Gabim gjatë shtimit të listës"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Gabim gjatë shtimit të card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Gabim gjatë ndryshimit të listës"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Gabim gjatë ndryshimit të card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Gabim gjatë eleminimit të listës"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Gabim gjatë eleminimit të card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s ekziston\n"
-"Dëshiron t'a mbishkruash?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Mbishkruaj"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Lëviz card tek"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopjo card tek"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Lëviz cards tek"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopjo cards tek"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Zgjidh kontaktet nga rubrika"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "VCards shumëfishe"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard për %s"
-
-#.
-#. * 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 "(asnjë)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Email kryesor"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Zgjidh një veprim"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Krijo një kontakt të ri \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Shtoja adresën një kontakti ekzistues \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Duke konsultuar Librin e Adresave..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Ndrysho informacionet e kontaktit"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Bashko adresën E-Mail"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "dhe një card tjetër."
-msgstr[1] "dhe një card tjetër."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "VCards shumëfishe"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Ruaj kontaktin si VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Ruaje në rubrikë"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Gjërësia e kollonës"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3293,11 +3333,6 @@ msgstr "Shfaqësi i kalendarit të Evolution"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Printo zarfin"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3309,6 +3344,11 @@ msgstr "Printo cards"
 msgid "Print contact"
 msgstr "Gjej kontaktin në"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Printo zarfin"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3495,18 +3535,6 @@ msgstr "_Lista e kontakteve"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Hap file"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Card nuk u gjet"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3564,6 +3592,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Hap file"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Card nuk u gjet"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr ""
@@ -3576,11 +3616,12 @@ msgstr ""
 msgid "No filename provided."
 msgstr ""
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Listë pa emër"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Password"
@@ -3613,121 +3654,55 @@ msgstr "Prioriteti i prezgjedhur:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "I pamundur leximi i aplikativëve që duhen bërë të Pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendari dhe aktivitetet"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-"Konfiguro këtu zonën tënde të orës, kalendarin dhe listën e aktiviteteve"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Kalendari dhe aktivitetet e Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrolli i konfigurimit të kalendarit të Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Shfaqësi i mesazheve të skadimit të afateve të kalendarit të Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Shfaqësi i kalendarit të Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Editori i kalendarit/aktiviteteve të Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Shikuesi i aktiviteteve të Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Aktivitete"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Shërbimi i njoftimit të alarmit të kalendarit të Evolution"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Fillimi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Mbarimi:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Alarmi i Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm tek %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "M_byll"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Z_ilja"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Zilja (në minuta)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Ndrysho takimet"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Z_ilja"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Hap"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Asnjë përshkrim."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3736,12 +3711,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Kujdes"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3753,7 +3728,7 @@ msgstr ""
 "ky paralajmërim kërkon nisjen e një mesazhi email.  Për këtë,\n"
 "Evolution do të hapë një mesazh normal viziv (në ekran)."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3770,19 +3745,19 @@ msgstr ""
 "\n"
 "Dëshironi me të vërtetë që ky program të ekzekutohet?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Mos më pyet më për këtë program."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Shërbimi i njoftimit të alarmit të kalendarit të Evolution"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "E pamundur nisja e Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "E pamundur nisja e gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr ""
 "I pamundur krijimi i fabrikës për shërbimin e njoftimit të paralajmërimit "
@@ -3896,183 +3871,178 @@ 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 "_Kërko konfermimin para se të eleminosh elementët"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Kërko konfermimin para se të eleminosh elementët"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "_Fshih aktivitetet e plotësuara mbas"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Shfaq _numrat e javëve"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Përmbledhja përmban"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Përshkrimi përmban"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komenti përmban"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Përshkrimi përmban"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Jo korrispondues"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendari"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "ditë"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Pronësitë..."
+#: calendar/gui/calendar-component.c:623
+msgid "Failed upgrading calendars."
+msgstr ""
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Takim i ri"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Takim"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Krijo një takim të ri"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Mbledhje e re"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "Mbl_edhje"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Krijo një kërkesë të re për mbledhje"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Takim i ri i përditshëm"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Takim i _përditshëm"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Krijo një takim të ri të përditshëm"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alendari:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Krijo një kontakt të ri"
@@ -4103,15 +4073,36 @@ msgstr "Paraqitja javore"
 msgid "Month View"
 msgstr "Paraqitja mujore"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Përmbledhja përmban"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Përshkrimi përmban"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komenti përmban"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Përshkrimi përmban"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Jo korrispondues"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Gabim gjatë hapjes së kalendarit"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metodë e pasuportuar gjatë hapjes së kalendarit"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Nuk ke të drejtë të hapësh kalendarin"
 
@@ -4120,19 +4111,6 @@ msgstr "Nuk ke të drejtë të hapësh kalendarin"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "E pamundur hapja e kartelës tek '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI që do të shfaqë kalendari"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Lloji i paraqitjes që duhet shfaqur"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opcionet e alarmit audio"
@@ -4200,7 +4178,7 @@ msgstr "kohë më tepër çdo"
 msgid "hours"
 msgstr "orë"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4220,14 +4198,14 @@ msgstr "Të përgjithshme"
 msgid "Date/Time:"
 msgstr "Data/Ora:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Shfaq një mesazh"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Lësho një tingull"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4243,6 +4221,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
 msgid "Summary:"
 msgstr "Përmbledhja:"
@@ -4281,10 +4260,108 @@ msgstr "minutë(a)"
 msgid "start of appointment"
 msgstr "fillimit të takimit"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "New Caledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Lista e aktiviteteve"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "New Caledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Lloji:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Aktiv"
 
@@ -4302,19 +4379,19 @@ msgstr "Hiq"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Ç'aktivo"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aktivo"
 
@@ -4339,165 +4416,177 @@ msgid "60 minutes"
 msgstr "60 minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alarme"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Gjendja:</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Gjendja:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Lista e aktiviteteve"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Gjendja:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Java punuese"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Konfigurimi i kalendarit dhe aktiviteteve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Ngjyra për aktivitetet e skaduara"
 
-#: 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 "Ngjyra për aktivitetet e sotme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Funde dit_e:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Ditët"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Shfaq"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr ""
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "E premte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Orë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuta"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "E hënë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "D_ie"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "E shtunë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Sh_faq një përkujtues"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Shfaq _numrat e javëve"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "E djelë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "A_ktivitetet për ditën e sotme:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "E_nj"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Lista e aktiviteteve"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "E enjte"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-#, fuzzy
-msgid "Time"
-msgstr "Titulli"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Zona e orës:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Formati i orës:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "E martë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Fillim jav_e:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "E mërkurë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Java punuese"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Ditët e punës:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 orë (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 orë"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Shto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Kërko konfermimin para se të eleminosh elementët"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Kompreso fundjavën tek paraqitja mujore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Fillimi i _ditës:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Shfaq"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4507,143 +4596,46 @@ msgstr "_Shfaq"
 msgid "_Edit"
 msgstr "_Ndrysho"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr ""
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Pre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_E përgjithshme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Fshih aktivitetet e plotësuara mbas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Hën"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Aktivitete të skaduara:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sht"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Shfaq skadimet e takimeve tek paraqitjet javore dhe mujore"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Ndarja e _kohës:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Mar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Mër"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "para çdo takimi"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "New Caledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Lista e aktiviteteve"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Kalendari"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "New Caledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Lloji:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr ""
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4723,82 +4715,82 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Nuk keni kryer ndryshime, rifreskoj editorin?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Gabim gjatë vleftësimit: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " për "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (U plotësua "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "U plotësua"
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Skadimi "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Skadimi "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "I pamundur rifreskimi i objektit"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Ndrysho takimin"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Takimi - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Aktiviteti - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Zë i ditarit - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Asnjë përmbledhje"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Ruaje si..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Ndryshimet e kryera në këtë element mund të anullohen nëse arrin një "
 "rifreskim"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "E pamundur marrja e versionit aktual!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Gabim gjatë vleftësimit: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " për "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (U plotësua "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "U plotësua"
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Skadimi "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Skadimi "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4925,27 +4917,27 @@ msgstr ""
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 ""
 
@@ -4957,7 +4949,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr ""
 
@@ -5046,10 +5038,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5068,15 +5060,15 @@ msgstr ""
 msgid "At least one attendee is required."
 msgstr ""
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr ""
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5354,27 +5346,20 @@ msgstr ""
 msgid "Save Event"
 msgstr ""
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Zgjidh emrat"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Zgjidh një veprim"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalendari"
+msgid "_Destination"
+msgstr "Lëvize tek kartela..."
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
-msgstr "Aktivitet i ri"
+msgid "Task List"
+msgstr "Lista e aktiviteteve"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5402,38 +5387,44 @@ msgid "% _Complete"
 msgstr "U kompletua"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "I përfunduar"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "E lartë"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Në zhvillim"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "E ulët"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Për t'u filluar"
 
@@ -5471,11 +5462,11 @@ msgstr "Faqja"
 msgid "Assignment"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "E pamundur hapja e librit të adresave"
@@ -5484,8 +5475,9 @@ msgstr "E pamundur hapja e librit të adresave"
 msgid "Con_fidential"
 msgstr ""
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Përshkrimi:"
@@ -5638,102 +5630,56 @@ msgstr ""
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Publik"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Në konfidencë"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-#, fuzzy
-msgid "End Date"
-msgstr "Data"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Përmbledhja"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "I lirë"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "I zënë"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Pa titull"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Data e lindjes"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Data:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Pozicioni gjeografik duhet të jetë i formatit: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Gjëndja:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "Prioriteti i prezgjedhur:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Jo"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Faqja"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "E panjohur"
+#: 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 "Publik"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-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 "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Caktuar"
+#: 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 "Në konfidencë"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5779,17 +5725,26 @@ msgstr ""
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "I lirë"
+
+#: 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 "I zënë"
+
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr ""
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Hap"
 
@@ -5798,41 +5753,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_Printo..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Ngjite"
 
@@ -5890,78 +5846,158 @@ msgstr ""
 msgid "Start date"
 msgstr "Data e lindjes"
 
+#: 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 "Përmbledhja"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Zgjidhe _të gjithë"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "I zgjedhur"
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopjoje tek kartela..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Lëvize tek kartela..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr ""
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr ""
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+#, fuzzy
+msgid "End Date"
+msgstr "Data"
+
+#: 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: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-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 "E panjohur"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr ""
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Jo"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+#: 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 ""
+"Pozicioni gjeografik duhet të jetë i formatit: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5982,35 +6018,35 @@ msgid ""
 "%s"
 msgstr ""
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
+#. 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 ""
+
+#. 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 ""
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 ""
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 ""
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr ""
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
 msgstr ""
 
 #: calendar/gui/e-itip-control.c:592
@@ -6118,10 +6154,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Gjëndja:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6151,7 +6183,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6364,59 +6396,55 @@ msgstr ""
 msgid "The attachment has no viewable calendar items"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr ""
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr ""
 
@@ -6533,28 +6561,6 @@ msgstr ""
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr ""
-
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 ""
-
-#. 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 ""
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr ""
@@ -6615,81 +6621,163 @@ msgstr ""
 msgid "Meeting _end time:"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 ""
+
+#. 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 ""
+
+#. 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 ""
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+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
 #, c-format
 msgid ""
 "Error on %s:\n"
 " %s"
 msgstr ""
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr ""
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
 "%s"
 msgstr "Gabim gjatë ruajtjes së %s: %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Duke ngarkuar..."
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Aktivitete"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Takimi - %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Duke ngarkuar..."
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Printo"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendari dhe aktivitetet"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr ""
+"Konfiguro këtu zonën tënde të orës, kalendarin dhe listën e aktiviteteve"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Kalendari dhe aktivitetet e Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrolli i konfigurimit të kalendarit të Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Shfaqësi i mesazheve të skadimit të afateve të kalendarit të Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Editori i kalendarit/aktiviteteve të Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendari"
+
+#: 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 "Prill"
@@ -6827,6 +6915,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Nuk ke të drejtë të hapësh kalendarin"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "E pamundur hapja e librit të adresave"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1-ri"
@@ -7046,7 +7151,7 @@ msgid "Contacts: "
 msgstr ""
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Pamja e parë e printimit"
 
@@ -7058,68 +7163,78 @@ msgstr ""
 msgid "Print Setup"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Lista e aktiviteteve"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "I zgjedhur"
+msgstr[1] "I zgjedhur"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Duke ngarkuar..."
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Aktivitet i ri"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Aktivitet"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Krijo një aktivitet të ri"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Aktivitet i ri"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Lista e aktiviteteve"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Krijo një aktivitet të ri"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr ""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7127,11 +7242,11 @@ msgid ""
 "Really erase these tasks?"
 msgstr ""
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr ""
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr ""
 
@@ -8772,7 +8887,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr ""
@@ -8865,29 +8980,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr ""
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr ""
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr ""
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8919,7 +9011,46 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr ""
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+msgid "(match-threads) expects an array result"
+msgstr ""
+
+#: camel/camel-folder-search.c:791
+msgid "(match-threads) requires the folder set"
+msgstr ""
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr ""
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8927,42 +9058,42 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr ""
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8970,99 +9101,99 @@ msgid ""
 "%s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr ""
 
-#: camel/camel-lock-client.c:100
+#: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
-msgid "Cannot build locking helper pipe: %s"
+msgid "Could not create lock file for %s: %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:113
+#: camel/camel-lock.c:154
 #, c-format
-msgid "Cannot fork locking helper: %s"
+msgid "Timed out trying to get lock file on %s. Try again later."
 msgstr ""
 
-#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
+#: camel/camel-lock.c:209
 #, c-format
-msgid "Could not lock '%s': protocol error with lock-helper"
+msgid "Failed to get lock using fcntl(2): %s"
 msgstr ""
 
-#: camel/camel-lock-client.c:204
+#: camel/camel-lock.c:272
 #, c-format
-msgid "Could not lock '%s'"
+msgid "Failed to get lock using flock(2): %s"
 msgstr ""
 
-#: camel/camel-lock.c:92 camel/camel-lock.c:113
+#: camel/camel-lock-client.c:100
 #, c-format
-msgid "Could not create lock file for %s: %s"
+msgid "Cannot build locking helper pipe: %s"
 msgstr ""
 
-#: camel/camel-lock.c:154
+#: camel/camel-lock-client.c:113
 #, c-format
-msgid "Timed out trying to get lock file on %s. Try again later."
+msgid "Cannot fork locking helper: %s"
 msgstr ""
 
-#: camel/camel-lock.c:209
+#: camel/camel-lock-client.c:191 camel/camel-lock-client.c:214
 #, c-format
-msgid "Failed to get lock using fcntl(2): %s"
+msgid "Could not lock '%s': protocol error with lock-helper"
 msgstr ""
 
-#: camel/camel-lock.c:272
+#: camel/camel-lock-client.c:204
 #, c-format
-msgid "Failed to get lock using flock(2): %s"
+msgid "Could not lock '%s'"
 msgstr ""
 
 #: camel/camel-movemail.c:107
@@ -9297,7 +9428,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr ""
 
@@ -9488,8 +9619,9 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
-msgstr ""
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9505,7 +9637,7 @@ msgstr "E pamundur hapja e kartelës tek '%s'"
 msgid "Failed to add data to CMS encoder"
 msgstr "Lidhja me server-in LDAP dështoi"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Autentifikimi dështoi.\n"
@@ -9571,94 +9703,94 @@ msgstr "E pamundur hapja e kartelës tek '%s'"
 msgid "Cannot set message digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "ID e card ekziston"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 msgid "Can't find signature digests"
 msgstr ""
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 msgid "Decoder failed"
 msgstr ""
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 msgid "Can't create CMS Message"
 msgstr ""
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Krijo një kontakt të ri"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Lidhja me server-in LDAP dështoi"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 msgid "import keys: unimplemented"
 msgstr ""
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9675,16 +9807,26 @@ msgstr "E pamundur hapja e kartelës tek '%s'"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr ""
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr ""
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr ""
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Koshi"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9806,7 +9948,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9815,11 +9957,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr ""
 
@@ -9836,7 +9978,7 @@ msgid ""
 msgstr ""
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9846,28 +9988,28 @@ msgid ""
 "Do you wish to accept?"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
 "Issuer: %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9879,17 +10021,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr ""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr ""
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9898,11 +10040,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr ""
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr ""
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9919,10 +10056,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #: 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 ""
@@ -9954,6 +10093,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9973,26 +10113,304 @@ msgstr ""
 msgid "Checklist"
 msgstr "lista"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%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
+#, c-format
+msgid "IMAP4 server %s unexpectedly disconnected: %s"
+msgstr ""
+
+#: 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 "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-folder.c:866
+#, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Bad command"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%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 "Kartela"
+
+#: 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
+msgid "IMAPv4rev1"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:55
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, c-format
+msgid "IMAP server %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:167
+#: camel/providers/imap/camel-imap-store.c:431
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 ""
+
+#: 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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: 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: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/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:1109
+msgid "Unknown error"
+msgstr "Gabim i panjohur"
+
+#: 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 "%sShkruaj password për %s (përdoruesi %s)"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Identifikimi me server-in LDAP dështoi"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Emri i kartelës nuk mund të përmbajë shenjën \"#\"."
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Shoqëria"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operacioni u anullua"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 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:1089
-msgid "Unknown error"
-msgstr "Gabim i panjohur"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10035,21 +10453,21 @@ msgstr ""
 msgid "Could not load summary for %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10063,25 +10481,25 @@ msgid ""
 "  %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr ""
 
@@ -10122,23 +10540,6 @@ msgstr "Lidhja me server-in LDAP dështoi"
 msgid "Command:"
 msgstr "Shoqëria"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Kartela"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr ""
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10159,86 +10560,43 @@ msgstr ""
 msgid "For reading and storing mail on IMAP servers."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 ""
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS jo në dispozicion"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10246,25 +10604,18 @@ msgid ""
 "\n"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Emri i kartelës nuk mund të përmbajë shenjën \"#\"."
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr ""
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10272,7 +10623,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr ""
@@ -10372,58 +10723,58 @@ msgid ""
 "May also be used to read a tree of Elm, Pine, or Mutt style folders."
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:145
+#: 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:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr ""
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 ""
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10489,7 +10840,7 @@ msgstr ""
 msgid "not a maildir directory"
 msgstr ""
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10813,7 +11164,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10822,8 +11173,8 @@ msgid "User cancelled"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10832,46 +11183,46 @@ msgstr ""
 msgid "Cannot get message %s: %s"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "E pamundur hapja e kartelës tek '%s'"
@@ -10985,8 +11336,9 @@ msgid "Could not get group: %s"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
-msgstr ""
+#, fuzzy
+msgid "Could not get messages: unspecified error"
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
 #, c-format
@@ -11038,8 +11390,8 @@ msgstr ""
 msgid "Retrieving POP message %d"
 msgstr ""
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr ""
 
@@ -11469,7 +11821,7 @@ msgstr ""
 msgid "%.0fG"
 msgstr ""
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr ""
 
@@ -11513,6 +11865,89 @@ msgstr "Tipi MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr ""
 
+#: composer/e-msg-composer.c:704
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+
+#: composer/e-msg-composer.c:711
+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 "Hap file"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr ""
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "Mesazhi"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Hap file"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+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.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 ""
@@ -11591,195 +12026,131 @@ msgstr ""
 msgid "Attach file(s)"
 msgstr ""
 
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
+msgid "You cannot attach the file `${0}' to this message."
 msgstr ""
 
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Hap file"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "Mesazhi"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Hap file"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. 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."
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
+#, fuzzy
+msgid "Unfinished messages found"
+msgstr "Mesazhi"
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Dëshiron të ruash ndryshimet e kryera?"
 
-#: composer/e-msg-composer.c:3137
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
-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/mail-composer-errors.xml.h:17
+#, fuzzy
+msgid "Don't Recover"
+msgstr "Hiq"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
+#: composer/mail-composer-errors.xml.h:18
+#, fuzzy
+msgid "Recover"
+msgstr "Hiq"
 
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
+msgid "Could not save to autosave file \"{0}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
+msgid "Error saving to autosave because \"{1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. 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 "Jeni i sigurt që dëshironi të eleminoni këtë takim pa emër?"
 
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:6
+#. 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/mail-composer-errors.xml.in.h:7
-#, fuzzy
-msgid "Could not create message."
-msgstr "E pamundur hapja e kartelës tek '%s'"
-
-#: composer/mail-composer-errors.xml.in.h:8
-msgid "Could not read signature file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:9
-msgid "Could not save to autosave file \"{0}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
 msgid "Discard Changes"
 msgstr "_Anullo"
 
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Dëshiron të ruash ndryshimet e kryera?"
-
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Hiq"
-
-#: composer/mail-composer-errors.xml.in.h:14
-msgid "Error saving to autosave because \"{1}\"."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:15
-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.in.h:16
-#, fuzzy
-msgid "Recover"
-msgstr "Hiq"
-
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "_Kërko në mesazh..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
-#, fuzzy
-msgid "Unfinished messages found"
-msgstr "Mesazhi"
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
+msgid "Could not read signature file \"{0}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-msgid "You cannot attach the file `${0}' to this message."
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
 msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 ""
 
@@ -11898,7 +12269,8 @@ msgid ""
 "Overwrite it?"
 msgstr ""
 
-#: e-util/e-dialog-utils.c:251
+#. 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 ""
 
@@ -12075,74 +12447,90 @@ msgstr ""
 msgid "_Filter Rules"
 msgstr "Filtra"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-msgid "File \"{0}\" does not exist or is not a regular file."
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
+msgid "Missing date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:4
-msgid "Missing date."
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "_Emri dallues:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr ""
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr ""
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "Lëvize tek kartela..."
 
-#: filter/filter-errors.xml.in.h:7
-#, fuzzy
-msgid "Missing name."
-msgstr "_Emri dallues:"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr ""
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "_Emri dallues:"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12155,66 +12543,11 @@ msgstr ""
 msgid "<b>Then</b>"
 msgstr "<b>Gjendja:</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr ""
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "I rëndësishëm"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr ""
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr ""
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Emri i stilit:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Pa titull"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Gjendja:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr ""
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr ""
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr ""
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12300,6 +12633,75 @@ 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
+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
+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
+msgid "Later"
+msgstr ""
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Emri i stilit:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Gjendja:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr ""
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr ""
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Përkujtesë"
+
+#: filter/filter-rule.c:877
+msgid "Replies and parents"
+msgstr ""
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Përfshi:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr ""
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr ""
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12430,7 +12832,7 @@ msgstr ""
 msgid "Junk Test"
 msgstr "Qershor"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketë"
@@ -12470,7 +12872,7 @@ msgstr "Përfundo programin"
 msgid "Play Sound"
 msgstr ""
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr ""
 
@@ -12540,9 +12942,9 @@ msgstr ""
 msgid "Stop Processing"
 msgstr ""
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 ""
@@ -12612,101 +13014,59 @@ msgstr "Komenti përmban"
 msgid "Virtual _Folders"
 msgstr "_Kartela:"
 
-#: filter/vfolder-rule.c:572
-msgid "VFolder source"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr ""
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Posta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr ""
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Shto"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
+#: filter/vfolder-rule.c:573
+msgid "VFolder source"
 msgstr ""
 
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr ""
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr ""
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr ""
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Pa emër"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr ""
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr ""
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr ""
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr ""
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr ""
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr ""
 
@@ -12744,536 +13104,562 @@ msgstr ""
 msgid "Create New Folder"
 msgstr ""
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "Lëvize tek kartela..."
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr ""
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr ""
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr ""
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Duke ngarkuar..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Kopjoje tek kartela..."
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Opcionet e alarmit me mesazh"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "_Lëviz..."
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Anullo"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopjo"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Lëvize tek kartela..."
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr ""
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr ""
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Shfaq"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Hape në një dritare të re"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "_Lëviz..."
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr ""
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Riemërto"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr ""
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr ""
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Printo"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr ""
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr ""
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr ""
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Vazhdo"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr ""
 
-#: mail/em-folder-view.c:787 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 ""
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr ""
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr ""
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr ""
 
-#: mail/em-folder-view.c:791 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 ""
 
-#: mail/em-folder-view.c:792 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 ""
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr ""
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr ""
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr ""
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtra"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr ""
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr ""
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr ""
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr ""
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr ""
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr ""
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr ""
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr ""
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr ""
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr ""
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr ""
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "E prezgjedhur"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr ""
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr ""
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr ""
 
-#: mail/em-folder-view.c:2214
-#, c-format
-msgid "Click to open %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/message-tag-followup.c:325
+msgid "From"
 msgstr ""
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
-#, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "Jo korrispondues"
-
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Caktuar"
-
-#: mail/em-format-html-display.c:646
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
+#: 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-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
+#: 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-html-display.c:647
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
+#: 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 ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Argumente të pavlefshme"
-
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
+#: 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 ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
-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-html-display.c:649
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
+#: mail/em-format.c:757 mail/em-format-html.c:1584 mail/em-mailer-prefs.c:89
+msgid "Newsgroups"
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "E pa përcaktuar"
-
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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."
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
 msgstr ""
 
-#: mail/em-format-html-display.c:657
-msgid ""
-"This message is encrypted.  It would be difficult for an outsider to view "
-"the content of this message."
-msgstr ""
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Operacion i pasuportuar"
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Gabim gjatë ndryshimit të card"
 
-#: mail/em-format-html-display.c:658
-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."
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:755
-msgid "_View Certificate"
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
 msgstr ""
 
-#: mail/em-format-html-display.c:770
-msgid "This certificate is not viewable"
-msgstr ""
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Caktuar"
 
-#: mail/em-format-html-display.c:1002
-msgid "Completed on %B %d, %Y, %l:%M %p"
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
 msgstr ""
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
-msgid "Overdue:"
-msgstr "_Aktivitete të skaduara:"
-
-#: mail/em-format-html-display.c:1013
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr ""
+msgid "Invalid signature"
+msgstr "Argumente të pavlefshme"
 
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
-msgid "_Hide"
-msgstr "Fshih"
+msgid "Unencrypted"
+msgstr "E pa përcaktuar"
 
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr ""
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr ""
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr ""
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr ""
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr ""
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 msgid "Formatting message"
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Manazhuesi i postës"
+
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
+#. 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "Jo korrispondues"
+
+#: mail/em-format-html-display.c:644
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
 msgstr ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
+#: 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 ""
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Manazhuesi i postës"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
+#: 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."
 msgstr ""
 
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Data"
+#: 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."
+msgstr ""
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: 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 ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
+#: 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 ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
+#: mail/em-format-html-display.c:757
+msgid "_View Certificate"
 msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:772
+msgid "This certificate is not viewable"
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
+#: mail/em-format-html-display.c:1007
+msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr ""
 
-#: mail/em-format.c:1339
+#: mail/em-format-html-display.c:1015
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "Operacion i pasuportuar"
+msgid "Overdue:"
+msgstr "_Aktivitete të skaduara:"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1018
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr ""
+
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr ""
+
+#: mail/em-format-html-display.c:1089
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "Gabim gjatë ndryshimit të card"
+msgid "_Hide"
+msgstr "Fshih"
 
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
 msgstr ""
 
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr ""
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13281,26 +13667,52 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
+#, 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
+#, 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
 #, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1919
 #, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to open old POP keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
+#, 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
 #, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
 msgstr ""
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, 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
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Unable to create local mail folders at `%s': %s"
 msgstr "E pamundur hapja e kartelës tek '%s'"
 
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 #, fuzzy
 msgid "Save As..."
@@ -13311,95 +13723,81 @@ msgstr "Ruaje _si..."
 msgid "untitled_image.%s"
 msgstr ""
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr ""
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Hape në një dritare të re"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Dërgo një mesazh tek kontakti"
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Rubrika"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ky server nuk suporton informacionet e skemës LDAPv3"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr ""
 
-#: mail/em-subscribe-editor.c:637 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 "Kartela"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr ""
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Mos e shfaq më këtë mesazh."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtra"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr ""
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr ""
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Mesazhi"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "_Kërko në mesazh..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Adresa"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Opcionet e alarmit me mesazh"
@@ -13417,11 +13815,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13527,158 +13925,158 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr ""
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Prioriteti i prezgjedhur:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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/evolution-mail.schemas.in.in.h:58
-msgid "Prompt when user tries to send a message with no To or Cc recipients."
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
+msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13729,8 +14127,9 @@ msgid "Spell check inline"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Prioriteti i prezgjedhur:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -13868,49 +14267,79 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importim"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
 msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr ""
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr ""
+
+#: 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:96
+msgid "Mail Preferences"
 msgstr ""
 
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "Posta"
+
 #: mail/importers/elm-importer.c:88
 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr ""
 
@@ -13940,19 +14369,47 @@ msgid "Select folder to import into"
 msgstr "Zgjidh një veprim"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importo..."
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Importo..."
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr ""
@@ -13962,7 +14419,7 @@ msgstr ""
 msgid "Priority Filter \"%s\""
 msgstr ""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13977,7 +14434,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13985,7 +14442,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13994,23 +14451,23 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Rregullimet"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14040,163 +14497,174 @@ msgid "Pine"
 msgstr ""
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr ""
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr ""
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr ""
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr ""
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr ""
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr ""
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr ""
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr ""
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "I zgjedhur"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "ditë"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "sekondë"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "sekondë"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "Kontakte"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "I zgjedhur"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr ""
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr ""
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr ""
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "_Kartela:"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Krijo një kontakt të ri"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI që do të shfaqë kalendari"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr ""
 
-#: mail/mail-config-druid.c:366
+#: 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:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:374
+#: 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:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr ""
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr ""
 
-#: mail/mail-config-druid.c:386
+#: 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr ""
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14205,14 +14673,6 @@ msgid ""
 "purposes only."
 msgstr ""
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr ""
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr ""
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14505,7 +14965,7 @@ msgid "Execute Command..."
 msgstr ""
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+msgid "Fi_xed-width:"
 msgstr ""
 
 #: mail/mail-config.glade.h:82
@@ -14810,395 +15270,512 @@ msgstr ""
 msgid "description"
 msgstr "përshkrimi"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Identifikimi"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
+#. 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-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë mbledhje?"
-
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë zë?"
+"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-errors.xml.in.h:6
+#. 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 ""
 "Jeni i sigurt që dëshiron\n"
 "të eleminosh këtë kontakt?"
 
-#: mail/mail-errors.xml.in.h:7
+#. 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"
+"{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
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Jeni i sigurt që dëshironi të eleminoni zërin e ditarit `%s'?"
+msgid "_Send"
+msgstr "_Mër"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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 ""
 "Jeni i sigurt që dëshiron\n"
 "të eleminosh këtë kontakt?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "Jeni i sigurt që dëshironi të eleminoni zërin e ditarit `%s'?"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "E pamundur hapja e kartelës tek '%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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "E pamundur hapja e kartelës tek '%s'"
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
+msgid "Use default drafts folder?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:16
-msgid "Cannot create the save directory, because \"{1}\""
+#. 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?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:17
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
-msgstr "E pamundur hapja e kartelës tek '%s'"
+msgid "Use _Default"
+msgstr "E prezgjedhur"
 
-#: mail/mail-errors.xml.in.h:18
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "E pamundur hapja e kartelës tek '%s'"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë mbledhje?"
 
-#: mail/mail-errors.xml.in.h:19
-#, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "E pamundur hapja e kartelës tek '%s'"
+#. 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-errors.xml.in.h:20
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
+#: mail/mail-errors.xml.h:46
+msgid "_Expunge"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:21
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "E pamundur hapja e kartelës tek '%s'"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Jeni i sigurt që dëshironi të anulloni dhe të fshini këtë zë?"
 
-#: mail/mail-errors.xml.in.h:22
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "E pamundur hapja e kartelës tek '%s'"
+msgid "_Empty Trash"
+msgstr "Zbraz _Koshin"
 
-#: mail/mail-errors.xml.in.h:23
-#, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Hap file"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. 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-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "E pamundur hapja e kartelës tek '%s'"
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-msgid "Cannot save to directory \"{0}\"."
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
+msgid "Error while {0}."
+msgstr ""
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:28
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot save to file \"{0}\"."
-msgstr "Hap file"
+msgid "Error while performing operation."
+msgstr "Gabim gjatë hapjes së kalendarit"
 
-#: mail/mail-errors.xml.in.h:29
-msgid "Cannot set signature script \"{0}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+#. 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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "E pamundur hapja e kartelës tek '%s'"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Elemino"
+msgid "Enter password."
+msgstr "Password"
 
-#: mail/mail-errors.xml.in.h:33
-msgid "Delete account?"
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+msgid "Error loading filter definitions."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
-msgid "Discard changed?"
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
+msgid "Cannot save to directory \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Dëshiron të ruash ndryshimet e kryera?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Enter password."
-msgstr "Password"
+msgid "Cannot save to file \"{0}\"."
+msgstr "Hap file"
 
-#: mail/mail-errors.xml.in.h:38
-msgid "Error loading filter definitions."
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Error while performing operation."
-msgstr "Gabim gjatë hapjes së kalendarit"
+msgid "Cannot create temporary save directory."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:40
-msgid "Error while {0}."
+#. 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/mail-errors.xml.in.h:41
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
 msgid "File exists but cannot overwrite it."
 msgstr ""
 "%s ekziston\n"
 "Dëshiron t'a mbishkruash?"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 msgid "File exists but is not a regular file."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:46
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Identifikimi"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
+#, fuzzy
+msgid "Delete \"{0}\"?"
+msgstr "Elemino"
 
-#: mail/mail-errors.xml.in.h:49
-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."
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 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."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+#. 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-errors.xml.in.h:52
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
+#. 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 "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+#. 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 "Hap file"
+
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
+#, fuzzy
+msgid "Cannot create folder \"{0}\"."
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
+#, fuzzy
+msgid "Cannot open source \"{1}\""
+msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#. 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-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+msgid "Delete account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:62
-msgid "This signature has been changed, but has not been saved."
+#. 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-errors.xml.in.h:63
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "Use _Default"
-msgstr "E prezgjedhur"
+msgid "Could not save signature file."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:65
-msgid "Use default drafts folder?"
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+msgid "Cannot set signature script \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+msgid "Discard changed?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
-msgstr ""
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Dëshiron të ruash ndryshimet e kryera?"
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
+#: mail/mail-errors.xml.h:184
 msgid "_Discard changes"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Zbraz _Koshin"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "E pamundur hapja e kartelës tek '%s'"
 
-#: mail/mail-errors.xml.in.h:73
-msgid "_Expunge"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "_Mër"
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Mbishkruaj"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "_Mër"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr ""
@@ -15207,170 +15784,170 @@ msgstr ""
 msgid "Working"
 msgstr ""
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr ""
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr ""
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr ""
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr ""
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr ""
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Lidhja me server-in LDAP dështoi"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr ""
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr ""
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr ""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr ""
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr ""
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr ""
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr ""
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr ""
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr ""
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr ""
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Mesazhi"
 msgstr[1] "Mesazhi"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Mesazhi"
 msgstr[1] "Mesazhi"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr ""
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
 " %s"
 msgstr ""
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr ""
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr ""
@@ -15435,24 +16012,24 @@ msgstr ""
 msgid "Waiting..."
 msgstr ""
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr ""
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr ""
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr ""
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr ""
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr ""
 
@@ -15492,89 +16069,94 @@ msgstr ""
 msgid "Invalid folder: `%s'"
 msgstr ""
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr ""
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
-msgstr ""
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Lëvize tek kartela..."
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Lëvize tek kartela..."
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr ""
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr ""
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr ""
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr ""
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr ""
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr ""
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr ""
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr ""
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr ""
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr ""
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr ""
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr ""
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr ""
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr ""
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr ""
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr ""
 
@@ -15606,43 +16188,43 @@ msgstr ""
 msgid "Size"
 msgstr "Madhësia"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Thirrje"
 
-#: 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:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vazhdo"
 
-#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -15685,124 +16267,59 @@ msgstr ""
 msgid "_Unsubscribe"
 msgstr ""
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr ""
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Alarmi i Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr ""
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
-msgid "Default shortcut group"
-msgstr "Ndrysho emrin e këtij grupi shtigjesh"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Bëj të padukshëm panelin e shtigjeve"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Prioriteti i prezgjedhur:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Prioriteti i prezgjedhur:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Kontrolli i konfigurimit të kalendarit të Evolution"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Bëj të padukshëm panelin e shtigjeve"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Email"
@@ -15811,6 +16328,32 @@ msgstr "Email"
 msgid "Brought to you by"
 msgstr ""
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Gabim i panjohur"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Argumente të pavlefshme"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "I pamundur regjistrimi në OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Nuk u gjet databaza e konfigurimit "
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Gabim i përgjithshëm"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr ""
@@ -15937,11 +16480,11 @@ msgstr "E pamundur marrja e versionit aktual!"
 msgid "_Import"
 msgstr "Importim"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr ""
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr ""
 
@@ -15978,11 +16521,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid "Switch to %s"
+msgstr ""
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Gabim gjatë ekzekutimit të %s."
@@ -15996,14 +16563,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy nuk mund të vihet në funksionim."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Informacione mbi Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Puno online"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Puno offline"
 
@@ -16011,48 +16579,6 @@ msgstr "_Puno offline"
 msgid "Work Offline"
 msgstr "Puno online"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution është në procesin e daljes offline."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Argumente të pavlefshme"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "I pamundur regjistrimi në OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Nuk u gjet databaza e konfigurimit "
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Gabim i përgjithshëm"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -16115,6 +16641,49 @@ msgstr ""
 msgid "Click OK to close these connections and go offline"
 msgstr ""
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendari:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "_Kontakt"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "Posta"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "Aktivitete"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "File _si:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr ""
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "Emri i grupit:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "Emri i fushës"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "_Shto"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr ""
@@ -16148,6 +16717,20 @@ msgid ""
 "Click the \"Apply\" button to save your settings. "
 msgstr ""
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr ""
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Alarmi i Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Komponues i Evolution për kalendarin dhe aktivitetet"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr ""
@@ -16209,13 +16792,13 @@ msgid "Evolution can import data from the following files:"
 msgstr ""
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16229,68 +16812,126 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
-msgstr ""
+"The Evolution Team\n"
+msgstr "Alarmi i Evolution"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr ""
 
-#: shell/main.c:391
-msgid "Cannot register the Ximian Evolution shell."
-msgstr ""
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr ""
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr ""
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr ""
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr ""
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr ""
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Duke lidhur"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Informacione mbi Ximian Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Alarmi i Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr ""
 
@@ -16524,12 +17165,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr ""
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "ID e card ekziston"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -16730,6 +17365,12 @@ msgstr ""
 msgid "Certificate Signature Value"
 msgstr ""
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "ID e card ekziston"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16770,12 +17411,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr ""
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -16839,8 +17480,9 @@ msgid "Select all contacts"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
-msgstr ""
+#, fuzzy
+msgid "Send a message to the selected contacts."
+msgstr "Dërgo një mesazh tek kontakti"
 
 #: ui/evolution-addressbook.xml.h:24
 msgid "Send message to contact"
@@ -16870,8 +17512,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Veprimet"
@@ -16889,8 +17531,9 @@ msgid "_Preview Pane"
 msgstr ""
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
-msgstr ""
+#, fuzzy
+msgid "_Save as VCard..."
+msgstr "Ruaje si VCard"
 
 #: ui/evolution-addressbook.xml.h:42
 msgid "_Select All"
@@ -17019,11 +17662,21 @@ msgstr "Krijo një takim të ri"
 msgid "Week"
 msgstr ""
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Java punuese"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Takim"
 
+#: 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 "M_byll"
+
 #: 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
@@ -17342,6 +17995,16 @@ msgstr ""
 msgid "_Threaded Message List"
 msgstr ""
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Mbylle"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -17584,7 +18247,7 @@ msgid "Open the selected message in a new window"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17699,58 +18362,46 @@ msgstr ""
 msgid "_Attached"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:114
-msgid "_Go To"
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:115
-msgid "_Inline"
+msgid "_Go To"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:116
-msgid "_Larger"
+msgid "_Inline"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:117
-msgid "_Message Display"
+msgid "_Larger"
 msgstr ""
 
 #: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
+msgid "_Message Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr ""
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Instrumentë"
@@ -17759,16 +18410,6 @@ msgstr "_Instrumentë"
 msgid "_Undelete"
 msgstr "_Risill"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Mbylle"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr ""
@@ -18162,6 +18803,11 @@ msgstr ""
 msgid "_Send / Receive"
 msgstr ""
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Hape në një dritare të re"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr ""
@@ -18233,10 +18879,6 @@ msgstr "Data:"
 msgid "With _Status"
 msgstr "Gjendja"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr ""
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18392,6 +19034,35 @@ msgstr ""
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, 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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Alarmi i Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Kontrolli i konfigurimit të kalendarit të Evolution"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Alarmi i Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr ""
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr ""
@@ -18508,6 +19179,31 @@ msgstr "Teksti"
 msgid "Find _Now"
 msgstr "Gjej"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 ekziston\n"
+"Dëshiron t'a mbishkruash?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr "Hap file"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr "Hap file"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18518,9 +19214,71 @@ msgstr ""
 msgid "%s (%d%% complete)"
 msgstr ""
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Shikuesi i kartelave të librit të adresave të Evolution"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Rubrikë e re"
+#~ msgid "Address 2:"
+#~ msgstr "Adresa _2:"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Shfaqësi i kalendarit të Evolution"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Shikuesi i aktiviteteve të Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "E pamundur nisja e gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "E pamundur hapja e kartelës tek '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI që do të shfaqë kalendari"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Lloji i paraqitjes që duhet shfaqur"
+
+#~ msgid "Display a message"
+#~ msgstr "Shfaq një mesazh"
+
+#~ msgid "Alerts"
+#~ msgstr "Alarme"
+
+#, fuzzy
+#~ msgid "Time"
+#~ msgstr "Titulli"
+
+#~ msgid "_General"
+#~ msgstr "_E përgjithshme"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Zgjidh emrat"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalendari"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Aktivitet i ri"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI që do të shfaqë kalendari"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Ndrysho emrin e këtij grupi shtigjesh"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Bëj të padukshëm panelin e shtigjeve"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Bëj të padukshëm panelin e shtigjeve"
 
 #, fuzzy
 #~ msgid "The URI that the address book will display"
@@ -18694,9 +19452,6 @@ msgstr ""
 #~ msgid "S_pouse:"
 #~ msgstr "Bashkë_shorti/ja:"
 
-#~ msgid "_Add"
-#~ msgstr "_Shto"
-
 #~ msgid "_Business:"
 #~ msgstr "_Zyra:"
 
@@ -18809,14 +19564,6 @@ msgstr ""
 #~ "tuaj nëse keni nevojë për ndihmë për të gjetur këto informacione."
 
 #, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Data e lindjes"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "Data:"
-
-#, fuzzy
 #~ msgid "Could not delete folder: %s"
 #~ msgstr "E pamundur hapja e kartelës tek '%s'"
 
@@ -18833,10 +19580,6 @@ msgstr ""
 #~ msgstr "Krijo një aktivitet të ri"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "%sShkruaj password për %s (përdoruesi %s)"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Aktivitet i ri"
 
@@ -18852,9 +19595,6 @@ msgstr ""
 #~ msgid "_minute(s)"
 #~ msgstr "minutë(a)"
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendari:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Krijo një aktivitet të ri"
@@ -19066,10 +19806,6 @@ msgstr ""
 #~ msgstr "Ri_emërto këtë grup..."
 
 #, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Lista e aktiviteteve"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Klasifikimi"
 
diff --git a/po/sr.po b/po/sr.po
index a3f6dc7e95..dd037b9d95 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -25,6 +25,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "адресар еволуције"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "заглавље контакта: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "визиткарта еволуције"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "текући директоријум адресара"
@@ -48,14 +56,6 @@ msgstr " карте"
 msgid " card"
 msgstr " карта"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "заглавље контакта: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "визиткарта еволуције"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Подразумевана адреса за синхронизовање:"
@@ -70,64 +70,20 @@ msgstr "Нисам могао да учитам адресар"
 msgid "Could not read pilot's Address application block"
 msgstr "Нисам могао да прочитам програмски блок адреса пилота"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Самодопуњавање"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Сертификати"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Еволуција адресар"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Искачући прозор за адресе Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Прегледник адреса Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Прегледник Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Део Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Прегледник директоријума Еволуција адресара"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Управљање S/MIME сертификатима из Еволуције"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонимно приступам LDAP серверу"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Управљање подешавањем директоријума из Еволуције"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Нисам могао да се пријавим.\n"
 
-# bug: s/manager/manage/
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Овде управљајте вашим S/MIME сертификатима"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sУнеси лозинку за %s (корисник %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,41 +124,45 @@ msgstr "_Контакти:"
 msgid "Create a new contacts group"
 msgstr "Направи нову групу пречица"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "Неуспешна пријава на LDAP сервер"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Нисам могао да обавим упит на Root DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Сервер је одговорио неподржаним базама за претрагу"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Овај сервер не подржава податке LDAPv3 шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Грешка у читању података шеме"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Преносим..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Преносим „%s“:"
@@ -210,8 +170,8 @@ msgstr "Преносим „%s“:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "На овом рачунару"
 
@@ -219,7 +179,7 @@ msgstr "На овом рачунару"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Лично"
@@ -285,20 +245,41 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонимно приступам LDAP серверу"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "Адресар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Нисам могао да се пријавим.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Нови адресар"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sУнеси лозинку за %s (корисник %s)"
+#: 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
+#: 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
+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
+#: 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 "Контакти"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -319,6 +300,62 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Адреса за директоријум последње коришћен у прозорчету за избор имена"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Самодопуњавање"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Сертификати"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Подесите овде самодопуњавање"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Еволуција адресар"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Искачући прозор за адресе Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Прегледник адреса Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Прегледник Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Део Еволуција адресара"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Управљање S/MIME сертификатима из Еволуције"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Управљање подешавањем директоријума из Еволуције"
+
+# bug: s/manager/manage/
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+msgid "Manage your S/MIME certificates here"
+msgstr "Овде управљајте вашим S/MIME сертификатима"
+
 #: addressbook/gui/component/ldap-config.glade.h:1
 msgid "  S_how Supported Bases "
 msgstr " П_окажи подржане базе "
@@ -340,6 +377,7 @@ msgstr " П_окажи подржане базе "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -411,7 +449,7 @@ msgstr "_Контакти:"
 msgid "Address Book Properties"
 msgstr "Особине адресара"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Увек"
@@ -426,106 +464,96 @@ msgid "Basic"
 msgstr "Основно"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Боје"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Повезујем се"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Посебно _име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Посебно _име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Лимит за _преузимање:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Електронска адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Електронска адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Еволуција ће користити ову електронску адресу за пријављивање на сервер"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Подржане базе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Опште"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Никада"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Један"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Изаберите боју"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Опсег п_ретраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Претражи базу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Претражи базу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Опсег п_ретраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Тражим"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -535,7 +563,7 @@ msgstr ""
 "акоi\n"
 "он подржава SSL или TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -552,7 +580,7 @@ msgstr ""
 "онда нема потребе да Еволуција користи SSL/TLS јер је ваша веза већ\n"
 "безбедна."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -564,19 +592,19 @@ msgstr ""
 "значи да ће ваша беза бити несигурна, и да ћете бити рањиви на сигурносне\n"
 "нападе. "
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Под"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Подржане базе за претрагу"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -587,7 +615,7 @@ msgstr ""
 "почети. Ако ово оставите празно, претрага ће почети из корена стабла "
 "директоријума."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -601,13 +629,13 @@ msgstr ""
 "\"sub\" ће укључити све уносе испод ваше базе за претрагу. Опсег претраге "
 "\"one\" ће укључити само уносе један ниво испод ваше базе.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -616,7 +644,7 @@ msgstr ""
 "Ово је највећи број уноса за преузимање. Ако унесете сувише велики \n"
 "број, успорићете ваш адресар."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -626,7 +654,7 @@ msgstr ""
 "укључивање овога на \"Email Address\" захтева анонимни приступ на ваш ldap "
 "сервер."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -635,7 +663,7 @@ msgstr ""
 "Ово је име сервера које ће се појавити у листи директоријума Еволуције.\n"
 "То је само за потребе приказивања. "
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -647,129 +675,136 @@ msgstr ""
 "је списак стандардних портова. Питајте свог систем администратора\n"
 "који порт да одаберете."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат за време:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "К_ористи SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Користим посебно име (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Користим електронску адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Када је могуће"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Лимит за _преузимање:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Електронска адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Метод _пријаве:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Име:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Број _порта:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Важност:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "База _претраге:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Име _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "С_ервер:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Одзив (минути):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Користи безбедну везу (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "карте"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "језичак за везу"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "језичак за опште податке"
 
 # bug: plural-forms
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "минута"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 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-popup.c:208
-msgid "Remove All"
-msgstr "Уклони све"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Уклони све"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Погледај листу контакт листу"
@@ -792,22 +827,15 @@ msgstr "Додај у контакте"
 msgid "Unnamed Contact"
 msgstr "Неименовани контакт"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Извор"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-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 "<b>Contacts</b>"
@@ -875,141 +903,141 @@ msgid "<b>Work</b>"
 msgstr "<b>Радна недеља</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "АИМ"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Адреса _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Адреса:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Годи_шњица:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Помоћник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Рођенда_н"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Блогче"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Календар:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Место:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Наредба:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Уредник контаката"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Држав_а:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "О_делење:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL за с_лободан/заузет:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Пуно _име..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Кућа"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "МСН гласник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Е-адреса"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Управник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Надимак:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Бе_лешке:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Новел Групвајз"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Друго"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Поштански број:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1037,9 +1065,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Посао"
@@ -1072,23 +1100,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Јесте ли сигурни да хоћете\n"
+"да обришете ове контакте?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Може се мењати"
 
@@ -2061,91 +2105,109 @@ msgstr "Замбија"
 msgid "Zimbabwe"
 msgstr "Зимбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "АОЛ брза порука"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Џабер"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Јаху гласник"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr "Место"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Корисничко име"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Јаху"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "МСН"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "Групвајз"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Изворни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Одредишни адресар"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Је нови контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Поља за упис"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Промењен"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Уређивач категорија није доступан."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Овај контакт припада овим категоријама"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Молим изаберите од следећих опција"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Нигер"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 "Нисам могао да пронађем помоћ ђа поље: `%s'"
 
+#: 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
+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
+msgid "Location"
+msgstr "Место"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Корисничко име"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Брзо додавање контакта"
@@ -2163,22 +2225,6 @@ msgstr "_Пуно име:"
 msgid "E-_mail:"
 msgstr "Е-_пошта:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Јесте ли сигурни да хоћете\n"
-"да обришете ове контакте?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Јесте ли сигурни да хоћете\n"
-"да обришете овај контакт?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адреса _2:"
@@ -2324,8 +2370,8 @@ msgstr "уредник-контакт-листе"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Књига"
 
@@ -2386,6 +2432,433 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Напредна претрага"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(мапа)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "мапа"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Испиши чланове"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "Е-пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Организација"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Положај"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Групвајз"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Видео конференције"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Факс"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "посао"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "Беб"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Блогче"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Мобилни телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "лично"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Напомена"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Улога на послу"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Е-пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Лична страница"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Успех"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Архива није на мрежи"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Адресар не постоји"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Забрањен приступ"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Контакт није пронађен"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "ИБ контакта већ постоји"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Протокол није подржан"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Поништено"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не могу да отворим извор"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Пријава неуспела"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Пријава обавезна"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Нема такве поруке"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Друга грешка"
+
+#: 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 ""
+"Нисмо успели да отворимо овај адресар. Проверите да путања постоји и да "
+"имате права приступа."
+
+#: 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 ""
+"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
+"адресу, или је LDAP сервер недоступан."
+
+#: 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 ""
+"Ова верзија Еволуције нема подршку за LDAP у себи. Уколико желите да "
+"користите LDAP у Еволуцији морате да изградите програм из изворног кода у "
+"СУВ-у (CVS) пошто преузмете OpenLDAP са следеће адресе."
+
+#: 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 ""
+"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
+"адресу или је сервер недоступан."
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Не могу да отворим адресар"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"Више карти одговара упиту који је или сервер тако  \n"
+"подешен вратио или Еволуција тако подешена да покаже.\n"
+"Молим да прецизније формулишете упит или повећате лимит\n"
+"броја резултата у подешавањима адресара за сервер директоријума."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Време за извршавање овог упита је преко лимита сервера или лимита\n"
+"који сте подесили за овај адресар. Молим да прецизније формулишете\n"
+"упит или повећате временски лимит у подешавањима адресара\n"
+"за сервер директоријума."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Основни процес овог адресара није могао да обради упит."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Основни процес овог адресара је одбио да обради овај упит."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "Грешка код додавања листе"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "Грешка код додавања контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Грешка код измене листе"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Грешка при измени контакта"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Грешка код уклањања листе"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "Грешка код уклањања контакта"
+
+# bug: plural-forms
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"Отварање %d контаката ће отворити и %d нових прозора.\n"
+"Да ли стварно желите да погледате све ове контакте?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s већ постоји\n"
+"Желите ли да препишете новим уносом?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "листа"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Премести контакт у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Умножи контакт у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Премести контакте у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Умножи контакте у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Изаберите одредишни адресар."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Вишеструке VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard за %s"
+
+#.
+#. * 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
+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
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "и још %d контакт."
+msgstr[1] "и још %d контакта."
+msgstr[2] "и још %d контаката."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Прикажи целу визит карту"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Прикажи сажету визит карту"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Сачувај у адресару"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Нема контакта"
@@ -2401,8 +2874,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Упит"
 
@@ -2456,9 +2929,10 @@ msgstr "Адресар"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Сачувај као VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2523,7 +2997,7 @@ msgid "Cut"
 msgstr "Исеци"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2534,18 +3008,8 @@ msgstr "Умножи"
 msgid "Paste"
 msgstr "Убаци"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Обриши"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Тренутан поглед"
 
@@ -2562,7 +3026,7 @@ msgstr ""
 "да је користите"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Било која категорија"
@@ -2603,21 +3067,6 @@ msgstr "Категорије"
 msgid "Company Phone"
 msgstr "Телефон фирме"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Е-пошта"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Е-пошта 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Е-пошта 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Презиме"
@@ -2654,29 +3103,14 @@ msgstr "Дневник"
 msgid "Manager"
 msgstr "Управник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Мобилни телефон"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Надимак"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Напомена"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Канцеларија"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Организација"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Други факс"
@@ -2728,21 +3162,29 @@ msgstr "Јединица"
 msgid "Web Site"
 msgstr "Интернет адреса"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Висина"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "Поље"
@@ -2759,10 +3201,6 @@ msgstr "Модел текста"
 msgid "Max field name length"
 msgstr "Највећа дужина имена поља"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина колоне"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2791,407 +3229,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(мапа)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "мапа"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Испиши чланове"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "Е-пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Положај"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Групвајз"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Видео конференције"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Факс"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "посао"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "Беб"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Блогче"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "лично"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Улога на послу"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Лична страница"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Успех"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Архива није на мрежи"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Адресар не постоји"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Забрањен приступ"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Контакт није пронађен"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "ИБ контакта већ постоји"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Протокол није подржан"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Поништено"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не могу да отворим извор"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Пријава неуспела"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Пријава обавезна"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS није доступан"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Нема такве поруке"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Друга грешка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Нисмо успели да отворимо овај адресар. То значи или да сте унели нетачну "
-"адресу, или је LDAP сервер недоступан."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"Ова верзија Еволуције нема подршку за LDAP у себи. Уколико желите да "
-"користите LDAP у Еволуцији морате да изградите програм из изворног кода у "
-"СУВ-у (CVS) пошто преузмете OpenLDAP са следеће адресе."
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-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:140
-msgid "Unable to open addressbook"
-msgstr "Не могу да отворим адресар"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Више карти одговара упиту који је или сервер тако  \n"
-"подешен вратио или Еволуција тако подешена да покаже.\n"
-"Молим да прецизније формулишете упит или повећате лимит\n"
-"броја резултата у подешавањима адресара за сервер директоријума."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Време за извршавање овог упита је преко лимита сервера или лимита\n"
-"који сте подесили за овај адресар. Молим да прецизније формулишете\n"
-"упит или повећате временски лимит у подешавањима адресара\n"
-"за сервер директоријума."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Основни процес овог адресара није могао да обради упит."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Основни процес овог адресара је одбио да обради овај упит."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Овај упит није успешно завршен."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Желите ли да сачувате промене?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Одбаци"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Грешка код додавања листе"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Грешка код додавања контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Грешка код измене листе"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Грешка при измени контакта"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Грешка код уклањања листе"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Грешка код уклањања контакта"
-
-# bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"Отварање %d контаката ће отворити и %d нових прозора.\n"
-"Да ли стварно желите да погледате све ове контакте?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s већ постоји\n"
-"Желите ли да препишете новим уносом?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Препиши"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Грешка код чувања %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "листа"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Премести контакт у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Умножи контакт у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Премести контакте у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Умножи контакте у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Изаберите одредишни адресар."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Вишеструке VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard за %s"
-
-#.
-#. * 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: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
-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
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "и још %d контакт."
-msgstr[1] "и још %d контакта."
-msgstr[2] "и још %d контаката."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Прикажи целу визит карту"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Прикажи сажету визит карту"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-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"
@@ -3235,11 +3275,6 @@ msgstr "Еволуција VCard увозник"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: 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.c:998
 msgid "Print contacts"
 msgstr "Штампај контакте"
@@ -3249,6 +3284,11 @@ msgstr "Штампај контакте"
 msgid "Print contact"
 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"
 msgstr "10 п. Тахома"
@@ -3433,16 +3473,6 @@ msgstr "Проба штампе контакта"
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Наведите излазну датотеку уместо стандардног излаза"
@@ -3501,6 +3531,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Грешка код учитавања предефинисаног адресара."
@@ -3513,11 +3553,12 @@ msgstr "Улазна датотека"
 msgid "No filename provided."
 msgstr "Име датотеке није дато."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Листа без имена"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Унесите лозинку"
 
@@ -3549,117 +3590,55 @@ msgstr "Предефинисан приоритет:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Нисам могао да прочитам пилотов ToDo програмски блок"
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Календари"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Подесите вашу временску зону, календар и листу задатака овде "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-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/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Део Еволуције за календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Део Еволуције за задужења"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Еволуција аларм"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "З_атвори"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Дре_мај"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Време дремања (минути)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Измени састанак"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Одбаци"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Одбаци све"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Нема описа."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3672,12 +3651,12 @@ msgstr ""
 "Почиње у %s\n"
 "Завршава се у %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3689,7 +3668,7 @@ msgstr ""
 "подсетник подешен да пошаље поруку. Еволуција ће\n"
 "уместо тога показати нормалан прозор за дијалог."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3706,19 +3685,19 @@ msgstr ""
 "\n"
 "Сигурно хоћете да покренете овај програм?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: 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:139
 msgid "Could not initialize Bonobo"
 msgstr "Нисам успео да покренем Бонобо"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Нисам могао да учитам  gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Нисам могао да покренем стварање сервиса за аларм обавештења"
 
@@ -3827,56 +3806,42 @@ 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Да ли да тражим потврду пре брисања састанака"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Да ли да тражим потврду пре уклањања директоријума"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Да ли да сакривам извршена задужења"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Да ли да приказујем време у 24ч облику уместо am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Да ли да приказује бројеве недеља у избирачу датума"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Сажетак садржи"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Опис садржи"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Коментар садржи"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Путања садржи"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Нерасподељено"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3887,118 +3852,128 @@ msgstr ""
 "\n"
 "Стварно да бришем ове задатке?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Обриши догађаје старије од"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "дана"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Календар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Нови календар"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Особине..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Учитавам календар..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Не могу да отворим календар „%s“ ради прављења догађаја и састанака"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Нема доступног календара за прављење догађаја и састанака"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Календари"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Нови заказани састанак"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "Заказани _састанак"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Закажи састанак"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "С_астанак"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Сачини нови захтев за састанак"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Нови целодневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Цело_дневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Сачини нови целодневни заказани састанак"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Нови календар"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "К_алендар"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Направи нови календар"
 
@@ -4028,15 +4003,35 @@ msgstr "Недељни преглед"
 msgid "Month View"
 msgstr "Месечни преглед"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Сажетак садржи"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Опис садржи"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Коментар садржи"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Путања садржи"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Нерасподељено"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Грешка код отварања календара"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Метод није подржан код отварања календара"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Забрањен приступ календару"
 
@@ -4045,19 +4040,6 @@ msgstr "Забрањен приступ календару"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Нисам могао да отворим директоријум у '%s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI коју ће календар показати"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Тип погледа за приказ"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Опције за звучни аларм"
@@ -4124,7 +4106,7 @@ msgstr "покажи још на сваких"
 msgid "hours"
 msgstr "сати"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Дејство/покрени"
 
@@ -4143,14 +4125,14 @@ msgstr "Основе"
 msgid "Date/Time:"
 msgstr "Датум/Време:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Покажи поруку"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Пусти звук"
 
+#: 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 "Подсетници"
@@ -4165,6 +4147,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
 msgid "Summary:"
 msgstr "Закључак:"
@@ -4204,10 +4187,104 @@ msgstr "минут(а)"
 msgid "start of appointment"
 msgstr "почетак заказаног састанка"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+msgid "You must specify a location to get the calendar from."
+msgstr "Морате навести путању са које да преузмем календар"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Путања извора „%s“ није исправног облика."
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr "Путања извора „%s“е представља вебкал извор."
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr "Извор имена „%s“ већ постоји у изабраној групи"
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Група „%s“ је удаљена. Морате навести путању са које да преузмем календар"
+
+#: 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
+msgid "Calendar Properties"
+msgstr "Особине календара"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Додај нови календар"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, fuzzy
+msgid "_Refresh:"
+msgstr "Освежи"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:16
+msgid "_Source URL:"
+msgstr "_Изворна адреса:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:17
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_Адреса:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Омогућено"
 
@@ -4221,19 +4298,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Омогући"
 
@@ -4259,162 +4336,174 @@ msgid "60 minutes"
 msgstr "60 минута"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Упозорења"
+msgid "<b>Alerts</b>"
+msgstr "<b>Узбуне</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Подсетници</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Списак задужења</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 "<b>Радна недеља</b>"
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Прикажи"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "О_могући"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "Петак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Сати"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Минути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Понедељак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "Н_ед"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "По_кажи подсетник"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Недеља"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "З_адаци за данас:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "У_то"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Списак задужења"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Четвртак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Време"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Временска зона:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Формат за време:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Уторак"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Почетак н_едеље:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Среда"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Радна недеља"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Радни дани:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: 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:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-очасовни"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "Додај _адресу"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Скупи недеље у месечни приказ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Почетак _дана:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Прикажи"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4424,139 +4513,46 @@ msgstr "_Прикажи"
 msgid "_Edit"
 msgstr "_Измени"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Објава стања слободан/заузет"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Пет"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Опште"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Сакриј испуњена задужења након"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Пон"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Неиспуњена задужења:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Суб"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Подела _времена:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Уто"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Сре"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "пре сваког заказаног састанка"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-msgid "You must specify a location to get the calendar from."
-msgstr "Морате навести путању са које да преузмем календар"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Путања извора „%s“ није исправног облика."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr "Путања извора „%s“е представља вебкал извор."
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr "Извор имена „%s“ већ постоји у изабраној групи"
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Група „%s“ је удаљена. Морате навести путању са које да преузмем календар"
-
-#: 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:5
-msgid "Calendar Properties"
-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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Додај нови календар"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, fuzzy
-msgid "_Refresh:"
-msgstr "Освежи"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:16
-msgid "_Source URL:"
-msgstr "_Изворна адреса:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:17
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_Адреса:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "недеље"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4637,81 +4633,81 @@ msgstr "%s Унели сте измене. Да их заборавим и ос�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Нисте унели измене, да освежим променама уредник?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Грешка при провери: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " за "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Завршено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Завршено "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (До "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "До "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Нисам могао да освежим променама објекат"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Измени заказани састанак"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Нема сажетка"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Сачувај као..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Не могу да користим текућу верзију!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Грешка при провери: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " за "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Завршено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Завршено "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (До "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "До "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Не могу да отворим извор"
@@ -4835,27 +4831,27 @@ msgstr "Делегирај за:"
 msgid "Enter Delegate"
 msgstr "Унеси делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Заказани састанак"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Подсетник"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Повраћај"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Састанак"
 
@@ -4867,7 +4863,7 @@ msgstr "Догађај без почетног датума"
 msgid "Event with no end date"
 msgstr "Догађај без крајњег датума"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Почетни датум је погрешан"
 
@@ -4953,10 +4949,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4975,15 +4971,15 @@ msgstr "Захтева организатор."
 msgid "At least one attendee is required."
 msgstr "Најмање један присутни је потребан."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Делегирај за..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5257,24 +5253,19 @@ msgstr "_Занемари промене"
 msgid "Save Event"
 msgstr "Сачувај догађај"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Изаберите извор"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Изаберите одредиште %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "календар"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Одредишни директоријум:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "списак задужења"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Списак задужења"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5302,38 +5293,44 @@ msgid "% _Complete"
 msgstr "% _готово"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Висок"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Низак"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Обичан"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Није покренут"
 
@@ -5368,11 +5365,11 @@ msgstr "_Веб страница:"
 msgid "Assignment"
 msgstr "Задатак"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Датум за завршетак је погрешан"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не могу да отворим задужења у „%s“."
@@ -5381,8 +5378,9 @@ msgstr "Не могу да отворим задужења у „%s“."
 msgid "Con_fidential"
 msgstr "Пов_ерљиво"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Опис:"
@@ -5531,101 +5529,53 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s за непознат тип покретача"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Јавно"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Лично"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Поверљиво"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Крајњи датум"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Почетни датум"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Извештај"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Слободан"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Заузет"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "С"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Кликните да отворите %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "Ј"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Без имена"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "И"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Датум почетка:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "З"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Датум завршетка:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географско место мора бити унето у облику: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Стање:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Важност:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Не"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Веб страница:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5671,17 +5621,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Уносим промене у објекте"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Отвори"
 
@@ -5690,41 +5649,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Умет_ни"
 
@@ -5779,76 +5739,155 @@ msgstr "Приоритет"
 msgid "Start date"
 msgstr "Почетни датум"
 
+#: 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:11
 msgid "Task sort"
 msgstr "Разврстана задужења"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Нов заказан _састанак..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Нов целодневни _догађај"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Нови састанак"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Ново задужење"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Изабери _нит"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Изабери..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Објави слободан/заузет информацију"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Коп_ирај у календар..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Прене_си у календар..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Закажи састанак..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Проследи као iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Обриши ову _појаву"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Обриши _све појаве"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Иди на _данас"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Иди на датум..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Подешавања..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Крајњи датум"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -5872,36 +5911,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i минутни размаци"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i минутни размаци"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6019,10 +6058,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ништа</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Стање:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6052,7 +6087,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "ОК"
 
@@ -6265,59 +6300,55 @@ msgstr "Прилог не садржи исправну поруку за кал
 msgid "The attachment has no viewable calendar items"
 msgstr "Прилог нема делове календара који се могу прегледати"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Датотека календара није могла бити ажурирана\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Ажурирање завршено\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Стање присутног не може бити ажурирано јер унос више не постоји"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Објекат је неисправан и не може бити ажуриран\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Овај одговор није послао тренутно присутан. Да га додам у присутне?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Стање присутног није могло бити ажурирано због неисправног стања!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Настала је грешка у CORBA систему\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Објекат није могао бити пронађен\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Немате праве дозволе за ажурирање календара\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Ажурирано стање присутног\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Стање присутног није могло бити ажурирано!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Уклањање завршено"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Унос послат!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Унос није могао бити послат!\n"
 
@@ -6434,28 +6465,6 @@ msgstr "Делегирано"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ван канцеларије"
@@ -6516,7 +6525,34 @@ msgstr "_Почетно време састанка:"
 msgid "Meeting _end time:"
 msgstr "_Крајње време састанка:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Унесите лозинку за „%s“"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6525,24 +6561,22 @@ msgstr ""
 "Грешка на %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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"
 " је пукла."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Отварам задужења у %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6551,38 +6585,47 @@ msgstr ""
 "Грешка при отварању %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Учитавам задужења"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Испуњавам задужења..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Бришем изабране објекте..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Избацујем"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Задужења"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Учитавам заказане састанке са %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Учитавам задужења са %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Отварам %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6590,18 +6633,60 @@ msgstr ""
 "%s\n"
 " је пукла"
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Машинерија задужења за \n"
-"%s\n"
-" је пукла."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Брише"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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_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
+msgid "Evolution's Calendar component"
+msgstr "Део Еволуције за календар"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Део Еволуције за задужења"
+
+#: 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 "Април"
@@ -6747,6 +6832,23 @@ msgstr "Рођендани и годишњице"
 msgid "On The Web"
 msgstr "На вебу"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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“."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Не могу да отворим задужења у „%s“."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6966,7 +7068,7 @@ msgid "Contacts: "
 msgstr "Конаткти: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Штампај приказ"
 
@@ -6978,69 +7080,81 @@ msgstr "Штампај унос"
 msgid "Print Setup"
 msgstr "Подеси штампу"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "Списак задужења „%s“ ће бити уклољен. Сигурно желите да наставите?"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Нови списак задужења"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d карата"
+msgstr[1] "%d карата"
+msgstr[2] "%d карата"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d изабраних"
+msgstr[1] "%d изабраних"
+msgstr[2] "%d изабраних"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Учитавам задужења"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 "Не могу да отворим списак задужења „%s“ ради додавања нових догађаја и "
 "састанака"
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Ниједан календар није доступан за додавање задужења"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Ново задужење"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Задужење"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Унеси ново задужење"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Дискусионе групе"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Група списка задужења"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Унеси ново задужење"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Адреса директоријума задужења за приказ"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Нисам могао да учитам задужења у `%s"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7052,11 +7166,11 @@ msgstr ""
 "\n"
 "Стварно да бришем ове задатке?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Не питај ме поново."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Штампај задужења"
 
@@ -8704,7 +8818,7 @@ msgstr "Умножи садржај директоријума у локалу �
 msgid "Downloading new messages for offline mode"
 msgstr "Преузимам нове поруке у неповезаном режиму"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Припремам директоријум '%s' за рад без мреже"
@@ -8797,33 +8911,6 @@ msgstr "Неипсравни аргументи за (корисничка-оз�
 msgid "Error executing filter search: %s: %s"
 msgstr "Грешка код примене филтера за претрагу: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Не могу да проследим израз за претрагу: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Грешка код извршавања израза за претрагу: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(одговара-све) захтева само један логички резултат"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Извршавам претрагу на непознато заглавље: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8855,7 +8942,52 @@ msgstr "Учење ђубрета и не-ђубрета од порука"
 msgid "Filtering new message(s)"
 msgstr "Филтрирам нове поруке"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Не могу да проследим израз за претрагу: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Грешка код извршавања израза за претрагу: %s:\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(одговара-све) захтева само један логички резултат"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(одговара-све) захтева само један логички резултат"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Извршавам претрагу на непознато заглавље: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8866,15 +8998,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Нисам могао да прочитам gpg userid подсетник."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Нисам могао да прочитам захтев за gpg лозинком"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8883,27 +9015,27 @@ msgstr ""
 "Потребна вам је лозинка за откључавање кључа\n"
 "корисника: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Поништено."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Нисам могао да откључам тајни кључ: дате су 3 погрешне лозинке."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочекиван одговор од GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Нисам могао да шифрирам: нису означени исправни примаоци. "
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8914,83 +9046,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Нисам могао да применим GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Нисам могао да образујем податке за потписивање: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ово је део поруке са дигиталним потписом"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Не могу да проверим потпис поруке: нисам могао да направим temp датотеку: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Нисам могао да образујем податке за шифровање: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Ово је дигитално шифрован део поруке"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Шифрован садржај"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Не могу да рашчланим садржај поруке"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не могу да направим везу ка помоћнику закључавања: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Не могу да поделим помоћника закључавања: %s"
-
-#: 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 ""
-"Нисам могао да закључам '%s': грешка у протоколу са помоћником закључавања"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Нисам могао да закључам '%s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9013,6 +9124,27 @@ msgstr "Нисам могао да закључам користећи fcntl(2):
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Нисам могао да закључам користећи flock(2): %s "
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не могу да направим везу ка помоћнику закључавања: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не могу да поделим помоћника закључавања: %s"
+
+#: 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 ""
+"Нисам могао да закључам '%s': грешка у протоколу са помоћником закључавања"
+
+#: 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"
@@ -9263,7 +9395,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Лош одговор на пријаву од сервера."
 
@@ -9463,7 +9595,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Сертификат за ши_фровање:"
 
 #: camel/camel-smime-context.c:360
@@ -9480,7 +9612,7 @@ msgstr "Нисам могао да направим S/MIME контекст за
 msgid "Failed to add data to CMS encoder"
 msgstr "Неуспешно додавање у локални директоријум Послато: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Нисам могао да се пријавим.\n"
@@ -9546,99 +9678,99 @@ msgstr "Не могу да направим директоријум: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Не могу да добијем поруку %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Неуспео потпис сертификата"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Исправан потпис"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Потписао: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Неуспела DATA команда"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Нисам могао да нађем сертификат за \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Нисам могао да нађем општи bulk алгоритам."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "На_прави правило од поруке"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Нисам могао да направим S/MIME контекст за дешифрирање."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Неуспешно слање корисничког имена серверу"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Команда није подржана"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9655,16 +9787,26 @@ msgstr "Не могу да направим директоријум „%s“: �
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не могу да направим директоријум: неисправна операција"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Не могу да направим директоријум „%s“: директоријум постоји"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Не могу да обришем директоријум: %s: неисправна операција"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Не могу да променим име  директоријуму: %s: неисправна операција"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Смеће"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Ђубре"
@@ -9785,7 +9927,7 @@ msgstr "Употреба кључа не подржава потпис серт�
 msgid "Error in application verification"
 msgstr "Грешка код провере програма"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9798,11 +9940,11 @@ msgstr ""
 "Ознака:       %s\n"
 "Потпис:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "ДОБАР"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "ЛОШ"
 
@@ -9826,7 +9968,7 @@ msgstr ""
 "Желите ли свеједно да прихватите?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9841,7 +9983,7 @@ msgstr ""
 "\n"
 "Желите ли да прихватите?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9850,7 +9992,7 @@ msgstr ""
 "Проблем са сертификатом: %s\n"
 "Издавач: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9859,7 +10001,7 @@ msgstr ""
 "Лош домен сертификата: %s\n"
 "Издавач: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9868,7 +10010,7 @@ msgstr ""
 "Истекао сертификат: %s\n"
 "Издавач: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9882,17 +10024,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Нисам могао да обрадим URL `%s"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Грешка код смештања `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Нема такве поруке %s у %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Не могу да копирам или преместим поруке у виртуелни директоријум"
 
@@ -9901,11 +10043,6 @@ msgstr "Не могу да копирам или преместим поруке
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Не могу да обришем директоријум: %s: нема таквог директоријума"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Не могу да променим име  директоријуму: %s: неисправна операција"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9920,10 +10057,12 @@ 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 "Провери за нове поруке у свим директоријумима"
@@ -9954,6 +10093,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "За приступ Новел Групвајз серверима"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9973,26 +10113,319 @@ msgstr ""
 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: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Не могу да изаберем директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, 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 је неочекивано прекинута: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr "Примих одговор BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Не могу да преузмем директоријум „%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/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 "Не могу да обришем директоријум „%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“: лоша наредба"
+
+#: 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“: лоша наредба"
+
+#: 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:429
+#, 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
+#, c-format
+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:140
+#: 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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: 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 ""
+"Нисам могао да се повежем на IMAP сервер %s у безбедном режиму: сервер не "
+"подржава 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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Нисам могао да се повежем на IMAP сервер %s у сигурносном моду: %s"
+
+#: 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:1109
+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 ""
+"Нисам могао да се пријавим на ИМАП сервер %s помоћу механизма пријаве „%s“"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sУнесите ИМАП лозинку корисника „%s“ на рачунару %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Име директоријума \"%s\" није исправно јер садржи карактер \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Не могу да направим директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Не могу да направим директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Не могу да обришем директоријум „%s“: нарочити директоријум"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Не могу да обришем директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Наредба:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Не могу да се претплатим на директоријум „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Не могу да се претплатим на директоријум „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Не могу да се одјавим са директоријума „%s“: неисправно име сандучета"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Не могу да се одјавим са директоријума „%s“: лоша наредба"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Неочекивани елемент у одговору ИМАП сервера %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr "Нема података"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "Веза са ИМАП сервером %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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Операција обустављена"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Веза са сервером је неочекивано искључена: %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:1089
-msgid "Unknown error"
-msgstr "Непозната грешка"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10037,21 +10470,21 @@ msgstr "Нисам могао да направим директоријум %s:
 msgid "Could not load summary for %s"
 msgstr "Нисам могао да учитам сажетак за %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Трагам за промењеним порукама"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -10067,25 +10500,25 @@ msgstr ""
 "Не могу да добијем поруку: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Нема такве поруке"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ова поруке није тренутно доступна"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Нисам могао да пронађем текст поруке у FETCH одговору."
 
@@ -10124,23 +10557,6 @@ msgstr "Користи произвољну наредбу за повезива
 msgid "Command:"
 msgstr "Наредба:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Директоријуми"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Покажи само одабране директоријуме"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Премости формат имена директоријума које даје сервер"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Формат имена"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Примени филтере на нове поруке у INBOX-у овог сервера"
@@ -10161,85 +10577,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "За читање и смештање поште на IMAP сервере."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP сервер %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP сервис за %s на %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL није доступан"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Повезивање поништено"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Нисам могао да се повежем на IMAP сервер %s у сигурносном моду: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "SSL/TLS екстензија није подржана."
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL преговори нису успели"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Нисам могао да се повежем помоћу наредбе %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP сервер %s не подржава тражени тип пријаве  %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Нисте унели лозинку."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10250,25 +10624,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Нема таквог директоријума %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Име директоријума \"%s\" није исправно јер садржи карактер \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Главни директоријум не може садржати директоријуме у себи"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10276,7 +10643,7 @@ msgstr "Главни директоријум не може садржати д�
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не могу да направим директоријум „%s“: директоријум постоји."
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Непознати главни директоријум: %s"
@@ -10385,58 +10752,58 @@ msgstr ""
 "Такође се може користити за читање стабла директоријума у Elm, Pine, или "
 "Mutt стилу."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Остава root %s није апсолутна путања"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Остава root %s није регуларан директоријум"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Локалне оставе немају сандуче."
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Локална датотека поште %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10502,7 +10869,7 @@ msgstr "Нисам могао да обришем директоријум `%s':
 msgid "not a maildir directory"
 msgstr "није maildir директоријум"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10835,7 +11202,7 @@ msgstr "Сервер је одбио корисника/лозинку"
 
 # Ово је било "корисник поништен", али мислим да је ово ипак исправније
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10844,8 +11211,8 @@ msgid "User cancelled"
 msgstr "Корисник поништио"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10854,46 +11221,46 @@ msgstr "Корисник поништио"
 msgid "Cannot get message %s: %s"
 msgstr "Не могу да добијем поруку %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Унутрашња грешка: КИБ у неисправном облику: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr "Сервер не дозвољава слање чланака"
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr "Не можете послати NNTP поруке док нисте повезани!"
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Не можете копирати поруке из NNTP директоријума!"
 
@@ -11019,7 +11386,8 @@ msgstr "Нисам могао да добијем групу: %s"
 
 # bug: s/unspecificed/unspecified/
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Нисам могао да преузмем поруке: неназначена грешка"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11072,8 +11440,8 @@ msgstr "Нема порука са uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Преузимам POP поруку %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Непознат разлог"
 
@@ -11517,7 +11885,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "прилог"
 
@@ -11561,6 +11929,105 @@ msgstr "МИМЕ тип:"
 msgid "Suggest automatic display of attachment"
 msgstr "Предложи аутоматско отварање прилога"
 
+# bug: set for from account? probably 'for "from" account'
+#: 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 "Не могу да отворим датотеку"
+
+#: 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:1479
+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] "<b>%d</b> датотека прикачена"
+msgstr[1] "<b>%d</b> датотеке прикачене"
+msgstr[2] "<b>%d</b> датотека прикачено"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Сакриј _траку прилога (овде превуците прилоге)"
+
+#: 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 ""
+"Нисам могао да направим прозор за састављање:\n"
+"Не могу да покренем контролу бирања адреса."
+
+#: 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 ""
+"Нисам могао да направим прозор за састављање:\n"
+"Не могу да активирам компоненту HTML уредника.\n"
+"Молим проверите да имате одговарајуће верзије\n"
+"gtkhtml и libgtkhtml на систему.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Нисам могао да направим прозор за састављање:\n"
+"Не могу да активирам компоненту HTML уредника."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Уредник садржи у тексту поруке не садржи текст, и не може бити мењан.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Одредиште"
@@ -11641,213 +12108,135 @@ msgstr "Притисните овде да изаберете директори
 msgid "Attach file(s)"
 msgstr "Приложи датотеке"
 
-# bug: set for from account? probably 'for "from" account'
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Не могу да потпишем одлазећу поруку: није постављен сертификат за "
-"потписивање на овом налогу"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Не могу да шифрујем одлазећу поруку: није постављен сертификат за шифровање "
-"на овом налогу"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Не могу да отворим датотеку"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Не могу да повратим поруку из уредника"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Неименована порука"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Отвори датотеку"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Аутогенерисан"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Потпис:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> датотека прикачена"
-msgstr[1] "<b>%d</b> датотеке прикачене"
-msgstr[2] "<b>%d</b> датотека прикачено"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Сакриј _траку прилога (овде превуците прилоге)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Прикажи _траку прилога (овде превуците прилоге)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Састави поруку"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Додај датотеку поруци"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Нисам могао да направим прозор за састављање:\n"
-"Не могу да покренем контролу бирања адреса."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Нисам могао да направим прозор за састављање:\n"
-"Не могу да активирам компоненту HTML уредника.\n"
-"Молим проверите да имате одговарајуће верзије\n"
-"gtkhtml и libgtkhtml на систему.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Нисам могао да направим прозор за састављање:\n"
-"Не могу да активирам компоненту HTML уредника."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Уредник садржи у тексту поруке не садржи текст, и не може бити мењан.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Непрочитаних порука"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Желите ли да сачувате промене?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Нисам могао да направим везу: %s"
+msgid "Don't Recover"
+msgstr "Не уклањај"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Нисам могао да сачувам потпис: %s"
+msgid "Recover"
+msgstr "Уклони"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Нисам могао да сачувам потпис: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Занемари промене"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Желите ли да сачувате промене?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Грешка код чувања пречица."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Не уклањај"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Упозорење: измењена порука"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Грешка код чувања пречица."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Сигурно желите да обришете овај неименовани заказани састанак"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Уклони"
+msgid "Discard Changes"
+msgstr "_Занемари промене"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Сачувај поруку..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Нисам могао да направим везу: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Непрочитаних порука"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Нисам могао да сачувам потпис: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Упозорење: измењена порука"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Додај датотеку поруци"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Морате да подесите налог пре састављања поруке."
 
@@ -11977,7 +12366,8 @@ msgstr ""
 "Датотека са тим именом већ постоји.\n"
 "Да је препишем?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Да препишем датотеку?"
 
@@ -12161,81 +12551,97 @@ msgstr "Изаберите име за поређење"
 msgid "_Filter Rules"
 msgstr "<b>Пр_авила филтера</b>"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Грешка у регуларном изразу '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Датотека '%s' не постоји или није регуларна датотека."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Промена састанка"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "Посебно _име:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Морате дати име датотеци."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Премештам директоријум %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Датотека '%s' не постоји или није регуларна датотека."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Задатак"
+msgid "Missing folder."
+msgstr "Премештам директоријум %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Морате одредити директоријум."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Није изабран сервер"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Грешка у регуларном изразу '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Морате да изаберете датум."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Задатак"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Морате дати име овом филтеру."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Морате именовати овај vfolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Морате дати име датотеци."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Морате одредити директоријум."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Није изабран сервер"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12247,64 +12653,11 @@ msgstr "Изабери датотеку"
 msgid "<b>Then</b>"
 msgstr "<b>Онда</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Одаберите директоријум"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Важно"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "За урадити"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Касније"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Проба"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Име правила:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Без имена"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Ако</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Изврши акције"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "Ако су сви услови задовољени"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ако је било који услов задовољен"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "долазећи"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "одлазећи"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12394,6 +12747,75 @@ 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
+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
+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
+msgid "Later"
+msgstr "Касније"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Проба"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Име правила:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Ако</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "Ако су сви услови задовољени"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ако је било који услов задовољен"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Изврши акције"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Делегирано"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Примаоци"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Одговори на %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Укључи:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "долазећи"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "одлазећи"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12523,7 +12945,7 @@ msgstr "није означен"
 msgid "Junk Test"
 msgstr "Провера ђубрета"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Етикета"
@@ -12560,7 +12982,7 @@ msgstr "Кроз цев до програма"
 msgid "Play Sound"
 msgstr "Пусти звук"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Читај"
 
@@ -12629,9 +13051,9 @@ msgstr "почиње са"
 msgid "Stop Processing"
 msgstr "Прекини са обрадом"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Наслов"
@@ -12694,103 +13116,60 @@ msgstr "Наслов не садржи"
 msgid "Virtual _Folders"
 msgstr "<b>Виртуелни _директоријуми</b>"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Додај"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder извор"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Поставке састављача"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Подесите особине за пошту, укључујући сигурност и приказ поруке, овде"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Подесите ваше налоге за пошту овде"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Еволуција пошта"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Контрола подешавања Еволуција налога за пошту"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Компонента Еволуција поште"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Састављач Еволуција поште"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Контрола подешавања Еволуција састављача"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Прегледник за директоријуме Еволуција поште"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Контрола особина Еволуција поште"
-
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Пошта"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "Особине поште"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Предефинисано]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Име налога"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Протокол"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Без имена"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Језик(ци)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Додај потпис"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Потпис(и)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Прослеђена порука --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "У %a, %d. %m. %Y у %H:%M %%+05d, %%s написа:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Направи _Виртуелни директоријум из претраге..."
 
@@ -12824,264 +13203,438 @@ msgstr "<протисните овде да изаберете директор�
 msgid "Create New Folder"
 msgstr "Направи нови директоријум"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolder-и"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "НЕПОКЛОПЉЕН"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Сандуче"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Учитавам..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Премештам директоријум %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Умножавам директоријум %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Премештам поруке у директоријум %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копирам поруке у директоријум %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Не могу да убацим поруке у смештај на највишем нивоу"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "Пре_мести"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Откажи задужење"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Одаберите директоријум"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Умножи"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Правим директоријум „%s“"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Направи директоријум"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Преименуј директоријум „%s“ у:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Преименуј директоријум"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "П_реглед"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Отвори у _новом прозору"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "Пре_мести"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Нови директоријум..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Преимену_ј"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VFolder-и"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+msgid "Loading..."
+msgstr "Учитавам..."
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: 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
+msgid "Mail"
+msgstr "Пошта"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Уреди као нову поруку..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Штампај"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Одговори на _листу"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Одговори _Свима"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Просл_еди"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Пр_ати..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Означ_и завршене"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Скло_ни ознаку"
 
-#: mail/em-folder-view.c:787 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 "О_значи као прочитано"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Означи као _непрочитано"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Оначи као _важно"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Означи као неважно"
 
-#: mail/em-folder-view.c:791 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 "Означи као _ђубре"
 
-#: mail/em-folder-view.c:792 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 "Означи да _није ђубре"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Пониш_ти брисање"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Прене_си у директоријум..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Копирај у директоријум..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Додај пошиљаоца у адреса_р"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "При_мени филтере"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "Ф_илтрирај ђубре"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "На_прави правило од поруке"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder на _Наслов"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder на П_ошиљаоца"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder на _Примаоце"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder на дописну _листу"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder за нит"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Филтрирај према насло_ву"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Филтрирај према п_ошиљаоцу"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Филтрирај према п_римаоцу"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Филтрирај према _дописној листи"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Филтрирај прем _нити"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Подразумевани"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Штампај поруку"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Умножи адресу везе"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Кликните да пошаљете %s"
 
-#: mail/em-folder-view.c:2214
+#: 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: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
+msgid "Newsgroups"
+msgstr "Дискусионе групе"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Кликните да отворите %s"
+msgid "%s attachment"
+msgstr "%s прилог"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Не могу да обрадим С/МИМЕ поруку: непозната грешка"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Неподржана врста шифровања за multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Неподржан облик потписа"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Грешка при провери потписа"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Непозната грешка при провери потписа"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Преузимам „%s“"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Непотписана"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Исправан потпис"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Неисправан потпис"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Исправан потпис, не могу да проверим пошиљаоца"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Нешифровано"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Шифрована, слабо"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Шифрована"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Шифрована, добро"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Лоше сложен спољни део."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Показивач на FTP адресу (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Показивач на локалну датотеку (%s) која одговара адреси \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "показивач на локалну датотеку (%s)"
+
+#: 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\" типа)"
+
+#: mail/em-format-html.c:1137
+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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
@@ -13090,22 +13643,14 @@ msgstr "Кликните да отворите %s"
 msgid "Matches: %d"
 msgstr "Поклапања: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Непотписана"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ова порука није потписана. Нема гаранција да је пошиљалац поруке исправан."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Исправан потпис"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13113,11 +13658,7 @@ msgstr ""
 "Ова порука је потписана и исправна што значи да је пошиљалац поруке врло "
 "вероватно онај за кога се издаје."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Неисправан потпис"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13125,11 +13666,11 @@ msgstr ""
 "Потпис ове поруке није могао бити проверен, можда је измењена приликом "
 "преноса."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Исправан потпис, не могу да проверим пошиљаоца"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13137,11 +13678,7 @@ msgstr ""
 "Порука је потписана исправним потписом, али пошиљалац поруке није могао бити "
 "проверен."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Нешифровано"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13150,11 +13687,7 @@ msgstr ""
 "Ова порука није шифрована.  Њен садржај је могуће видети приликом преноса "
 "преко Интернета."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Шифрована, слабо"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13163,11 +13696,7 @@ msgstr ""
 "Ова порука је шифрована, али слабим алгоритмом. Тешко је, али не и немогуће, "
 "да неко са стране види садржај ове поруке у догледно време."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Шифрована"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13175,11 +13704,7 @@ msgstr ""
 "Ова порука је шифрована. Тешко је могуће да неко са стране види садржај ове "
 "поруке."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Шифрована, добро"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13188,179 +13713,61 @@ msgstr ""
 "Ова порука је шифрована, и то добрим алгоритмом. Веома тешко је могуће да "
 "неко са стране види садржај ове поруке у догледном времену."
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "По_гледај сертификат"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Овај сертификат се не може прегледати"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Завршено: %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Прекорачено:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "до %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "По_гледај унутар"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Сакриј"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Страна %d од %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Преузимам „%s“"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Лоше сложен спољни део."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Показивач на FTP адресу (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Показивач на локалну датотеку (%s) која одговара адреси \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "показивач на локалну датотеку (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Показивач на мрежни податак (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Показивач на напознати спољни податак (\"%s\" типа)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Обликујем поруку"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Од"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Одговор-за"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Коме"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc (копија)"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc (невидљива копија)"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Пошиљалац"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Датум"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Дискусионе групе"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s прилог"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Не могу да обрадим С/МИМЕ поруку: непозната грешка"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Неподржана врста шифровања за multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Нисам могао да обрадим MIME поруку. Показујем као извор."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Неподржан облик потписа"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Грешка при провери потписа"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Непозната грешка при провери потписа"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Убица-спама (уграђен)"
 
 # слично као за месеце и недеље
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Сваки пут"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Једном дневно"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Једном недељно"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Једном месечно"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13372,25 +13779,55 @@ msgstr ""
 "\n"
 "Будите стрпљиви док Еволуција пренесе ваше директоријуме..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Неуспешан пренос оставе КИБ-ова за ПОП3: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Не могу да направим директоријум „%s“: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Неуспешан пренос стања раширености директоријума: %s"
+#: mail/em-migrate.c:1532
+#, fuzzy, c-format
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Не могу да копирам опис датотеке: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr "Не могу да сачувам датотеку са списком група за %s: %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Нисам могао да се пријавим на POP сервер %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "Неуспешно прављење директоријума „%s“: %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Неуспешно отварање смештаја за „%s“: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Неуспешно прављење директоријума „%s“: %s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Не могу да направим излазну датотеку: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13401,88 +13838,74 @@ msgstr "Сачувај као..."
 msgid "untitled_image.%s"
 msgstr "неименована_слика.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Постави на _позадину"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Одговори пошиљаоцу"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Отвори везу у читачу"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Пошаљи _поруку..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Додај у _адресар"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Отвори у %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Овај смештај не подржава претплате, или нису омогућене."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Претплати се"
 
-#: mail/em-subscribe-editor.c:637 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 "Директоријум"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Молим изаберите сервер."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Није изабран сервер"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Не показуј поново ову поруку."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Филтери"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Прослеђена порука --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "У %a, %d. %m. %Y у %H:%M %%+05d, %%s написа:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "порука"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Сачувај поруку..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Додај адресу"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Поруке од %s"
@@ -13501,12 +13924,14 @@ msgstr "Провери да ли је пристигла пошта ђубре"
 
 # bug: British or American English?
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Боја истицања цитата"
 
 # bug: British or American English?
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Боја истицања цитата."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13611,14 +14036,20 @@ msgstr "Последње време пражњења смећа"
 
 # bug: American English or British?
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Списак ознака и одговарајућих боја"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Списак налога"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Списак налога"
+
+#: 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."
@@ -13626,28 +14057,33 @@ msgstr ""
 "Списак налога које познаје поштански део Еволуције. Списак садржи ниске које "
 "именују подкатегорије у односу на /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Списак произвољних заглавља и да ли су укључена."
 
 # bug: American or British English?
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Списак ознака које познаје поштански део Еволуције. Списак садржи ниске које "
 "садрже име:боја где боја користи ХТМЛ хексадекадни запис."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Списак врсти датотека за проналажење Бонобо прегледача"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Учитај слике за ХТМЛ поруке преко ХТТП-а"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13657,89 +14093,89 @@ msgstr ""
 "не учитавај поруке преко мреже, 1 — учитај поруке ако је пошиљалац у "
 "адресару, 2 — увек учитај слике преко мреже"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Бележи дејство филтера"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Бележи дејство филтера у наведену датотеку дневника."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Дневник у који да бележи дејство филтера"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Дневник у који да бележи дејство филтера."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Означи као виђену након одређеног времена"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Означи као виђену након одређеног времена."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Означи цитате у прегледу поруке"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Означи цитате у прегледу поруке."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Подразумевана висина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Подразумевана ширина прозора за поруку"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Стил приказа поруке (обичан, сва заглавља, изворни)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Најмање дана између пражњења смећа по изласку"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Најмање време између пражњења смећа по изласку, у данима."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Звук за обавештење о новој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Врста обавештења о новој пошти"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Упитај када је тема празна"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Упитај корисника када жели да испразни директоријум."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Упитај при пражњењу"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Упитај када корисник упути само невидљиву копију"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13747,35 +14183,27 @@ msgstr ""
 "Упитај када корисник покуша да пошаље ХТМЛ поруке примаоцима који можда не "
 "желе да примају ХТМЛ пошту."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Упитај корисника када покуша да пошаље поруку без навођења коме или копије."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Упитај када корисник покуша да пошаље нежељени ХТМЛ"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Препознај везе у тексту и замени их."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Препознај смешке у тексту и замени их сликама."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Провери да долазећа пошта није ђубре"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "т4јН4 0пЦиј4"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "т4јН4 0пЦиј4."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Подразумевано шаљи ХТМЛ пошту"
@@ -13822,7 +14250,7 @@ msgstr "Истовремена провера правописа"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Подразумевана висина прозора за поруку"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13967,33 +14395,63 @@ msgstr "порт за покретање корисниковог spamd-а"
 msgid "spamd port"
 msgstr "порт spamd-а"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Еволуција Elm увозник"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Еволуција Netscape пошта увозник"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Поставке састављача"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Еволуција Outlook Express 4 увозник"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Подесите особине за пошту, укључујући сигурност и приказ поруке, овде"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Еволуција Pine увозник"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Подесите проверу правописа, потписе, и састављач поруке овде"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Еволуција mbox увозник"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Подесите ваше налоге за пошту овде"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MБокс (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Еволуција пошта"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Контрола подешавања Еволуција налога за пошту"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Компонента Еволуција поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Састављач Еволуција поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Контрола подешавања Еволуција састављача"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Контрола особина Еволуција поште"
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "Особине поште"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Пошта:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14001,15 +14459,15 @@ msgstr "Еволуција увози вашу стару Elm пошту"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Молим сачекајте"
 
@@ -14038,18 +14496,46 @@ msgid "Select folder to import into"
 msgstr "Изаберите директоријум у који да увезем"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Увозим „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Увозим поштанско сандуче"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Еволуција Elm увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Еволуција Netscape пошта увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Еволуција Outlook Express 4 увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Еволуција Pine увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Еволуција mbox увозник"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MБокс (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Претражујем %s"
@@ -14059,7 +14545,7 @@ msgstr "Претражујем %s"
 msgid "Priority Filter \"%s\""
 msgstr "Приоритетни филтер \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14084,7 +14570,7 @@ msgstr ""
 "приоритета. Проверите увежене филтере да се уверите\n"
 "да ли све ради као што би требало."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14096,7 +14582,7 @@ msgstr ""
 "опцију, коју Еволуција не подржава.\n"
 "Ови филтери неће остати."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14110,23 +14596,23 @@ msgstr ""
 "су промењени да могу да провере да ли тај низ јесте\n"
 "или није садржан у телу поруке."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Еволуција увози ваше старе Netscape податке"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Увозим податке из Нетскејпа"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Поставке"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Филтери поште"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14159,124 +14645,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Уредник Еволуција налога"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Сагласност кључа"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Домаћин:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Корисничко_име"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Путања:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта за %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Наслове је %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта од %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s дописна листа"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Одговори на %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Додај правило филтрирања"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d изабраних"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d непослатих"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Припрема"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d послатих"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d непослатих"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d укупно"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d непослатих"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d изабраних"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Нова порука"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Порука"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Састави нову поруку"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Нови директоријум са поштом"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Директоријум са поштом"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Направи нови директоријум са поштом"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "Адреса извора поште који ће бити приказани у прегледу"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "проверавам сервис"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: 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:89
 msgid "Identity"
 msgstr "Личност"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14286,12 +14784,12 @@ msgstr ""
 "морају бити попуњена, осим ако не желите да ове податке укључите у поруке "
 "које шаљете."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Примање поште"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14299,15 +14797,15 @@ msgstr ""
 "Молим унесите податке о вашем долазећем серверу за пошту. Ако нисте сигурни, "
 "питајте систем администратора или понуђача Интернет сервиса."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Молим изаберите од следећих опција"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Слање поште"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14315,11 +14813,11 @@ msgstr ""
 "Молим унесите податке о начину на који ћете слати пошту. Ако нисте сигурни, "
 "питајте систем администратора или понуђача Интернет сервиса."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Управљање налозима"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14332,14 +14830,6 @@ msgstr ""
 "Еволуција налог за пошту. Молим унесите доле име за овај налог. Ово име ће "
 "бити коришћено само за потребе приказивања на екрану."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "проверавам сервис"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Повезујем се на сервер..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_Провери подржане врсте "
@@ -14630,7 +15120,8 @@ msgstr "Изврши команду..."
 
 # bug: space too much?
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "У_тврђене-ширине:"
 
 #: mail/mail-config.glade.h:82
@@ -14936,353 +15427,458 @@ msgstr "боја"
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Директоријум са именом „%s“ већ постоји. Молим користите неко друго име."
+msgid "Invalid authentication"
+msgstr "Идентификација"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP сервер %s не подржава тражени тип ауторизације %s."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Сигурно желите да обришете овај налог?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Сигурно желите да отворите свих %d порука у посебним прозорима?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Сигурно желите да поново пошаљете свих %d порука?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Трајно уклони све обрисане поруке из свих директоријума"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Шаљете поруку у HTML облику. Проверите да ли \n"
+"наредни примаоци желе и могу да приме HTML пошту:\n"
+"%sСвакако пошаљи?"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Сигурно желите да поново пошаљете свих %d порука?"
+msgid "_Send"
+msgstr "Пошаљи"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Сигурно желите да поново пошаљете свих %d порука?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Сигурно желите да поново пошаљете свих %d порука?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Не могу да копирам директоријум: %s"
+msgid "Use default drafts folder?"
+msgstr "Путања до подразумеваног директоријума контаката"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Не могу да направим директоријум: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Не могу да отворим директоријум са припремом за овај налог.\n"
+"Желите ли да користите предефинисани директоријум са припремом?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Нисам могао да направим привремени директоријум: %s"
+msgid "Use _Default"
+msgstr "Подразумевани"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Не могу да направим директоријум\n"
-"%s\n"
-"Грешка: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Сигурно желите да отворите свих %d порука у посебним прозорима?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Не могу да обришем директоријум:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Не могу да обришем локални директоријум „%s“."
+msgid "_Expunge"
+msgstr "Изба_ци"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Не могу да преузмем директоријум „%s“: директоријум не постоји."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Трајно уклони све обрисане поруке из свих директоријума"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Не могу да преместим директоријум: %s"
+msgid "_Empty Trash"
+msgstr "Избаци _смеће"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Не могу да отворим извор"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Имате непослате поруке, желите ли свеједно да изађете?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Не могу да отворим извор"
+msgid "Error while {0}."
+msgstr ""
+"Грешка током '%s':\n"
+"%s"
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Не могу да отворим поруку"
+msgid "Error while performing operation."
+msgstr ""
+"Грешка током операције:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Не могу да преименујем локални директоријум „%s“."
+msgid "Enter password."
+msgstr "Унесите лозинку"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Грешка код учитавања података филтера:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Нисам могао да направим директоријум %s: %s."
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Не могу да сачувам у `%s'\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Додај потпис"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Не могу да направим директоријум\n"
+"%s\n"
+"Грешка: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Нисам могао да сачувам потпис: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Обриши „%s“"
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Обриши одабране контакте"
+msgid "Cannot create temporary save directory."
+msgstr "Нисам могао да направим привремени директоријум: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Желите ли да сачувате промене?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Не бриши"
+msgid "File exists but cannot overwrite it."
+msgstr "Датотека постоји, да је препишем?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Унесите лозинку"
+msgid "File exists but is not a regular file."
+msgstr "Датотека '%s' не постоји или није регуларна датотека."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Грешка код учитавања података филтера:\n"
+"Не могу да обришем директоријум:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Грешка током операције:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Не могу да обришем локални директоријум „%s“."
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Грешка током '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Датотека постоји, да је препишем?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Не могу да преименујем локални директоријум „%s“."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Датотека '%s' не постоји или није регуларна датотека."
+msgid "Delete \"{0}\"?"
+msgstr "Обриши „%s“"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Заиста да бришем директоријум „%s“, и све његове поддиректоријуме?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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/mail-errors.xml.in.h:47
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Идентификација"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Не могу да преместим директоријум: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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-errors.xml.in.h:49
-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: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-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Шаљете поруку у HTML облику. Проверите да ли \n"
-"наредни примаоци желе и могу да приме HTML пошту:\n"
-"%sСвакако пошаљи?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Не могу да направим директоријум: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Заиста да бришем директоријум „%s“, и све његове поддиректоријуме?"
+msgid "Cannot open source \"{1}\""
+msgstr "Не могу да отворим извор"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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: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/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"Следећи vFolder(и):\n"
-"%sКористили су уклоњени директоријум:\n"
-"    '%s'\n"
-"Потом су освежени."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Не бриши"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Следећи vFolder(и):\n"
-"%sКористили су уклоњени директоријум:\n"
-"    '%s'\n"
-"Потом су освежени."
+msgid "Could not save signature file."
+msgstr "Нисам могао да сачувам потпис: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Додај потпис"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Занемари промене"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP сервер %s не подржава тражени тип ауторизације %s."
+msgid "Do you wish to save your changes?"
+msgstr "Желите ли да сачувате промене?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15290,85 +15886,97 @@ msgstr ""
 "\n"
 "Желите ли да сачувате промене?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Не могу да отворим директоријум са припремом за овај налог.\n"
-"Желите ли да користите предефинисани директоријум са припремом?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Подразумевани"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Занемари промене"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Путања до подразумеваног директоријума контаката"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Нисте унели све потребне податке."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Имате непослате поруке, желите ли свеједно да изађете?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Не можете отворити два налога са истим именом."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Не могу да преузмем директоријум „%s“: директоријум не постоји."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Занемари промене"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Избаци _смеће"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Следећи vFolder(и):\n"
+"%sКористили су уклоњени директоријум:\n"
+"    '%s'\n"
+"Потом су освежени."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Изба_ци"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Пошаљи"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Следећи vFolder(и):\n"
+"%sКористили су уклоњени директоријум:\n"
+"    '%s'\n"
+"Потом су освежени."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Препиши"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Пошаљи"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Пингујем %s"
@@ -15377,20 +15985,20 @@ msgstr "Пингујем %s"
 msgid "Working"
 msgstr "Радим"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Филтрирам директоријум"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Узимам пошту"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Неуспешна примена одлазећих филтера: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15399,102 +16007,102 @@ msgstr ""
 "Неуспешно додавање у %s: %s\n"
 "Додајем у локални директоријум Послато."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Неуспешно додавање у локални директоријум Послато: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Шаљем поруку %d од %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Нисам успео да пошаљем %d од %d порука"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Готово."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Чувам поруку у директоријум"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Премештам поруке у %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копирам поруке у %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Претражујем директоријуме у \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Прослеђене поруке"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Отварам директоријум %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Отварам оставу %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Уклањам директоријум %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Смештам директоријум '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Чистим и смештам налог „%s“"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Смештам налог „%s“"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Освежавам директоријум"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Избацујем директоријум"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Празним смеће у '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Локални директоријуми"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Учитавам поруку %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15502,7 +16110,7 @@ msgstr[0] "Учитавам %d поруку"
 msgstr[1] "Учитавам %d поруке"
 msgstr[2] "Учитавам %d порука"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15510,7 +16118,7 @@ msgstr[0] "Чувам %d поруку"
 msgstr[1] "Чувам %d поруке"
 msgstr[2] "Чувам %d порука"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15519,7 +16127,7 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15528,11 +16136,11 @@ msgstr ""
 "Грешка код чувања порука у: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Чувам прилог"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15541,17 +16149,17 @@ msgstr ""
 "Не могу да направим излазну датотеку: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Нисам могао да упишем: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Прекидам везу са %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Поново се повезујем на %s"
@@ -15615,24 +16223,24 @@ msgstr "Освежавам..."
 msgid "Waiting..."
 msgstr "Чекам..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Корисник је поништио операцију."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Унесите лозинку за %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Унесите лозинку"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Запамти ову лозинку"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Запамти ову лозинку до краја ове сесије"
 
@@ -15672,89 +16280,94 @@ msgstr "Прослеђена порука"
 msgid "Invalid folder: `%s'"
 msgstr "Неисправан директоријум %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Постављам vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Освежавам вдиректоријуме за адресу: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Освежавам вдиректоријуме за адресу: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders-и"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Измени VFolder-е"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Нови VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Невиђено"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Виђено"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Одговорено"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Вишеструке невиђене поруке"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Вишеструке поруке"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Најниже"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Ниже"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Више"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Највише"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Данас %k:%M "
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Јуче %k:%M "
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Правим листу порука"
 
@@ -15786,43 +16399,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Означи за праћење"
 
@@ -15866,51 +16479,31 @@ msgstr "Претп_лати се"
 msgid "_Unsubscribe"
 msgstr "Одјави претплату"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Еволуција конзола"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Проба Еволуције"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Пробни део Еволуције"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Подразумевана група пречице"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Подразумевана ширина површи са директоријумима"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Подразумевана ширина површи са пречицама"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Подразумевана висина прозора"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Подразумевана ширина прозора"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Издање алата за подешавање Еволуције"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "ИБ или надимак дела који се уобичајено приказује по покретању."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -15918,7 +16511,7 @@ msgstr ""
 "Ако је постављено, Еволуција ће се покренути у неповезаном режиму уместо у "
 "повезаном режиму."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -15926,61 +16519,21 @@ msgstr ""
 "Ако је постављено, прозорче са упозорењем у развојним издањима Еволуције се "
 "неће приказивати."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Списак путања директоријума који се усклађују надиску за неповезану употребу"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Путања до подразумеваног директоријума календара"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Путања до подразумеваног директоријума контаката"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Путања до подразумеваног директоријума поште"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Путања до подразумеваног директоријума задужења"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Физичка адреса до подразумеваног директоријума календара"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Физичка адреса до подразумеваног директоријума контаката"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Физичка адреса до подразумеваног директоријума поште"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Физичка адреса до подразумеваног директоријума задужења"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr "Да ли се Еволуција покреће у неповезаном режиму"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-msgid "Whether to show the folder bar"
-msgstr "Да ли се приказује површ са директоријумима"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Да ли се приказује површ са пречицама"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr "Да ли да прескочи прозорче са упозорењем о развоју"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "пошта"
 
@@ -15988,6 +16541,32 @@ msgstr "пошта"
 msgid "Brought to you by"
 msgstr "Омогућили су"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Непозната грешка"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Неисправни аргументи"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Не могу да се региструје на OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "База са подешавањима није нађена"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Општа грешка"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Безимено)"
@@ -16125,11 +16704,11 @@ msgstr "Нисам могао да покренем увозника."
 msgid "_Import"
 msgstr "У_воз"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Затварам везе..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Подешавања Еволуције"
 
@@ -16171,11 +16750,35 @@ msgstr "Име директоријума не може да садржи зна
 msgid "'.' and '..' are reserved folder names."
 msgstr "„.“ и „..“ су резервисана имена директоријума."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Еволуција је тренутно на мрежи. Притисните ово дугме да радите без "
+"мреже."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Еволуција је у процесу одласка у рад без мреже."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Еволуција није тренутно на мрежи. Притисните ово дугме да радите на "
+"мрежи."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Пошта за %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Изгледа да GNOME Pilot алати нису инсталирани на овај систем."
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Грешка код покретања %s."
@@ -16189,14 +16792,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy не може да се покрене."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "О Ximian Еволуцији"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_На мрежи"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Није на мрежи"
 
@@ -16204,51 +16808,6 @@ msgstr "_Није на мрежи"
 msgid "Work Offline"
 msgstr "Ради без мреже"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Еволуција је тренутно на мрежи. Притисните ово дугме да радите без "
-"мреже."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Еволуција је у процесу одласка у рад без мреже."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Еволуција није тренутно на мрежи. Притисните ово дугме да радите на "
-"мрежи."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Упозорење: Еволуција не може да догради све ваше податке из издања %d.%d.%"
-"d.\n"
-"Ваши подаци нису обрисани, али неће бити приказани у овом издању Еволуције.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Неисправни аргументи"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Не могу да се региструје на OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "База са подешавањима није нађена"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Општа грешка"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Кућица"
@@ -16319,6 +16878,43 @@ msgstr "Активне везе"
 msgid "Click OK to close these connections and go offline"
 msgstr "Изаберите OK да прекинете везу"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "К_алендар"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Конаткти: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Пошта:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "За_дужења:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Врста директоријума:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Отвори директоријум другог корисника"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Налог:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Име директоријума:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Корисник:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Помоћник Еволуција подешавања"
@@ -16361,6 +16957,18 @@ msgstr ""
 "\n"
 "Притисните дугме \"Примени\" да сачувате ваша подешавања. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Еволуција конзола"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Проба Еволуције"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Пробни део Еволуције"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Притисните \"Увези\" да започнете са увозом датотеке у Еволуцију. "
@@ -16420,13 +17028,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Еволуција може да увезе податке из следећих датотека:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16455,57 +17063,48 @@ msgstr ""
 "Надамо се да ћете уживати у плодовима нашег напорног рада, и \n"
 "жељно ишчекујемо ваше доприносе!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Хвала\n"
 "Тим Ximian Еволуције\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Немој ми поново рећи"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Не могу да приступим конзоли Ximian Еволуције"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Не могу да покренем конзолу Ximian Еволуције: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Покрени Еволуцију уз наведени део"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Почни са радом без мреже"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Почни са радом на мрежи"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Силом угаси све делове еволуције"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Приморај поновни пренос података из Еволуције 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Пошаљи излаз о грешкама из свих делова у датотеку."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Еволуција"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16514,13 +17113,79 @@ msgstr ""
 "%s: --online и --offline се не могу користити заједно.\n"
 "  Користите %s --help за више података.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Повезујем се"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Не могу да приступим конзоли Ximian Еволуције"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
 msgstr "Изаберите сертификат за увоз..."
 
 #: smime/gui/certificate-manager.c:243 smime/gui/certificate-manager.c:409
-#: smime/gui/certificate-manager.c:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Име сертификата"
 
@@ -16749,11 +17414,6 @@ msgstr "Држите ове сертификате који одређују о�
 msgid "Your Certificates"
 msgstr "Ваши сертификати"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Сертификат већ постоји"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
@@ -16944,6 +17604,11 @@ msgstr "Јединствени ИБ субјекта"
 msgid "Certificate Signature Value"
 msgstr "Вредност потписа сертификата"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+msgid "Certificate already exists"
+msgstr "Сертификат већ постоји"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 лозинка датотеке"
@@ -16983,12 +17648,12 @@ msgstr "Предефинисан наслов поруке."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Нисам могао да извршим „%s“: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Гасим %s (%s)\n"
@@ -17053,7 +17718,8 @@ msgid "Select all contacts"
 msgstr "Изабери све контакте"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Пошаљи поруку изабраним контактима."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17084,8 +17750,8 @@ msgstr "Прегледај текући контакт"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Акције"
@@ -17103,7 +17769,8 @@ msgid "_Preview Pane"
 msgstr "_Простор за преглед"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Сачувај као VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17230,10 +17897,20 @@ msgstr "Прегледај текући заказани састанак"
 msgid "Week"
 msgstr "Недеља"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Радна недеља"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 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 "З_атвори"
+
 #: 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
@@ -17553,6 +18230,16 @@ msgstr "_Обрни избор"
 msgid "_Threaded Message List"
 msgstr "Листа порука према _нити разговора"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "_Затвори"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Додај _пошиљаоца у адресар"
@@ -17790,7 +18477,8 @@ msgid "Open the selected message in a new window"
 msgstr "Отвори изабрану поруку у новом прозору"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Отвори изабрану поруку ради поновног слања"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17906,58 +18594,46 @@ msgstr "Привидни директоријум на _наслов..."
 msgid "_Attached"
 msgstr "_Приложено"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Копирај у директоријум"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Направи филтер од поруке"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Иди на"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Унутар"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Веће"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Приказ _поруке"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Премести у директоријум"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Следећа порука"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Нормалан при_каз"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Отвори поруку"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Претходна порука"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Цитирано"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Поново поша_љи..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Ала_ти"
@@ -17966,16 +18642,6 @@ msgstr "Ала_ти"
 msgid "_Undelete"
 msgstr "_Поврати"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Затвори"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Приложи"
@@ -18365,6 +19031,11 @@ msgstr "_Кратки подсетник"
 msgid "_Send / Receive"
 msgstr "_Пошаљи / прими"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Про_зор"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Према _предузећу"
@@ -18432,10 +19103,6 @@ msgstr "Датум завршетка:"
 msgid "With _Status"
 msgstr "Додели статус"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Задужења"
-
 # Универзално време, или УТ
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
@@ -18594,6 +19261,34 @@ msgstr "Друго..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Грешка Еволуције"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Еволуција пошта"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Информација о састанку"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Еволуција сажетак"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Фонтови за штампу</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Разгранати"
@@ -18708,6 +19403,35 @@ msgstr "Текст"
 msgid "Find _Now"
 msgstr "Нађи _сада"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"Желите ли да препишете новим уносом?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Не могу да сачувам у `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Не могу да сачувам у `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18718,12 +19442,153 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% завршено)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Прегледник директоријума Еволуција адресара"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Адреса _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Блогче"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Прегледник Еволуција календара"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Прегледник Еволуција задужења"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Нисам могао да учитам  gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Нисам могао да отворим директоријум у '%s"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI коју ће календар показати"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Тип погледа за приказ"
+
+#~ msgid "Display a message"
+#~ msgstr "Покажи поруку"
+
+#~ msgid "Alerts"
+#~ msgstr "Упозорења"
+
+#~ msgid "Time"
+#~ msgstr "Време"
+
+#~ msgid "_General"
+#~ msgstr "_Опште"
+
+#~ msgid "Select source"
+#~ msgstr "Изаберите извор"
+
+#~ msgid "calendar"
+#~ msgstr "календар"
+
+#~ msgid "task list"
+#~ msgstr "списак задужења"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Датотека календара није могла бити ажурирана\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr "Адресар „%s“ ће бити уклоњен. Сигурно желите да наставите?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "Машинерија задужења за \n"
+#~ "%s\n"
+#~ " је пукла."
 
-#~ msgid "New Address Book"
-#~ msgstr "Нови адресар"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Адреса директоријума задужења за приказ"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Нисам могао да учитам задужења у `%s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Прегледник за директоријуме Еволуција поште"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder за нит"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Филтрирај прем _нити"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Неуспешан пренос оставе КИБ-ова за ПОП3: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Неуспешан пренос стања раширености директоријума: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Неуспешно отварање смештаја за „%s“: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "т4јН4 0пЦиј4"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "т4јН4 0пЦиј4."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Адреса извора поште који ће бити приказани у прегледу"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Подразумевана група пречице"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Подразумевана ширина површи са пречицама"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Путања до подразумеваног директоријума календара"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Путања до подразумеваног директоријума контаката"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Путања до подразумеваног директоријума поште"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Путања до подразумеваног директоријума задужења"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Физичка адреса до подразумеваног директоријума календара"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Физичка адреса до подразумеваног директоријума контаката"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Физичка адреса до подразумеваног директоријума поште"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Физичка адреса до подразумеваног директоријума задужења"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Да ли се приказује површ са директоријумима"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Да ли се приказује површ са пречицама"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Упозорење: Еволуција не може да догради све ваше податке из издања %d.%d.%"
+#~ "d.\n"
+#~ "Ваши подаци нису обрисани, али неће бити приказани у овом издању "
+#~ "Еволуције.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Не могу да покренем конзолу Ximian Еволуције: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Поново поша_љи..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "КИБ извора контаката који ће бити приказани у прегледу"
@@ -18894,9 +19759,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "S_pouse:"
 #~ msgstr "С_упружник:"
 
-#~ msgid "_Add"
-#~ msgstr "_Додај"
-
 #~ msgid "_Business:"
 #~ msgstr "_Посао:"
 
@@ -19018,15 +19880,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Датум завршетка је пре датума почетка!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Датум почетка:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Датум завршетка:"
-
-#~ msgid "Priority:"
-#~ msgstr "Важност:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19058,13 +19911,6 @@ msgstr "%s (%d%% завршено)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Не могу да копирам опис датотеке: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19210,9 +20056,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Преглед који приказује када почиње календар"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Унесите лозинку за „%s“"
-
 #~ msgid "New task list"
 #~ msgstr "Нови списак задужења"
 
@@ -19269,30 +20112,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Не могу да нађем наведени дељени директоријум."
 
-#~ msgid "C_alendar:"
-#~ msgstr "К_алендар"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Пошта:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "За_дужења:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Врста директоријума:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Отвори директоријум другог корисника"
-
-#~ msgid "_Account:"
-#~ msgstr "_Налог:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Име директоријума:"
-
-#~ msgid "_User:"
-#~ msgstr "_Корисник:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Направи нови прозор"
 
@@ -19314,75 +20133,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "_Go To Today"
 #~ msgstr "_Иди на данас"
 
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Неочекиван одговор од IMAP сервера %s: %s"
-
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Не могу да изаберем директоријум „%s“: неисправно име сандучета"
-
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Не могу да изаберем директоријум „%s“: лоша наредба"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Веза са ИМАП сервером %s је неочекивано прекинута: %s"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Примих одговор BYE"
-
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "Нисам могао да се повежем на IMAP сервер %s у безбедном режиму: сервер не "
-#~ "подржава STARTTLS"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Нисам могао да се пријавим на ИМАП сервер %s помоћу механизма пријаве „%s“"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sУнесите ИМАП лозинку корисника „%s“ на рачунару %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Нисам могао да се пријавим на ИМАП сервер %s помоћу %s"
-
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Не могу да направим директоријум „%s“: неисправно име сандучета"
-
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Не могу да направим директоријум „%s“: лоша наредба"
-
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Не могу да обришем директоријум „%s“: нарочити директоријум"
-
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Не могу да обришем директоријум „%s“: неисправно име сандучета"
-
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Не могу да обришем директоријум „%s“: лоша наредба"
-
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Не могу да се претплатим на директоријум „%s“: неисправно име сандучета"
-
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Не могу да се претплатим на директоријум „%s“: лоша наредба"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Не могу да се одјавим са директоријума „%s“: неисправно име сандучета"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Не могу да се одјавим са директоријума „%s“: лоша наредба"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Неочекивани елемент у одговору ИМАП сервера %s: "
-
-#~ msgid "No data"
-#~ msgstr "Нема података"
-
 #~ msgid "<b>Filter Rules</b>"
 #~ msgstr "<b>Правила филтера</b>"
 
@@ -19398,9 +20148,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "[script]"
 #~ msgstr "[скрипта]"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Следеће везе су тренутно активне:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Потражи контакте"
 
@@ -19941,9 +20688,6 @@ msgstr "%s (%d%% завршено)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "Ова порука је дигитално потписана али не може бити проверена."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Грешка Еволуције"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20041,15 +20785,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "<b>Звук аларма</b>"
 
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "<b>Подсетници</b>"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Узбуне</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Списак задужења</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Класификација</b>"
 
@@ -20748,9 +21483,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "No cards"
 #~ msgstr "Нема карата"
 
-#~ msgid "%d cards"
-#~ msgstr "%d карата"
-
 #~ 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,а,б,в,г,д,ђ,ж,з,и,ј,к,л,љ,м,н,њ,о,п,р,с,т,ћ,у,ф,х,ц,ч,џ,ш"
 
@@ -21087,9 +21819,6 @@ msgstr "%s (%d%% завршено)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Подесите овде изглед Еволуција сажетка"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Еволуција сажетак"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Компонента Еволуција сажетка"
 
diff --git a/po/sr@Latn.po b/po/sr@Latn.po
index f6afb14998..3353b1d7bd 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -25,6 +25,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "adresar evolucije"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "zaglavlje kontakta: "
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "vizitkarta evolucije"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "tekući direktorijum adresara"
@@ -48,14 +56,6 @@ msgstr " karte"
 msgid " card"
 msgstr " karta"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "zaglavlje kontakta: "
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "vizitkarta evolucije"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Podrazumevana adresa za sinhronizovanje:"
@@ -70,64 +70,20 @@ msgstr "Nisam mogao da učitam adresar"
 msgid "Could not read pilot's Address application block"
 msgstr "Nisam mogao da pročitam programski blok adresa pilota"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Samodopunjavanje"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikati"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomple here"
-msgstr "Podesite ovde samodopunjavanje"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakti"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolucija adresar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Iskačući prozor za adrese Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Preglednik adresa Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Preglednik Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Deo Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Preglednik direktorijuma Evolucija adresara"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Anonimno pristupam LDAP serveru"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Nisam mogao da se prijavim.\n"
 
-# bug: s/manager/manage/
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "Ovde upravljajte vašim S/MIME sertifikatima"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sUnesi lozinku za %s (korisnik %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -168,41 +124,45 @@ msgstr "_Kontakti:"
 msgid "Create a new contacts group"
 msgstr "Napravi novu grupu prečica"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Prenosim..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Prenosim „%s“:"
@@ -210,8 +170,8 @@ msgstr "Prenosim „%s“:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Na ovom računaru"
 
@@ -219,7 +179,7 @@ msgstr "Na ovom računaru"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Lično"
@@ -285,20 +245,41 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Anonimno pristupam LDAP serveru"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Nisam mogao da se prijavim.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Novi adresar"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sUnesi lozinku za %s (korisnik %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -319,6 +300,62 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr "Adresa za direktorijum poslednje korišćen u prozorčetu za izbor imena"
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Samodopunjavanje"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakti"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikati"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Podesite ovde samodopunjavanje"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolucija adresar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Iskačući prozor za adrese Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Preglednik adresa Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Preglednik Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Deo Evolucija adresara"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Upravljanje S/MIME sertifikatima iz Evolucije"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Upravljanje podešavanjem direktorijuma iz Evolucije"
+
+# bug: s/manager/manage/
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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 "
@@ -340,6 +377,7 @@ msgstr " P_okaži podržane baze "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -411,7 +449,7 @@ msgstr "_Kontakti:"
 msgid "Address Book Properties"
 msgstr "Osobine adresara"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Uvek"
@@ -426,106 +464,96 @@ msgid "Basic"
 msgstr "Osnovno"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "Boje"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Povezujem se"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Posebno _ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Opšte"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Nikada"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Jedan"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Izaberite boju"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Opseg p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "Pretraži bazu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Opseg p_retrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Tražim"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -535,7 +563,7 @@ msgstr ""
 "akoi\n"
 "on podržava SSL ili TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -552,7 +580,7 @@ msgstr ""
 "onda nema potrebe da Evolucija koristi SSL/TLS jer je vaša veza već\n"
 "bezbedna."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -564,19 +592,19 @@ msgstr ""
 "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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pod"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Podržane baze za pretragu"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -587,7 +615,7 @@ msgstr ""
 "početi. Ako ovo ostavite prazno, pretraga će početi iz korena stabla "
 "direktorijuma."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -601,13 +629,13 @@ msgstr ""
 "\"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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
@@ -616,7 +644,7 @@ 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:63
+#: 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 "
@@ -626,7 +654,7 @@ msgstr ""
 "uključivanje ovoga na \"Email Address\" zahteva anonimni pristup na vaš ldap "
 "server."
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -635,7 +663,7 @@ 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:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -647,129 +675,136 @@ msgstr ""
 "je spisak standardnih portova. Pitajte svog sistem administratora\n"
 "koji port da odaberete."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Format za vreme:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Koristim posebno ime (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Koristim elektronsku adresu"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Kada je moguće"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontakti:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "Limit za _preuzimanje:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Elektronska adresa:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Metod _prijave:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Ime:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "Broj _porta:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "_Važnost:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "Baza _pretrage:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Ime _servera:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Odziv (minuti):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Koristi bezbednu vezu (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "karte"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "jezičak za vezu"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: 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:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minuta"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "jezičak za pretragu"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Alat za odabir imena Evolucija adresara"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Ukloni sve"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Ukloni"
 
+#: 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 "Ime"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Ukloni sve"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Pogledaj listu kontakt listu"
@@ -792,22 +827,15 @@ msgstr "Dodaj u kontakte"
 msgid "Unnamed Contact"
 msgstr "Neimenovani kontakt"
 
-#: 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
-msgid "Name"
-msgstr "Ime"
-
 #: 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
 msgid "Source"
 msgstr "Izvor"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Alat za odabir imena Evolucija adresara"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -875,141 +903,141 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adresa _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adresa:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Godi_šnjica:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Pomoćnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Rođenda_n"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blogče"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "Kalendar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Mesto:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Naredba:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Urednik kontakata"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Držav_a:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "O_delenje:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL za s_lobodan/zauzet:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Puno _ime..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Kuća"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN glasnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-adresa"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Upravnik"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Nadimak:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Be_leške:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novel Grupvajz"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Drugo"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Poštanski broj:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1037,9 +1065,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Posao"
@@ -1072,23 +1100,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Jeste li sigurni da hoćete\n"
+"da obrišete ove kontakte?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Jeste li sigurni da hoćete\n"
+"da obrišete ovaj kontakt?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Može se menjati"
 
@@ -2061,91 +2105,109 @@ msgstr "Zambija"
 msgid "Zimbabwe"
 msgstr "Zimbabve"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL brza poruka"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "DŽaber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Jahu glasnik"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Usluga"
-
-#: 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
-msgid "Location"
-msgstr "Mesto"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Korisničko ime"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Jahu"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "Grupvajz"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Izvorni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Odredišni adresar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Je novi kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Polja za upis"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Promenjen"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Ovaj kontakt pripada ovim kategorijama"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Niger"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Sledeće veze su trenutno aktivne:"
+
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL brza poruka"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Jahu glasnik"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Usluga"
+
+#: 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
+msgid "Location"
+msgstr "Mesto"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Korisničko ime"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Brzo dodavanje kontakta"
@@ -2163,22 +2225,6 @@ msgstr "_Puno ime:"
 msgid "E-_mail:"
 msgstr "E-_pošta:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Jeste li sigurni da hoćete\n"
-"da obrišete ove kontakte?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Jeste li sigurni da hoćete\n"
-"da obrišete ovaj kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adresa _2:"
@@ -2324,8 +2370,8 @@ msgstr "urednik-kontakt-liste"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Knjiga"
 
@@ -2386,6 +2432,433 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Napredna pretraga"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(mapa)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "mapa"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Ispiši članove"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organizacija"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "Položaj"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Grupvajz"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "Video konferencije"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "Faks"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "posao"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "Beb"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blogče"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobilni telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "lično"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Napomena"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Uloga na poslu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-pošta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Lična stranica"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Uspeh"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Arhiva nije na mreži"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "Adresar ne postoji"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Zabranjen pristup"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Kontakt nije pronađen"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "IB kontakta već postoji"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Protokol nije podržan"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Poništeno"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Ne mogu da otvorim izvor"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Prijava neuspela"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Prijava obavezna"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Nema takve poruke"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Druga greška"
+
+#: 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 ""
+"Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
+"imate prava pristupa."
+
+#: 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 ""
+"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
+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 ""
+"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
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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 ""
+"Više karti odgovara upitu koji je ili server tako  \n"
+"podešen vratio ili Evolucija tako podešena da pokaže.\n"
+"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
+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 ""
+"Vreme za izvršavanje ovog upita je preko limita servera ili limita\n"
+"koji ste podesili za ovaj adresar. Molim da preciznije formulišete\n"
+"upit ili povećate vremenski limit u podešavanjima adresara\n"
+"za server direktorijuma."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+msgid "Error adding contact"
+msgstr "Greška kod dodavanja kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Greška kod izmene liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Greška pri izmeni kontakta"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Greška kod uklanjanja kontakta"
+
+# bug: plural-forms
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s već postoji\n"
+"Želite li da prepišete novim unosom?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "karta.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "Premesti kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "Umnoži kontakt u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "Premesti kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "Umnoži kontakte u"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "Izaberite odredišni adresar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Višestruke VCards"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard za %s"
+
+#.
+#. * 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 "(prazno)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Osnovna E-pošta"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-pošta 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-pošta 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Odaberi akciju"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Unesi novi kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Dodaj adresu postojećim kontaktima \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+msgid "Querying Address Book..."
+msgstr "Pretražujem adresar..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Promeni podatke o kontaktu"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Spoji elektronske adrese"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "i još %d kontakt."
+msgstr[1] "i još %d kontakta."
+msgstr[2] "i još %d kontakata."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "Prikaži celu vizit kartu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+msgid "Show Compact VCard"
+msgstr "Prikaži sažetu vizit kartu"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Sačuvaj u adresaru"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Nema kontakta"
@@ -2401,8 +2874,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Upit"
 
@@ -2456,9 +2929,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Sačuvaj kao VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2523,7 +2997,7 @@ msgid "Cut"
 msgstr "Iseci"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2534,18 +3008,8 @@ msgstr "Umnoži"
 msgid "Paste"
 msgstr "Ubaci"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Obriši"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Trenutan pogled"
 
@@ -2562,7 +3026,7 @@ msgstr ""
 "da je koristite"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Bilo koja kategorija"
@@ -2603,21 +3067,6 @@ msgstr "Kategorije"
 msgid "Company Phone"
 msgstr "Telefon firme"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-pošta 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-pošta 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Prezime"
@@ -2654,29 +3103,14 @@ msgstr "Dnevnik"
 msgid "Manager"
 msgstr "Upravnik"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobilni telefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Nadimak"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Napomena"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kancelarija"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organizacija"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Drugi faks"
@@ -2728,21 +3162,29 @@ msgstr "Jedinica"
 msgid "Web Site"
 msgstr "Internet adresa"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Širina"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Visina"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Ima fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Odabrano"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Ima kursor"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Polje"
@@ -2759,10 +3201,6 @@ msgstr "Model teksta"
 msgid "Max field name length"
 msgstr "Najveća dužina imena polja"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Širina kolone"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2791,407 +3229,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Odabrano"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Ima kursor"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(mapa)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "mapa"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Ispiši članove"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-pošta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "Položaj"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Grupvajz"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "Video konferencije"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "Faks"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "posao"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "Beb"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blogče"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "lično"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Uloga na poslu"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Lična stranica"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Uspeh"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Arhiva nije na mreži"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "Adresar ne postoji"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Zabranjen pristup"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Kontakt nije pronađen"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "IB kontakta već postoji"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol nije podržan"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Poništeno"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Ne mogu da otvorim izvor"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Prijava neuspela"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Prijava obavezna"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Nema takve poruke"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Druga greška"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-msgstr ""
-"Nismo uspeli da otvorimo ovaj adresar. Proverite da putanja postoji i da "
-"imate prava pristupa."
-
-#: 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 LDAP server is unreachable."
-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:114
-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 ""
-"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:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Ne mogu da otvorim adresar"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Više karti odgovara upitu koji je ili server tako  \n"
-"podešen vratio ili Evolucija tako podešena da pokaže.\n"
-"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:167
-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 ""
-"Vreme za izvršavanje ovog upita je preko limita servera ili limita\n"
-"koji ste podesili za ovaj adresar. Molim da preciznije formulišete\n"
-"upit ili povećate vremenski limit u podešavanjima adresara\n"
-"za server direktorijuma."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Ovaj upit nije uspešno završen."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Želite li da sačuvate promene?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Odbaci"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Greška kod dodavanja liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Greška kod dodavanja kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Greška kod izmene liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Greška pri izmeni kontakta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Greška kod uklanjanja liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Greška kod uklanjanja kontakta"
-
-# bug: plural-forms
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s već postoji\n"
-"Želite li da prepišete novim unosom?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Prepiši"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "karta.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "Premesti kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "Umnoži kontakt u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "Premesti kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "Umnoži kontakte u"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "Izaberite odredišni adresar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Višestruke VCards"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard za %s"
-
-#.
-#. * 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 "(prazno)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Osnovna E-pošta"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Odaberi akciju"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Unesi novi kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Dodaj adresu postojećim kontaktima \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-msgid "Querying Address Book..."
-msgstr "Pretražujem adresar..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Promeni podatke o kontaktu"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Spoji elektronske adrese"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "i još %d kontakt."
-msgstr[1] "i još %d kontakta."
-msgstr[2] "i još %d kontakata."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "Prikaži celu vizit kartu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "Prikaži sažetu vizit kartu"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Sačuvaj u adresaru"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Širina kolone"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3235,11 +3275,6 @@ msgstr "Evolucija VCard uvoznik"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Štampaj kovertu"
-
 #: addressbook/printing/e-contact-print.c:998
 msgid "Print contacts"
 msgstr "Štampaj kontakte"
@@ -3249,6 +3284,11 @@ msgstr "Štampaj kontakte"
 msgid "Print contact"
 msgstr "Štampaj kontakt"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Štampaj kovertu"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 p. Tahoma"
@@ -3433,16 +3473,6 @@ msgstr "Proba štampe kontakta"
 msgid "This should test the contact print code"
 msgstr "Ovo isprobava kod za štampu kontakata"
 
-#: 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "Navedite izlaznu datoteku umesto standardnog izlaza"
@@ -3501,6 +3531,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Greška kod učitavanja predefinisanog adresara."
@@ -3513,11 +3553,12 @@ msgstr "Ulazna datoteka"
 msgid "No filename provided."
 msgstr "Ime datoteke nije dato."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Lista bez imena"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "Unesite lozinku"
 
@@ -3549,117 +3590,55 @@ msgstr "Predefinisan prioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Nisam mogao da pročitam pilotov ToDo programski blok"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalendar i zadaci"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-msgid "Calendars"
-msgstr "Kalendari"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Podesite vašu vremensku zonu, kalendar i listu zadataka ovde "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolucija kalendar i zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Kontrola podešavanja Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Preglednik zakazanih poruka Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Preglednik Evolucija kalendara"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Urednik Evolucija kalendara/zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Preglednik Evolucija zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Deo Evolucije za kalendar"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Deo Evolucije za zaduženja"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Zaduženja"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Servis za alarm obaveštenja Evolucija kalendara"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Pokrećem:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Obustavljam:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolucija alarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm na %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Z_atvori"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Dre_maj"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Vreme dremanja (minuti)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Izmeni sastanak"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Dre_maj"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Otvori"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "Odbaci"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "Odbaci sve"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Nema opisa."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3672,12 +3651,12 @@ msgstr ""
 "Počinje u %s\n"
 "Završava se u %s"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Upozorenje"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3689,7 +3668,7 @@ msgstr ""
 "podsetnik podešen da pošalje poruku. Evolucija će\n"
 "umesto toga pokazati normalan prozor za dijalog."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3706,19 +3685,19 @@ msgstr ""
 "\n"
 "Sigurno hoćete da pokrenete ovaj program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Ne pitaj me ponovo za ovaj program."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Servis za alarm obaveštenja Evolucija kalendara"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Nisam uspeo da pokrenem Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Nisam mogao da učitam  gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Nisam mogao da pokrenem stvaranje servisa za alarm obaveštenja"
 
@@ -3827,56 +3806,42 @@ msgid "Weekday the week starts on"
 msgstr "Dan u nedelji kojim počinje nedelja"
 
 #: 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
 msgid "Whether to ask for confirmation on appointment deletion"
 msgstr "Da li da tražim potvrdu pre brisanja sastanaka"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Da li da tražim potvrdu pre uklanjanja direktorijuma"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 msgid "Whether to hide completed tasks"
 msgstr "Da li da sakrivam izvršena zaduženja"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
 msgid "Whether to set a default reminder for events"
 msgstr "Da li da postavim podrazumevani podsetnik za događaje"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:30
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
 msgid "Whether to show times in 24h format instead of using am/pm"
 msgstr "Da li da prikazujem vreme u 24č obliku umesto am/pm"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 msgid "Whether to show week numbers in date navigator"
 msgstr "Da li da prikazuje brojeve nedelja u izbiraču datuma"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Sažetak sadrži"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Opis sadrži"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Komentar sadrži"
-
-#: calendar/gui/cal-search-bar.c:56
-msgid "Location contains"
-msgstr "Putanja sadrži"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Neraspodeljeno"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalendar"
 
-#: calendar/gui/calendar-commands.c:351
+#: 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 "
@@ -3887,118 +3852,128 @@ msgstr ""
 "\n"
 "Stvarno da brišem ove zadatke?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr "Obriši događaje starije od"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dana"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "Kalendar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Osobine..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Učitavam kalendar..."
 
-#: calendar/gui/calendar-component.c:790
+#: calendar/gui/calendar-component.c:917
 #, c-format
 msgid "Unable to open the calendar '%s' for creating events and meetings"
 msgstr "Ne mogu da otvorim kalendar „%s“ radi pravljenja događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr "Nema dostupnog kalendara za pravljenje događaja i sastanaka"
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Novi zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "Zakazani _sastanak"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Zakaži sastanak"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "S_astanak"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Sačini novi zahtev za sastanak"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "Novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Celo_dnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Sačini novi celodnevni zakazani sastanak"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "Novi kalendar"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "K_alendar"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Napravi novi kalendar"
 
@@ -4028,15 +4003,35 @@ msgstr "Nedeljni pregled"
 msgid "Month View"
 msgstr "Mesečni pregled"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Sažetak sadrži"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Opis sadrži"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Komentar sadrži"
+
+#: calendar/gui/cal-search-bar.c:56
+msgid "Location contains"
+msgstr "Putanja sadrži"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Neraspodeljeno"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Greška kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metod nije podržan kod otvaranja kalendara"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Zabranjen pristup kalendaru"
 
@@ -4045,19 +4040,6 @@ msgstr "Zabranjen pristup kalendaru"
 msgid "open_client(): %s"
 msgstr "open_client(): %s"
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Nisam mogao da otvorim direktorijum u '%s"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI koju će kalendar pokazati"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Tip pogleda za prikaz"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Opcije za zvučni alarm"
@@ -4124,7 +4106,7 @@ msgstr "pokaži još na svakih"
 msgid "hours"
 msgstr "sati"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Dejstvo/pokreni"
 
@@ -4143,14 +4125,14 @@ msgstr "Osnove"
 msgid "Date/Time:"
 msgstr "Datum/Vreme:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Pokaži poruku"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Pusti zvuk"
 
+#: 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 "Podsetnici"
@@ -4165,6 +4147,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
 msgid "Summary:"
 msgstr "Zaključak:"
@@ -4204,10 +4187,104 @@ msgstr "minut(a)"
 msgid "start of appointment"
 msgstr "početak zakazanog sastanka"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+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
+#, 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
+#, 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
+#, 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
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+"Grupa „%s“ je udaljena. Morate navesti putanju sa koje da preuzmem kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Grupa spiska zaduženja"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Dodaj novi kalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_Adresa:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "nedelje"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Omogućeno"
 
@@ -4221,19 +4298,19 @@ msgstr "Ne uklanjaj"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Onemogući"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Omogući"
 
@@ -4259,162 +4336,174 @@ msgid "60 minutes"
 msgstr "60 minuta"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Upozorenja"
+msgid "<b>Alerts</b>"
+msgstr "<b>Uzbune</b>"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Podsetnici</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+msgid "<b>Task List</b>"
+msgstr "<b>Spisak zaduženja</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Onda</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Radna nedelja</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Podešavanja kalendara i zaduženja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Boja neizvršenih zaduženja"
 
-#: 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 "Boja zaduženja za danas"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Kraj _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Dani"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Prikaži"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "O_mogući"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Petak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Sati"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Minuti"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Ponedeljak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "N_ed"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Subota"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "Po_kaži podsetnik"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Pokaži _brojeve nedelja u navigatoru za datume"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Nedelja"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "Z_adaci za danas:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "U_to"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Spisak zaduženja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Četvrtak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Vreme"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Vremenska zona:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Format za vreme:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Utorak"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Početak n_edelje:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Sreda"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Radna nedelja"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Radni dani:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 očasovni (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-očasovni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 msgid "_Add URL"
 msgstr "Dodaj _adresu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Traži potvrdu za brisanje podataka"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Skupi nedelje u mesečni prikaz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "Početak _dana:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Prikaži"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4424,139 +4513,46 @@ msgstr "_Prikaži"
 msgid "_Edit"
 msgstr "_Izmeni"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-msgid "_Free/Busy Publishing"
-msgstr "_Objava stanja slobodan/zauzet"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Pet"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Opšte"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Sakrij ispunjena zaduženja nakon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Pon"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Neispunjena zaduženja:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Sub"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Pokaži završetke zakazanih sastanaka u nedeljnim i mesečnim prikazima"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Podela _vremena:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Uto"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Sre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "pre svakog zakazanog sastanka"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-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:174
-#, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Putanja izvora „%s“ nije ispravnog oblika."
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, 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:234
-#, 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:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-"Grupa „%s“ je udaljena. Morate navesti putanju sa koje da preuzmem kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Grupa spiska zaduženja"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-msgstr "Osobine kalendara"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Dodaj novi kalendar"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_Adresa:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "nedelje"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4637,81 +4633,81 @@ msgstr "%s Uneli ste izmene. Da ih zaboravim i osvežim promenama urednik?"
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s Niste uneli izmene, da osvežim promenama urednik?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Greška pri proveri: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " za "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Završeno "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Do "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Do "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Nisam mogao da osvežim promenama objekat"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Izmeni zakazani sastanak"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Zakazani sastanak - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Zaduženje - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Unos u dnevnik - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Nema sažetka"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Sačuvaj kao..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Izmene učinjene na ovom predmetu mogu biti zanemarene ako bude osvežen "
 "promenama"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 msgid "Unable to use current version!"
 msgstr "Ne mogu da koristim tekuću verziju!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Greška pri proveri: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " za "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Završeno "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Do "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Do "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "Ne mogu da otvorim izvor"
@@ -4835,27 +4831,27 @@ msgstr "Delegiraj za:"
 msgid "Enter Delegate"
 msgstr "Unesi delegata"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Zakazani sastanak"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Podsetnik"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Povraćaj"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Zakazivanje"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Sastanak"
 
@@ -4867,7 +4863,7 @@ msgstr "Događaj bez početnog datuma"
 msgid "Event with no end date"
 msgstr "Događaj bez krajnjeg datuma"
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Početni datum je pogrešan"
 
@@ -4953,10 +4949,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4975,15 +4971,15 @@ msgstr "Zahteva organizator."
 msgid "At least one attendee is required."
 msgstr "Najmanje jedan prisutni je potreban."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegiraj za..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5257,24 +5253,19 @@ msgstr "_Zanemari promene"
 msgid "Save Event"
 msgstr "Sačuvaj događaj"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "Izaberite izvor"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "Izaberite odredište %s"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "kalendar"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "Odredišni direktorijum:"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "spisak zaduženja"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Spisak zaduženja"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5302,38 +5293,44 @@ msgid "% _Complete"
 msgstr "% _gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Gotovo"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Visok"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "U toku"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Nizak"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Običan"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Nije pokrenut"
 
@@ -5368,11 +5365,11 @@ msgstr "_Veb stranica:"
 msgid "Assignment"
 msgstr "Zadatak"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Datum za završetak je pogrešan"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Ne mogu da otvorim zaduženja u „%s“."
@@ -5381,8 +5378,9 @@ msgstr "Ne mogu da otvorim zaduženja u „%s“."
 msgid "Con_fidential"
 msgstr "Pov_erljivo"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Opis:"
@@ -5531,101 +5529,53 @@ msgstr "%s na %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s za nepoznat tip pokretača"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Javno"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Lično"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Poverljivo"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Krajnji datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Početni datum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Izveštaj"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Slobodan"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Zauzet"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "Kliknite da otvorite %s"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "J"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Bez imena"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "I"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Datum početka:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "Z"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Datum završetka:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Geografsko mesto mora biti uneto u obliku: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Stanje:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Važnost:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ne"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Veb stranica:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Nepoznato"
+#: 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 "Javno"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Povratno"
+#: 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 "Lično"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Dodeljeno"
+#: 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 "Poverljivo"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5671,17 +5621,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Slobodan"
+
+#: 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 "Zauzet"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Brišem izabrane objekte"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Otvori"
 
@@ -5690,41 +5649,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Umet_ni"
 
@@ -5779,76 +5739,155 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Početni datum"
 
+#: 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 "Izveštaj"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Razvrstana zaduženja"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nov zakazan _sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nov celodnevni _događaj"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Novi sastanak"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Izaberi _nit"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Izaberi..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Objavi slobodan/zauzet informaciju"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "Kop_iraj u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "Prene_si u kalendar..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Zakaži sastanak..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Prosledi kao iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Obriši ovu _pojavu"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Obriši _sve pojave"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Idi na _danas"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Idi na datum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Podešavanja..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Krajnji datum"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Nepoznato"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Povratno"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Ne"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "J"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "I"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "Z"
+
+#: 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 ""
+"Geografsko mesto mora biti uneto u obliku: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5872,36 +5911,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutni razmaci"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutni razmaci"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6019,10 +6058,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ništa</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Stanje:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6052,7 +6087,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6265,59 +6300,55 @@ msgstr "Prilog ne sadrži ispravnu poruku za kalendar"
 msgid "The attachment has no viewable calendar items"
 msgstr "Prilog nema delove kalendara koji se mogu pregledati"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Datoteka kalendara nije mogla biti ažurirana\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Ažuriranje završeno\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objekat nije mogao biti pronađen\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Ažurirano stanje prisutnog\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Stanje prisutnog nije moglo biti ažurirano!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Uklanjanje završeno"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Unos poslat!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Unos nije mogao biti poslat!\n"
 
@@ -6434,28 +6465,6 @@ msgstr "Delegirano"
 msgid "In Process"
 msgstr "U toku"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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: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-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Van kancelarije"
@@ -6516,7 +6525,34 @@ msgstr "_Početno vreme sastanka:"
 msgid "Meeting _end time:"
 msgstr "_Krajnje vreme sastanka:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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"
+
+#. 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"
+
+#. 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-pub-utils.c:300
+#, c-format
+msgid "Enter the password for %s"
+msgstr "Unesite lozinku za „%s“"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6525,24 +6561,22 @@ msgstr ""
 "Greška na %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
-#, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+#: 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."
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Otvaram zaduženja u %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6551,38 +6585,47 @@ msgstr ""
 "Greška pri otvaranju %s:\n"
 "%s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "Učitavam zaduženja"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Ispunjavam zaduženja..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Brišem izabrane objekte..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Izbacujem"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Zaduženja"
+
+#: calendar/gui/gnome-cal.c:1876
 #, c-format
 msgid "Loading appointments at %s"
 msgstr "Učitavam zakazane sastanke sa %s"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, c-format
 msgid "Loading tasks at %s"
 msgstr "Učitavam zaduženja sa %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "Otvaram %s"
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, fuzzy, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
@@ -6590,18 +6633,60 @@ msgstr ""
 "%s\n"
 " je pukla"
 
-#: calendar/gui/gnome-cal.c:1953
-#, fuzzy, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-"Mašinerija zaduženja za \n"
-"%s\n"
-" je pukla."
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 msgid "Purging"
 msgstr "Briše"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalendar i zadaci"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Podesite vašu vremensku zonu, kalendar i listu zadataka ovde "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolucija kalendar i zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Kontrola podešavanja Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Preglednik zakazanih poruka Evolucija kalendara"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Urednik Evolucija kalendara/zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Deo Evolucije za kalendar"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+msgid "Evolution's Tasks component"
+msgstr "Deo Evolucije za zaduženja"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalendari"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Zaduženja"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "April"
@@ -6747,6 +6832,23 @@ msgstr "Rođendani i godišnjice"
 msgid "On The Web"
 msgstr "Na vebu"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Ne mogu da otvorim kalendar „%s“."
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Ne mogu da otvorim zaduženja u „%s“."
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -6966,7 +7068,7 @@ msgid "Contacts: "
 msgstr "Konatkti: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Štampaj prikaz"
 
@@ -6978,69 +7080,81 @@ msgstr "Štampaj unos"
 msgid "Print Setup"
 msgstr "Podesi štampu"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, 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:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "Novi spisak zaduženja"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d karata"
+msgstr[1] "%d karata"
+msgstr[2] "%d karata"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d izabranih"
+msgstr[1] "%d izabranih"
+msgstr[2] "%d izabranih"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Učitavam zaduženja"
+
+#: calendar/gui/tasks-component.c:526
 #, 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:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr "Nijedan kalendar nije dostupan za dodavanje zaduženja"
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Novo zaduženje"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Zaduženje"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskusione grupe"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Grupa spiska zaduženja"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Unesi novo zaduženje"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Adresa direktorijuma zaduženja za prikaz"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Nisam mogao da učitam zaduženja u `%s"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7052,11 +7166,11 @@ msgstr ""
 "\n"
 "Stvarno da brišem ove zadatke?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Ne pitaj me ponovo."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Štampaj zaduženja"
 
@@ -8704,7 +8818,7 @@ msgstr "Umnoži sadržaj direktorijuma u lokalu za nepovezani rad"
 msgid "Downloading new messages for offline mode"
 msgstr "Preuzimam nove poruke u nepovezanom režimu"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Pripremam direktorijum '%s' za rad bez mreže"
@@ -8797,33 +8911,6 @@ msgstr "Neipsravni argumenti za (korisnička-oznaka)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Greška kod primene filtera za pretragu: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Ne mogu da prosledim izraz za pretragu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Greška kod izvršavanja izraza za pretragu: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8855,7 +8942,52 @@ msgstr "Učenje đubreta i ne-đubreta od poruka"
 msgid "Filtering new message(s)"
 msgstr "Filtriram nove poruke"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Ne mogu da prosledim izraz za pretragu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Greška kod izvršavanja izraza za pretragu: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(odgovara-sve) zahteva samo jedan logički rezultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Izvršavam pretragu na nepoznato zaglavlje: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8866,15 +8998,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Nisam mogao da pročitam gpg userid podsetnik."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Nisam mogao da pročitam zahtev za gpg lozinkom"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8883,27 +9015,27 @@ msgstr ""
 "Potrebna vam je lozinka za otključavanje ključa\n"
 "korisnika: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Poništeno."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Nisam mogao da otključam tajni ključ: date su 3 pogrešne lozinke."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Neočekivan odgovor od GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Nisam mogao da šifriram: nisu označeni ispravni primaoci. "
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8914,83 +9046,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Nisam mogao da primenim GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 camel/camel-smime-context.c:419
+#: camel/camel-gpg-context.c:1259 camel/camel-smime-context.c:419
 #, c-format
 msgid "Could not generate signing data: %s"
 msgstr "Nisam mogao da obrazujem podatke za potpisivanje: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Nisam mogao da izvršim gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Nisam mogao da izvršim gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Ovo je deo poruke sa digitalnim potpisom"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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 "Ne mogu da proverim potpis poruke: neispravan oblik poruke"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Ne mogu da proverim potpis poruke: nisam mogao da napravim temp datoteku: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Nisam mogao da obrazujem podatke za šifrovanje: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "Ovo je digitalno šifrovan deo poruke"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "Šifrovan sadržaj"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "Ne mogu da raščlanim sadržaj poruke"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
-
-#: 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 ""
-"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Nisam mogao da zaključam '%s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9013,6 +9124,27 @@ msgstr "Nisam mogao da zaključam koristeći fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Nisam mogao da zaključam koristeći flock(2): %s "
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Ne mogu da napravim vezu ka pomoćniku zaključavanja: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Ne mogu da podelim pomoćnika zaključavanja: %s"
+
+#: 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 ""
+"Nisam mogao da zaključam '%s': greška u protokolu sa pomoćnikom zaključavanja"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Nisam mogao da zaključam '%s"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9263,7 +9395,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Loš odgovor na prijavu od servera."
 
@@ -9463,7 +9595,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Sertifikat za ši_frovanje:"
 
 #: camel/camel-smime-context.c:360
@@ -9480,7 +9612,7 @@ msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
 msgid "Failed to add data to CMS encoder"
 msgstr "Neuspešno dodavanje u lokalni direktorijum Poslato: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Nisam mogao da se prijavim.\n"
@@ -9546,99 +9678,99 @@ msgstr "Ne mogu da napravim direktorijum: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Ne mogu da dobijem poruku %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Neuspeo potpis sertifikata"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Ispravan potpis"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Potpisao: %s <%s>: %s\n"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Neuspela DATA komanda"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Nisam mogao da nađem sertifikat za \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Nisam mogao da nađem opšti bulk algoritam."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Nisam mogao da napravim S/MIME kontekst za dešifriranje."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Neuspešno slanje korisničkog imena serveru"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komanda nije podržana"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9655,16 +9787,26 @@ msgstr "Ne mogu da napravim direktorijum „%s“: direktorijum postoji"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Ne mogu da napravim direktorijum: neispravna operacija"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Ne mogu da obrišem direktorijum: %s: neispravna operacija"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Smeće"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "Đubre"
@@ -9785,7 +9927,7 @@ msgstr "Upotreba ključa ne podržava potpis sertifikatom"
 msgid "Error in application verification"
 msgstr "Greška kod provere programa"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9798,11 +9940,11 @@ msgstr ""
 "Oznaka:       %s\n"
 "Potpis:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "DOBAR"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "LOŠ"
 
@@ -9826,7 +9968,7 @@ msgstr ""
 "Želite li svejedno da prihvatite?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9841,7 +9983,7 @@ msgstr ""
 "\n"
 "Želite li da prihvatite?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9850,7 +9992,7 @@ msgstr ""
 "Problem sa sertifikatom: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9859,7 +10001,7 @@ msgstr ""
 "Loš domen sertifikata: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9868,7 +10010,7 @@ msgstr ""
 "Istekao sertifikat: %s\n"
 "Izdavač: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9882,17 +10024,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Nisam mogao da obradim URL `%s"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Greška kod smeštanja `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Nema takve poruke %s u %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
 
@@ -9901,11 +10043,6 @@ msgstr "Ne mogu da kopiram ili premestim poruke u virtuelni direktorijum"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Ne mogu da obrišem direktorijum: %s: nema takvog direktorijuma"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Ne mogu da promenim ime  direktorijumu: %s: neispravna operacija"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9920,10 +10057,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Ne mogu kopirati poruke u direktorijum za đubre"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Proveravam za nove poruke"
 
 #: 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 "Proveri za nove poruke u svim direktorijumima"
@@ -9954,6 +10093,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "Za pristup Novel Grupvajz serverima"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9973,26 +10113,319 @@ msgstr ""
 msgid "Checklist"
 msgstr "Popis"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Neočekivan odgovor od IMAP servera %s: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: 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 "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:1145
+msgid "Got BYE response"
+msgstr "Primih odgovor BYE"
+
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Ne mogu da preuzmem direktorijum „%s“: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %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 ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Ne mogu dodati poruku u mh direktorijum: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:854
+#, fuzzy, c-format
+msgid "Cannot move messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %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 ""
+"Ne mogu da dobijem poruku: %s iz direktorijuma %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 "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-folder.c:870
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Bad command"
+msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
+
+#: 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 "Direktorijumi"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Pokaži samo odabrane direktorijume"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Premosti format imena direktorijuma koje daje server"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Format imena"
+
+#: 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 "Za čitanje i smeštanje pošte na IMAP servere."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP servis za %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: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/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 "Nisam mogao da se povežem na %s (port %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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Povezivanje poništeno"
+
+#: 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 ""
+"Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
+"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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Nepoznata greška"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, fuzzy, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Naredba:"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr ""
+"Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Neočekivani element u odgovoru IMAP servera %s: "
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+msgid "No data"
+msgstr "Nema podataka"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Operacija obustavljena"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Veza sa serverom je neočekivano isključena: %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:1089
-msgid "Unknown error"
-msgstr "Nepoznata greška"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10037,21 +10470,21 @@ msgstr "Nisam mogao da napravim direktorijum %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Nisam mogao da učitam sažetak za %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Direktorijum je uništen i ponovo na serveru napravljen."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Tragam za promenjenim porukama"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Ne mogu da pokupim poruku: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10067,25 +10500,25 @@ msgstr ""
 "Ne mogu da dobijem poruku: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Nema takve poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Ova poruke nije trenutno dostupna"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Prikupljam sažetu informaciju za nove poruke"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Nisam mogao da pronađem tekst poruke u FETCH odgovoru."
 
@@ -10124,23 +10557,6 @@ msgstr "Koristi proizvoljnu naredbu za povezivanje sa serverom"
 msgid "Command:"
 msgstr "Naredba:"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Direktorijumi"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Pokaži samo odabrane direktorijume"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Premosti format imena direktorijuma koje daje server"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Format imena"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Primeni filtere na nove poruke u INBOX-u ovog servera"
@@ -10161,85 +10577,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP servis za %s na %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Nisam mogao da se povežem na %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL nije dostupan"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Povezivanje poništeno"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL pregovori nisu uspeli"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Niste uneli lozinku."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10250,25 +10624,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Nema takvog direktorijuma %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ime direktorijuma \"%s\" nije ispravno jer sadrži karakter \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10276,7 +10643,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Nepoznati glavni direktorijum: %s"
@@ -10386,58 +10753,58 @@ msgstr ""
 "Takođe se može koristiti za čitanje stabla direktorijuma u Elm, Pine, ili "
 "Mutt stilu."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Ostava root %s nije apsolutna putanja"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Ostava root %s nije regularan direktorijum"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Ne mogu da dobijem direktorijum: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokalne ostave nemaju sanduče."
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokalna datoteka pošte %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Nisam mogao da preimenujem direktorijum %s u %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Nisam mogao da preimenujem '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Nisam mogao da obrišem sažetak direktorijuma `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Nisam mogao da obrišem indeks datoteku direktorijuma `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10503,7 +10870,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10836,7 +11203,7 @@ 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:258
+#: 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
@@ -10845,8 +11212,8 @@ msgid "User cancelled"
 msgstr "Korisnik poništio"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10855,46 +11222,46 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Unutrašnja greška: KIB u neispravnom obliku: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: 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:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: 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:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Ne možete kopirati poruke iz NNTP direktorijuma!"
 
@@ -11020,7 +11387,8 @@ msgstr "Nisam mogao da dobijem grupu: %s"
 
 # bug: s/unspecificed/unspecified/
 #: camel/providers/nntp/camel-nntp-summary.c:333
-msgid "Could not get messages: unspecificed error"
+#, fuzzy
+msgid "Could not get messages: unspecified error"
 msgstr "Nisam mogao da preuzmem poruke: nenaznačena greška"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11073,8 +11441,8 @@ msgstr "Nema poruka sa uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Preuzimam POP poruku %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nepoznat razlog"
 
@@ -11518,7 +11886,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "prilog"
 
@@ -11562,6 +11930,106 @@ msgstr "MIME tip:"
 msgid "Suggest automatic display of attachment"
 msgstr "Predloži automatsko otvaranje priloga"
 
+# bug: set for from account? probably 'for "from" account'
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr ""
+"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
+"potpisivanje na ovom nalogu"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr ""
+"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
+"šifrovanje na ovom nalogu"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Ne mogu da otvorim datoteku"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Ne mogu da povratim poruku iz urednika"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Neimenovana poruka"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Otvori datoteku"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Autogenerisan"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Potpis:"
+
+#: composer/e-msg-composer.c:2298
+#, c-format
+msgid "<b>%d</b> File Attached"
+msgid_plural "<b>%d</b> Files Attached"
+msgstr[0] "<b>%d</b> datoteka prikačena"
+msgstr[1] "<b>%d</b> datoteke prikačene"
+msgstr[2] "<b>%d</b> datoteka prikačeno"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
+
+#: composer/e-msg-composer.c:2347 composer/e-msg-composer.c:3113
+#: composer/e-msg-composer.c:3114
+msgid "Compose a message"
+msgstr "Sastavi poruku"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da pokrenem kontrolu biranja adresa."
+
+#: 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 ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da aktiviram komponentu HTML urednika.\n"
+"Molim proverite da imate odgovarajuće verzije\n"
+"gtkhtml i libgtkhtml na sistemu.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Nisam mogao da napravim prozor za sastavljanje:\n"
+"Ne mogu da aktiviram komponentu HTML urednika."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
+"<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Odredište"
@@ -11642,214 +12110,135 @@ msgstr "Pritisnite ovde da izaberete direktorijume u koje šaljete"
 msgid "Attach file(s)"
 msgstr "Priloži datoteke"
 
-# bug: set for from account? probably 'for "from" account'
-#: composer/e-msg-composer.c:695
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Ne mogu da potpišem odlazeću poruku: nije postavljen sertifikat za "
-"potpisivanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-"Ne mogu da šifrujem odlazeću poruku: nije postavljen sertifikat za "
-"šifrovanje na ovom nalogu"
-
-#: composer/e-msg-composer.c:1273
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Could not open file"
-msgstr "Ne mogu da otvorim datoteku"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Ne mogu da povratim poruku iz urednika"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Neimenovana poruka"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Otvori datoteku"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Autogenerisan"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Potpis:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "<b>%d</b> datoteka prikačena"
-msgstr[1] "<b>%d</b> datoteke prikačene"
-msgstr[2] "<b>%d</b> datoteka prikačeno"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "Sakrij _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "Prikaži _traku priloga (ovde prevucite priloge)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Sastavi poruku"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Dodaj datoteku poruci"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da pokrenem kontrolu biranja adresa."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika.\n"
-"Molim proverite da imate odgovarajuće verzije\n"
-"gtkhtml i libgtkhtml na sistemu.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Nisam mogao da napravim prozor za sastavljanje:\n"
-"Ne mogu da aktiviram komponentu HTML urednika."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Urednik sadrži u tekstu poruke ne sadrži tekst, i ne može biti menjan.)"
-"<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Nepročitanih poruka"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Želite li da sačuvate promene?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Nisam mogao da napravim vezu: %s"
+msgid "Don't Recover"
+msgstr "Ne uklanjaj"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Nisam mogao da sačuvam potpis: %s"
+msgid "Recover"
+msgstr "Ukloni"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Zanemari promene"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Želite li da sačuvate promene?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Greška kod čuvanja prečica."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ne uklanjaj"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Upozorenje: izmenjena poruka"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Greška kod čuvanja prečica."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Sigurno želite da obrišete ovaj neimenovani zakazani sastanak"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Ukloni"
+msgid "Discard Changes"
+msgstr "_Zanemari promene"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Sačuvaj poruku..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Nisam mogao da napravim vezu: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Nepročitanih poruka"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Upozorenje: izmenjena poruka"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Dodaj datoteku poruci"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Morate da podesite nalog pre sastavljanja poruke."
 
@@ -11979,7 +12368,8 @@ msgstr ""
 "Datoteka sa tim imenom već postoji.\n"
 "Da je prepišem?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Da prepišem datoteku?"
 
@@ -12163,81 +12553,97 @@ msgstr "Izaberite ime za poređenje"
 msgid "_Filter Rules"
 msgstr "<b>Pr_avila filtera</b>"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Greška u regularnom izrazu '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Promena sastanka"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Morate da izaberete datum."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Posebno _ime:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Morate dati ime datoteci."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Premeštam direktorijum %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Zadatak"
+msgid "Missing folder."
+msgstr "Premeštam direktorijum %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Morate odrediti direktorijum."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Nije izabran server"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Greška u regularnom izrazu '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Morate da izaberete datum."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Zadatak"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Morate dati ime ovom filteru."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Morate imenovati ovaj vfolder."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Morate dati ime datoteci."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Morate odrediti direktorijum."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Nije izabran server"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12249,64 +12655,11 @@ msgstr "Izaberi datoteku"
 msgid "<b>Then</b>"
 msgstr "<b>Onda</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Odaberite direktorijum"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Važno"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Za uraditi"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Kasnije"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Proba"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "Ime pravila:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Bez imena"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>Ako</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Izvrši akcije"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "Ako su svi uslovi zadovoljeni"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "ako je bilo koji uslov zadovoljen"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "dolazeći"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "odlazeći"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12396,6 +12749,75 @@ 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
+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
+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
+msgid "Later"
+msgstr "Kasnije"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Proba"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "Ime pravila:"
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>Ako</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "Ako su svi uslovi zadovoljeni"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "ako je bilo koji uslov zadovoljen"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Izvrši akcije"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegirano"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Primaoci"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Odgovori na %s"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Uključi:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "dolazeći"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "odlazeći"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12525,7 +12947,7 @@ msgstr "nije označen"
 msgid "Junk Test"
 msgstr "Provera đubreta"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiketa"
@@ -12562,7 +12984,7 @@ msgstr "Kroz cev do programa"
 msgid "Play Sound"
 msgstr "Pusti zvuk"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Čitaj"
 
@@ -12631,9 +13053,9 @@ msgstr "počinje sa"
 msgid "Stop Processing"
 msgstr "Prekini sa obradom"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12696,103 +13118,60 @@ msgstr "Naslov ne sadrži"
 msgid "Virtual _Folders"
 msgstr "<b>Virtuelni _direktorijumi</b>"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Dodaj"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "VFolder izvor"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Postavke sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Podesite vaše naloge za poštu ovde"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolucija pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Kontrola podešavanja Evolucija naloga za poštu"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Komponenta Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Sastavljač Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Kontrola podešavanja Evolucija sastavljača"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Preglednik za direktorijume Evolucija pošte"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Kontrola osobina Evolucija pošte"
-
-# 48x48/emblems/emblem-mail.icon.in.h:1
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Pošta"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Poštanski nalozi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Osobine pošte"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Predefinisano]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Ime naloga"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Bez imena"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Jezik(ci)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Dodaj potpis"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Potpis(i)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- Prosleđena poruka --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Napravi _Virtuelni direktorijum iz pretrage..."
 
@@ -12826,264 +13205,438 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Navedite gde da napravim direktorijum:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Napravi direktorijum"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "_Ime direktorijuma:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolder-i"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr "NEPOKLOPLjEN"
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Sanduče"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Učitavam..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "Premeštam direktorijum %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "Umnožavam direktorijum %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "Premeštam poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopiram poruke u direktorijum %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "Pre_mesti"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Otkaži zaduženje"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Odaberite direktorijum"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Umnoži"
+
+#: mail/em-folder-tree.c:2096
 #, c-format
 msgid "Creating folder `%s'"
 msgstr "Pravim direktorijum „%s“"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "Napravi direktorijum"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Preimenuj direktorijum „%s“ u:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Preimenuj direktorijum"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "P_regled"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "Otvori u _novom prozoru"
 
-#: mail/em-folder-tree.c:2535
-msgid "_Move"
-msgstr "Pre_mesti"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Novi direktorijum..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Preimenu_j"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VFolder-i"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr "NEPOKLOPLjEN"
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Sanduče"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+msgid "Loading..."
+msgstr "Učitavam..."
+
+# 48x48/emblems/emblem-mail.icon.in.h:1
+#: 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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Uredi kao novu poruku..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Štampaj"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Odgovori na _listu"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Odgovori _Svima"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Prosl_edi"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Pr_ati..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Označ_i završene"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Sklo_ni oznaku"
 
-#: mail/em-folder-view.c:787 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 "O_znači kao pročitano"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Označi kao _nepročitano"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Onači kao _važno"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "_Označi kao nevažno"
 
-#: mail/em-folder-view.c:791 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 "Označi kao _đubre"
 
-#: mail/em-folder-view.c:792 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 "Označi da _nije đubre"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Poniš_ti brisanje"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Prene_si u direktorijum..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiraj u direktorijum..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Dodaj pošiljaoca u adresa_r"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Pri_meni filtere"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "F_iltriraj đubre"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Na_pravi pravilo od poruke"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder na _Naslov"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder na P_ošiljaoca"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder na _Primaoce"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder na dopisnu _listu"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "VFolder za nit"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtriraj prema naslo_vu"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtriraj prema p_ošiljaocu"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtriraj prema p_rimaocu"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtriraj prema _dopisnoj listi"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "Filtriraj prem _niti"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Podrazumevani"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Štampaj poruku"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "_Umnoži adresu veze"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "Kliknite da pošaljete %s"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Od"
+
+#: 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 "Odgovor-za"
+
+#: 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 "Kome"
+
+#: 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 (kopija)"
+
+#: 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 (nevidljiva kopija)"
+
+#: 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
+msgid "Newsgroups"
+msgstr "Diskusione grupe"
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "Kliknite da otvorite %s"
+msgid "%s attachment"
+msgstr "%s prilog"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
+
+#: mail/em-format.c:1298
+msgid "Unsupported signature format"
+msgstr "Nepodržan oblik potpisa"
+
+#: mail/em-format.c:1306
+msgid "Error verifying signature"
+msgstr "Greška pri proveri potpisa"
+
+#: mail/em-format.c:1306
+msgid "Unknown error verifying signature"
+msgstr "Nepoznata greška pri proveri potpisa"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
+#, c-format
+msgid "Retrieving `%s'"
+msgstr "Preuzimam „%s“"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+msgid "Unsigned"
+msgstr "Nepotpisana"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Ispravan potpis"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Neispravan potpis"
+
+#: mail/em-format-html.c:562
+#, fuzzy
+msgid "Valid signature but cannot verify sender"
+msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Nešifrovano"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr "Šifrovana, slabo"
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Šifrovana"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr "Šifrovana, dobro"
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Loše složen spoljni deo."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pokazivač na FTP adresu (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "pokazivač na lokalnu datoteku (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pokazivač na mrežni podatak (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
+
+#: mail/em-format-html.c:1137
+msgid "Formatting message"
+msgstr "Oblikujem poruku"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "Pošiljalac"
+
+#. 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 "<I> (%a, %R %Z)</I>"
+
+#. 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 "<I> (%R %Z)</I>"
 
 # bug: plural-forms if put as "%d matches"
 #. message-search popup match count string
@@ -13092,22 +13645,14 @@ msgstr "Kliknite da otvorite %s"
 msgid "Matches: %d"
 msgstr "Poklapanja: %d"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-msgid "Unsigned"
-msgstr "Nepotpisana"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr ""
 "Ova poruka nije potpisana. Nema garancija da je pošiljalac poruke ispravan."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Ispravan potpis"
-
-#: mail/em-format-html-display.c:647
+#: 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."
@@ -13115,11 +13660,7 @@ msgstr ""
 "Ova poruka je potpisana i ispravna što znači da je pošiljalac poruke vrlo "
 "verovatno onaj za koga se izdaje."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Neispravan potpis"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
@@ -13127,11 +13668,11 @@ msgstr ""
 "Potpis ove poruke nije mogao biti proveren, možda je izmenjena prilikom "
 "prenosa."
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr "Ispravan potpis, ne mogu da proverim pošiljaoca"
 
-#: mail/em-format-html-display.c:649
+#: 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."
@@ -13139,11 +13680,7 @@ msgstr ""
 "Poruka je potpisana ispravnim potpisom, ali pošiljalac poruke nije mogao "
 "biti proveren."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Nešifrovano"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 #, fuzzy
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
@@ -13152,11 +13689,7 @@ msgstr ""
 "Ova poruka nije šifrovana.  Njen sadržaj je moguće videti prilikom prenosa "
 "preko Interneta."
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr "Šifrovana, slabo"
-
-#: mail/em-format-html-display.c:656
+#: 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 "
@@ -13165,11 +13698,7 @@ msgstr ""
 "Ova poruka je šifrovana, ali slabim algoritmom. Teško je, ali ne i nemoguće, "
 "da neko sa strane vidi sadržaj ove poruke u dogledno vreme."
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Šifrovana"
-
-#: mail/em-format-html-display.c:657
+#: 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."
@@ -13177,11 +13706,7 @@ msgstr ""
 "Ova poruka je šifrovana. Teško je moguće da neko sa strane vidi sadržaj ove "
 "poruke."
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr "Šifrovana, dobro"
-
-#: mail/em-format-html-display.c:658
+#: 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 "
@@ -13190,179 +13715,61 @@ 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:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "Po_gledaj sertifikat"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 msgid "This certificate is not viewable"
 msgstr "Ovaj sertifikat se ne može pregledati"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "Završeno: %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Prekoračeno:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "do %d. %B, %Y. %k:%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 msgid "_View Inline"
 msgstr "Po_gledaj unutar"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Sakrij"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Strana %d od %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "Preuzimam „%s“"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Loše složen spoljni deo."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pokazivač na FTP adresu (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pokazivač na lokalnu datoteku (%s) koja odgovara adresi \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "pokazivač na lokalnu datoteku (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pokazivač na mrežni podatak (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pokazivač na napoznati spoljni podatak (\"%s\" tipa)"
-
-#: mail/em-format-html.c:1160
-msgid "Formatting message"
-msgstr "Oblikujem poruku"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Od"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Odgovor-za"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Kome"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc (kopija)"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc (nevidljiva kopija)"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Pošiljalac"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr "<I> (%a, %R %Z)</I>"
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr "<I> (%R %Z)</I>"
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr "Diskusione grupe"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s prilog"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Ne mogu da obradim S/MIME poruku: nepoznata greška"
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr "Nepodržana vrsta šifrovanja za multipart/encrypted"
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Nisam mogao da obradim MIME poruku. Pokazujem kao izvor."
-
-#: mail/em-format.c:1339
-msgid "Unsupported signature format"
-msgstr "Nepodržan oblik potpisa"
-
-#: mail/em-format.c:1347
-msgid "Error verifying signature"
-msgstr "Greška pri proveri potpisa"
-
-#: mail/em-format.c:1347
-msgid "Unknown error verifying signature"
-msgstr "Nepoznata greška pri proveri potpisa"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr "Ubica-spama (ugrađen)"
 
 # slično kao za mesece i nedelje
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 msgid "Every time"
 msgstr "Svaki put"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr "Jednom dnevno"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 msgid "Once per week"
 msgstr "Jednom nedeljno"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 msgid "Once per month"
 msgstr "Jednom mesečno"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13374,25 +13781,55 @@ msgstr ""
 "\n"
 "Budite strpljivi dok Evolucija prenese vaše direktorijume..."
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
-#, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Neuspešan prenos ostave KIB-ova za POP3: %s"
+#: mail/em-migrate.c:1506
+#, fuzzy, c-format
+msgid "Unable to create new folder `%s': %s"
+msgstr "Ne mogu da napravim direktorijum „%s“: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
-#, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Neuspešan prenos stanja raširenosti direktorijuma: %s"
+#: mail/em-migrate.c:1532
+#, 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:2338 mail/em-migrate.c:2512
-#, c-format
-msgid "Failed to create directory `%s': %s"
+#: mail/em-migrate.c:1715
+#, 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
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
 #, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Neuspešno otvaranje smeštaja za „%s“: %s"
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "Neuspešno pravljenje direktorijuma „%s“: %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13403,88 +13840,74 @@ msgstr "Sačuvaj kao..."
 msgid "untitled_image.%s"
 msgstr "neimenovana_slika.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "Postavi na _pozadinu"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Odgovori pošiljaocu"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Otvori vezu u čitaču"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "Pošalji _poruku..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Dodaj u _adresar"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Otvori u %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Ovaj smeštaj ne podržava pretplate, ili nisu omogućene."
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "Pretplati se"
 
-#: mail/em-subscribe-editor.c:637 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 "Direktorijum"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Molim izaberite server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Nije izabran server"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Ne pokazuj ponovo ovu poruku."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filteri"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- Prosleđena poruka --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "U %a, %d. %m. %Y u %H:%M %%+05d, %%s napisa:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "poruka"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "Sačuvaj poruku..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Dodaj adresu"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, c-format
 msgid "Messages from %s"
 msgstr "Poruke od %s"
@@ -13503,12 +13926,14 @@ msgstr "Proveri da li je pristigla pošta đubre"
 
 # bug: British or American English?
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+#, fuzzy
+msgid "Citation highlight color"
 msgstr "Boja isticanja citata"
 
 # bug: British or American English?
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+#, fuzzy
+msgid "Citation highlight color."
 msgstr "Boja isticanja citata."
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13613,14 +14038,20 @@ msgstr "Poslednje vreme pražnjenja smeća"
 
 # bug: American English or British?
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+#, fuzzy
+msgid "List of Labels and their associated colors"
 msgstr "Spisak oznaka i odgovarajućih boja"
 
 #: mail/evolution-mail.schemas.in.in.h:30
-msgid "List of accounts"
+#, fuzzy
+msgid "List of accepted licenses"
 msgstr "Spisak naloga"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+msgid "List of accounts"
+msgstr "Spisak naloga"
+
+#: 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."
@@ -13628,28 +14059,33 @@ msgstr ""
 "Spisak naloga koje poznaje poštanski deo Evolucije. Spisak sadrži niske koje "
 "imenuju podkategorije u odnosu na /apps/evolution/mail/accounts."
 
-#: mail/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr "Spisak proizvoljnih zaglavlja i da li su uključena."
 
 # bug: American or British English?
-#: mail/evolution-mail.schemas.in.in.h:33
+#: mail/evolution-mail.schemas.in.in.h:34
+#, fuzzy
 msgid ""
 "List of labels known to the mail component of Evolution. The list contains "
-"strings containing name:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 "Spisak oznaka koje poznaje poštanski deo Evolucije. Spisak sadrži niske koje "
 "sadrže ime:boja gde boja koristi HTML heksadekadni zapis."
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr "Spisak vrsti datoteka za pronalaženje Bonobo pregledača"
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr "Učitaj slike za HTML poruke preko HTTP-a"
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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 - "
@@ -13659,89 +14095,89 @@ msgstr ""
 "ne učitavaj poruke preko mreže, 1 — učitaj poruke ako je pošiljalac u "
 "adresaru, 2 — uvek učitaj slike preko mreže"
 
-#: mail/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 msgid "Log filter actions"
 msgstr "Beleži dejstvo filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr "Beleži dejstvo filtera u navedenu datoteku dnevnika."
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr "Dnevnik u koji da beleži dejstvo filtera"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr "Dnevnik u koji da beleži dejstvo filtera."
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr "Označi kao viđenu nakon određenog vremena"
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr "Označi kao viđenu nakon određenog vremena."
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr "Označi citate u pregledu poruke"
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr "Označi citate u pregledu poruke."
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr "Podrazumevana širina prozora za poruku"
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr "Stil prikaza poruke (običan, sva zaglavlja, izvorni)"
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr "Najmanje dana između pražnjenja smeća po izlasku"
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr "Najmanje vreme između pražnjenja smeća po izlasku, u danima."
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr "Zvuk za obaveštenje o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr "Vrsta obaveštenja o novoj pošti"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr "Upitaj kada je tema prazna"
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr "Upitaj korisnika kada želi da isprazni direktorijum."
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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 "Upitaj korisnika kada pokuša da pošalje poruku bez teme."
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr "Upitaj pri pražnjenju"
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr "Upitaj kada korisnik uputi samo nevidljivu kopiju"
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
@@ -13749,35 +14185,27 @@ msgstr ""
 "Upitaj kada korisnik pokuša da pošalje HTML poruke primaocima koji možda ne "
 "žele da primaju HTML poštu."
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: mail/evolution-mail.schemas.in.in.h:60
 msgid "Prompt when user tries to send a message with no To or Cc recipients."
 msgstr ""
 "Upitaj korisnika kada pokuša da pošalje poruku bez navođenja kome ili kopije."
 
-#: mail/evolution-mail.schemas.in.in.h:59
+#: mail/evolution-mail.schemas.in.in.h:61
 msgid "Prompt when user tries to send unwanted HTML"
 msgstr "Upitaj kada korisnik pokuša da pošalje neželjeni HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:60
+#: mail/evolution-mail.schemas.in.in.h:62
 msgid "Recognize links in text and replace them."
 msgstr "Prepoznaj veze u tekstu i zameni ih."
 
-#: mail/evolution-mail.schemas.in.in.h:61
+#: mail/evolution-mail.schemas.in.in.h:63
 msgid "Recognize smileys in text and replace them with images."
 msgstr "Prepoznaj smeške u tekstu i zameni ih slikama."
 
-#: mail/evolution-mail.schemas.in.in.h:62
+#: mail/evolution-mail.schemas.in.in.h:64
 msgid "Run junk test on incoming mail"
 msgstr "Proveri da dolazeća pošta nije đubre"
 
-#: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
-msgstr "t4jN4 0pCij4"
-
-#: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
-msgstr "t4jN4 0pCij4."
-
 #: mail/evolution-mail.schemas.in.in.h:65
 msgid "Send HTML mail by default"
 msgstr "Podrazumevano šalji HTML poštu"
@@ -13824,7 +14252,7 @@ msgstr "Istovremena provera pravopisa"
 
 #: mail/evolution-mail.schemas.in.in.h:76
 #, fuzzy
-msgid "Subscribe dialog default hight"
+msgid "Subscribe dialog default height"
 msgstr "Podrazumevana visina prozora za poruku"
 
 #: mail/evolution-mail.schemas.in.in.h:77
@@ -13969,33 +14397,63 @@ msgstr "port za pokretanje korisnikovog spamd-a"
 msgid "spamd port"
 msgstr "port spamd-a"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolucija Elm uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolucija Netscape pošta uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Postavke sastavljača"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolucija Outlook Express 4 uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "Podesite osobine za poštu, uključujući sigurnost i prikaz poruke, ovde"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolucija Pine uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Podesite proveru pravopisa, potpise, i sastavljač poruke ovde"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolucija mbox uvoznik"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Podesite vaše naloge za poštu ovde"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBoks (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolucija pošta"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Kontrola podešavanja Evolucija naloga za poštu"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Komponenta Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Sastavljač Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Kontrola podešavanja Evolucija sastavljača"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Kontrola osobina Evolucija pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Poštanski nalozi"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Osobine pošte"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "_Pošta:"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14003,15 +14461,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Molim sačekajte"
 
@@ -14040,18 +14498,46 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, c-format
 msgid "Importing `%s'"
 msgstr "Uvozim „%s“"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 msgid "Importing mailbox"
 msgstr "Uvozim poštansko sanduče"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolucija Elm uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolucija Netscape pošta uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolucija Outlook Express 4 uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolucija Pine uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolucija mbox uvoznik"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBoks (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Pretražujem %s"
@@ -14061,7 +14547,7 @@ msgstr "Pretražujem %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetni filter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14086,7 +14572,7 @@ msgstr ""
 "prioriteta. Proverite uvežene filtere da se uverite\n"
 "da li sve radi kao što bi trebalo."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14098,7 +14584,7 @@ msgstr ""
 "opciju, koju Evolucija ne podržava.\n"
 "Ovi filteri neće ostati."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14112,23 +14598,23 @@ msgstr ""
 "su promenjeni da mogu da provere da li taj niz jeste\n"
 "ili nije sadržan u telu poruke."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolucija uvozi vaše stare Netscape podatke"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 msgid "Importing Netscape data"
 msgstr "Uvozim podatke iz Netskejpa"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Postavke"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Filteri pošte"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14161,124 +14647,136 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Urednik Evolucija naloga"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, fuzzy, c-format
+msgid "%s License Agreement"
+msgstr "Saglasnost ključa"
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Domaćin:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Korisničko_ime"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Putanja:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Pošta za %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Naslove je %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Pošta od %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s dopisna lista"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "Odgovori na %s"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Dodaj pravilo filtriranja"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d izabranih"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Priprema"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d poslatih"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d ukupno"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d neposlatih"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d izabranih"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nova poruka"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_Poruka"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Sastavi novu poruku"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 msgid "New Mail Folder"
 msgstr "Novi direktorijum sa poštom"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 msgid "Mail _Folder"
 msgstr "_Direktorijum sa poštom"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 msgid "Create a new mail folder"
 msgstr "Napravi novi direktorijum sa poštom"
 
-#: mail/mail-component.c:871
-msgid "URI of the mail source that the view will display"
-msgstr "Adresa izvora pošte koji će biti prikazani u pregledu"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "proveravam servis"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Povezujem se na server..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Ličnost"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14288,12 +14786,12 @@ msgstr ""
 "moraju biti popunjena, osim ako ne želite da ove podatke uključite u poruke "
 "koje šaljete."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Primanje pošte"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14301,15 +14799,15 @@ msgstr ""
 "Molim unesite podatke o vašem dolazećem serveru za poštu. Ako niste sigurni, "
 "pitajte sistem administratora ili ponuđača Internet servisa."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Molim izaberite od sledećih opcija"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Slanje pošte"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14317,11 +14815,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Upravljanje nalozima"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14334,14 +14832,6 @@ 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.c:888
-msgid "Checking Service"
-msgstr "proveravam servis"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Povezujem se na server..."
-
 #: mail/mail-config.glade.h:1
 msgid " Ch_eck for Supported Types "
 msgstr "_Proveri podržane vrste "
@@ -14632,7 +15122,8 @@ msgstr "Izvrši komandu..."
 
 # bug: space too much?
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "U_tvrđene-širine:"
 
 #: mail/mail-config.glade.h:82
@@ -14938,353 +15429,458 @@ msgstr "boja"
 msgid "description"
 msgstr "opis"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
-"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+msgid "Invalid authentication"
+msgstr "Identifikacija"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP server %s ne podržava traženi tip autorizacije %s."
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Sigurno želite da obrišete ovaj nalog?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Sigurno želite da otvorite svih %d poruka u posebnim prozorima?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Trajno ukloni sve obrisane poruke iz svih direktorijuma"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Šaljete poruku u HTML obliku. Proverite da li \n"
+"naredni primaoci žele i mogu da prime HTML poštu:\n"
+"%sSvakako pošalji?"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
+msgid "_Send"
+msgstr "Pošalji"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Sigurno želite da ponovo pošaljete svih %d poruka?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Ne mogu da kopiram direktorijum: %s"
+msgid "Use default drafts folder?"
+msgstr "Putanja do podrazumevanog direktorijuma kontakata"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Ne mogu da napravim direktorijum: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Ne mogu da otvorim direktorijum sa pripremom za ovaj nalog.\n"
+"Želite li da koristite predefinisani direktorijum sa pripremom?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
+msgid "Use _Default"
+msgstr "Podrazumevani"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Ne mogu da napravim direktorijum\n"
-"%s\n"
-"Greška: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Sigurno želite da otvorite svih %d poruka u posebnim prozorima?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Ne mogu da obrišem direktorijum:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Ne mogu da obrišem lokalni direktorijum „%s“."
+msgid "_Expunge"
+msgstr "Izba_ci"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum ne postoji."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Trajno ukloni sve obrisane poruke iz svih direktorijuma"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Ne mogu da premestim direktorijum: %s"
+msgid "_Empty Trash"
+msgstr "Izbaci _smeće"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Ne mogu da otvorim izvor"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Ne mogu da otvorim izvor"
+msgid "Error while {0}."
+msgstr ""
+"Greška tokom '%s':\n"
+"%s"
+
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Ne mogu da otvorim poruku"
+msgid "Error while performing operation."
+msgstr ""
+"Greška tokom operacije:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Ne mogu da preimenujem lokalni direktorijum „%s“."
+msgid "Enter password."
+msgstr "Unesite lozinku"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Greška kod učitavanja podataka filtera:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Nisam mogao da napravim direktorijum %s: %s."
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Ne mogu da sačuvam u `%s'\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Dodaj potpis"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Ne mogu da napravim direktorijum\n"
+"%s\n"
+"Greška: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Nisam mogao da sačuvam potpis: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Obriši „%s“"
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Obriši odabrane kontakte"
+msgid "Cannot create temporary save directory."
+msgstr "Nisam mogao da napravim privremeni direktorijum: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Zanemari promene"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Želite li da sačuvate promene?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ne briši"
+msgid "File exists but cannot overwrite it."
+msgstr "Datoteka postoji, da je prepišem?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Unesite lozinku"
+msgid "File exists but is not a regular file."
+msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Greška kod učitavanja podataka filtera:\n"
+"Ne mogu da obrišem direktorijum:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Greška tokom operacije:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Ne mogu da obrišem lokalni direktorijum „%s“."
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Greška tokom '%s':\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Datoteka postoji, da je prepišem?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Ne mogu da preimenujem lokalni direktorijum „%s“."
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Datoteka '%s' ne postoji ili nije regularna datoteka."
+msgid "Delete \"{0}\"?"
+msgstr "Obriši „%s“"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Zaista da brišem direktorijum „%s“, i sve njegove poddirektorijume?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 ""
+"Direktorijum sa imenom „%s“ već postoji. Molim koristite neko drugo ime."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Identifikacija"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Ne mogu da premestim direktorijum: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Ne mogu da otvorim izvor"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Ne mogu da otvorim poruku"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Ne mogu da kopiram direktorijum: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Šaljete poruku u HTML obliku. Proverite da li \n"
-"naredni primaoci žele i mogu da prime HTML poštu:\n"
-"%sSvakako pošalji?"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Ne mogu da napravim direktorijum: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Zaista da brišem direktorijum „%s“, i sve njegove poddirektorijume?"
+msgid "Cannot open source \"{1}\""
+msgstr "Ne mogu da otvorim izvor"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Niste uneli sve potrebne podatke."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Ne možete otvoriti dva naloga sa istim imenom."
+
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Obriši odabrane kontakte"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Sigurno želite da obrišete ovaj nalog?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorijum:\n"
-"    '%s'\n"
-"Potom su osveženi."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ne briši"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Sledeći vFolder(i):\n"
-"%sKoristili su uklonjeni direktorijum:\n"
-"    '%s'\n"
-"Potom su osveženi."
+msgid "Could not save signature file."
+msgstr "Nisam mogao da sačuvam potpis: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Dodaj potpis"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Zanemari promene"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP server %s ne podržava traženi tip autorizacije %s."
+msgid "Do you wish to save your changes?"
+msgstr "Želite li da sačuvate promene?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15292,85 +15888,97 @@ msgstr ""
 "\n"
 "Želite li da sačuvate promene?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Ne mogu da otvorim direktorijum sa pripremom za ovaj nalog.\n"
-"Želite li da koristite predefinisani direktorijum sa pripremom?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Podrazumevani"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Zanemari promene"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Putanja do podrazumevanog direktorijuma kontakata"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Niste uneli sve potrebne podatke."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Imate neposlate poruke, želite li svejedno da izađete?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Ne možete otvoriti dva naloga sa istim imenom."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Ne mogu da preuzmem direktorijum „%s“: direktorijum ne postoji."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Zanemari promene"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Izbaci _smeće"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Sledeći vFolder(i):\n"
+"%sKoristili su uklonjeni direktorijum:\n"
+"    '%s'\n"
+"Potom su osveženi."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Izba_ci"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Pošalji"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Sledeći vFolder(i):\n"
+"%sKoristili su uklonjeni direktorijum:\n"
+"    '%s'\n"
+"Potom su osveženi."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Prepiši"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Pošalji"
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingujem %s"
@@ -15379,20 +15987,20 @@ msgstr "Pingujem %s"
 msgid "Working"
 msgstr "Radim"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtriram direktorijum"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Uzimam poštu"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Neuspešna primena odlazećih filtera: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15401,102 +16009,102 @@ msgstr ""
 "Neuspešno dodavanje u %s: %s\n"
 "Dodajem u lokalni direktorijum Poslato."
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Neuspešno dodavanje u lokalni direktorijum Poslato: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Šaljem poruku %d od %d"
 
 # bug: plural-forms
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Nisam uspeo da pošaljem %d od %d poruka"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Gotovo."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Čuvam poruku u direktorijum"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Premeštam poruke u %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopiram poruke u %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Pretražujem direktorijume u \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Prosleđene poruke"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Otvaram direktorijum %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Otvaram ostavu %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Uklanjam direktorijum %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Smeštam direktorijum '%s'"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr "Čistim i smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, c-format
 msgid "Storing account '%s'"
 msgstr "Smeštam nalog „%s“"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Osvežavam direktorijum"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Izbacujem direktorijum"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Praznim smeće u '%s'"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokalni direktorijumi"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Učitavam poruku %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -15504,7 +16112,7 @@ msgstr[0] "Učitavam %d poruku"
 msgstr[1] "Učitavam %d poruke"
 msgstr[2] "Učitavam %d poruka"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -15512,7 +16120,7 @@ msgstr[0] "Čuvam %d poruku"
 msgstr[1] "Čuvam %d poruke"
 msgstr[2] "Čuvam %d poruka"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15521,7 +16129,7 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15530,11 +16138,11 @@ msgstr ""
 "Greška kod čuvanja poruka u: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Čuvam prilog"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15543,17 +16151,17 @@ msgstr ""
 "Ne mogu da napravim izlaznu datoteku: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Nisam mogao da upišem: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Prekidam vezu sa %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ponovo se povezujem na %s"
@@ -15617,24 +16225,24 @@ msgstr "Osvežavam..."
 msgid "Waiting..."
 msgstr "Čekam..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Korisnik je poništio operaciju."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Unesite lozinku za %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Unesite lozinku"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Zapamti ovu lozinku"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Zapamti ovu lozinku do kraja ove sesije"
 
@@ -15674,89 +16282,94 @@ msgstr "Prosleđena poruka"
 msgid "Invalid folder: `%s'"
 msgstr "Neispravan direktorijum %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Postavljam vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Osvežavam vdirektorijume za adresu: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Osvežavam vdirektorijume za adresu: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders-i"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Izmeni VFolder-e"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Novi VFolder"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Neviđeno"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Viđeno"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Odgovoreno"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Višestruke neviđene poruke"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Višestruke poruke"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Najniže"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Niže"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Više"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Najviše"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Danas %k:%M "
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Juče %k:%M "
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %k:%M "
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d. %b, %k:%M "
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d. %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Pravim listu poruka"
 
@@ -15788,43 +16401,43 @@ msgstr "Primljeno"
 msgid "Size"
 msgstr "Veličina"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Poziv"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Ne prosledi"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Sledi"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "Za vašu informaciju"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Prosledi"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Nije neophodan odgovor"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Odgovori"
 
-#: mail/message-tag-followup.c:70 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 "Odgovori svima"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Pročitaj"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Označi za praćenje"
 
@@ -15868,51 +16481,31 @@ msgstr "Pretp_lati se"
 msgid "_Unsubscribe"
 msgstr "Odjavi pretplatu"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolucija konzola"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Proba Evolucije"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Probni deo Evolucije"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
-msgid "Default shortcut group"
-msgstr "Podrazumevana grupa prečice"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default width of the folder bar pane"
 msgstr "Podrazumevana širina površi sa direktorijumima"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-msgid "Default width of the shortcut bar pane"
-msgstr "Podrazumevana širina površi sa prečicama"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 msgid "Default window height"
 msgstr "Podrazumevana visina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 msgid "Default window width"
 msgstr "Podrazumevana širina prozora"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 msgid "Evolution configuration version"
 msgstr "Izdanje alata za podešavanje Evolucije"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 "IB ili nadimak dela koji se uobičajeno prikazuje po pokretanju."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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."
@@ -15920,7 +16513,7 @@ msgstr ""
 "Ako je postavljeno, Evolucija će se pokrenuti u nepovezanom režimu umesto u "
 "povezanom režimu."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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."
@@ -15928,61 +16521,21 @@ msgstr ""
 "Ako je postavljeno, prozorče sa upozorenjem u razvojnim izdanjima Evolucije "
 "se neće prikazivati."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 "Spisak putanja direktorijuma koji se usklađuju nadisku za nepovezanu upotrebu"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr "Putanja do podrazumevanog direktorijuma kalendara"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-msgid "Path to the default contacts folder"
-msgstr "Putanja do podrazumevanog direktorijuma kontakata"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-msgid "Path to the default mail folder"
-msgstr "Putanja do podrazumevanog direktorijuma pošte"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-msgid "Path to the default tasks folder"
-msgstr "Putanja do podrazumevanog direktorijuma zaduženja"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma kalendara"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma kontakata"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma pošte"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-msgid "Physical URI to the default tasks folder"
-msgstr "Fizička adresa do podrazumevanog direktorijuma zaduženja"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 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:21
-msgid "Whether to show the folder bar"
-msgstr "Da li se prikazuje površ sa direktorijumima"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-msgid "Whether to show the shortcut bar"
-msgstr "Da li se prikazuje površ sa prečicama"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 msgid "mail"
 msgstr "pošta"
 
@@ -15990,6 +16543,32 @@ msgstr "pošta"
 msgid "Brought to you by"
 msgstr "Omogućili su"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Nepoznata greška"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Neispravni argumenti"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Ne mogu da se registruje na OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Baza sa podešavanjima nije nađena"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Opšta greška"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Bezimeno)"
@@ -16127,11 +16706,11 @@ msgstr "Nisam mogao da pokrenem uvoznika."
 msgid "_Import"
 msgstr "U_voz"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Zatvaram veze..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Podešavanja Evolucije"
 
@@ -16173,11 +16752,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Pošta za %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Greška kod pokretanja %s."
@@ -16191,14 +16794,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug buddy ne može da se pokrene."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "O Ximian Evoluciji"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Na mreži"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Nije na mreži"
 
@@ -16206,52 +16810,6 @@ msgstr "_Nije na mreži"
 msgid "Work Offline"
 msgstr "Radi bez mreže"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian 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:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-"Upozorenje: Evolucija ne može da dogradi sve vaše podatke iz izdanja %d.%d.%"
-"d.\n"
-"Vaši podaci nisu obrisani, ali neće biti prikazani u ovom izdanju "
-"Evolucije.\n"
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Neispravni argumenti"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Ne mogu da se registruje na OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Baza sa podešavanjima nije nađena"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Opšta greška"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kućica"
@@ -16322,6 +16880,43 @@ msgstr "Aktivne veze"
 msgid "Click OK to close these connections and go offline"
 msgstr "Izaberite OK da prekinete vezu"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alendar"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Konatkti: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Pošta:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "Za_duženja:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "_Vrsta direktorijuma:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Otvori direktorijum drugog korisnika"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Nalog:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Ime direktorijuma:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Korisnik:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Pomoćnik Evolucija podešavanja"
@@ -16364,6 +16959,18 @@ msgstr ""
 "\n"
 "Pritisnite dugme \"Primeni\" da sačuvate vaša podešavanja. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolucija konzola"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Proba Evolucije"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Probni deo Evolucije"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Pritisnite \"Uvezi\" da započnete sa uvozom datoteke u Evoluciju. "
@@ -16423,13 +17030,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolucija može da uveze podatke iz sledećih datoteka:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16458,57 +17065,48 @@ msgstr ""
 "Nadamo se da ćete uživati u plodovima našeg napornog rada, i \n"
 "željno iščekujemo vaše doprinose!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Hvala\n"
 "Tim Ximian Evolucije\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Nemoj mi ponovo reći"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ne mogu da pristupim konzoli Ximian Evolucije"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ne mogu da pokrenem konzolu Ximian Evolucije: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr "Pokreni Evoluciju uz navedeni deo"
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Počni sa radom bez mreže"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Počni sa radom na mreži"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Silom ugasi sve delove evolucije"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Primoraj ponovni prenos podataka iz Evolucije 1.4"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Pošalji izlaz o greškama iz svih delova u datoteku."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolucija"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16517,13 +17115,79 @@ msgstr ""
 "%s: --online i --offline se ne mogu koristiti zajedno.\n"
 "  Koristite %s --help za više podataka.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Povezujem se"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ne mogu da pristupim konzoli Ximian Evolucije"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Pomoćnik za naloge Evolucije"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 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:585
+#: smime/gui/certificate-manager.c:604
 msgid "Certificate Name"
 msgstr "Ime sertifikata"
 
@@ -16752,11 +17416,6 @@ msgstr "Držite ove sertifikate koji određuju ove osobe:"
 msgid "Your Certificates"
 msgstr "Vaši sertifikati"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-msgid "Certificate already exists"
-msgstr "Sertifikat već postoji"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d. %m. %Y."
@@ -16947,6 +17606,11 @@ msgstr "Jedinstveni IB subjekta"
 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
+msgid "Certificate already exists"
+msgstr "Sertifikat već postoji"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr "PKCS12 lozinka datoteke"
@@ -16986,12 +17650,12 @@ msgstr "Predefinisan naslov poruke."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Nisam mogao da izvršim „%s“: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Gasim %s (%s)\n"
@@ -17056,7 +17720,8 @@ msgid "Select all contacts"
 msgstr "Izaberi sve kontakte"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Pošalji poruku izabranim kontaktima."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17087,8 +17752,8 @@ msgstr "Pregledaj tekući kontakt"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Akcije"
@@ -17106,7 +17771,8 @@ msgid "_Preview Pane"
 msgstr "_Prostor za pregled"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Sačuvaj kao VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17233,10 +17899,20 @@ msgstr "Pregledaj tekući zakazani sastanak"
 msgid "Week"
 msgstr "Nedelja"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Radna nedelja"
+
 #: ui/evolution-calendar.xml.h:42
 msgid "_Open Appointment"
 msgstr "_Otvori zakazani sastanak"
 
+#: 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 "Z_atvori"
+
 #: 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
@@ -17556,6 +18232,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Zatvori"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "Dodaj _pošiljaoca u adresar"
@@ -17793,7 +18479,8 @@ msgid "Open the selected message in a new window"
 msgstr "Otvori izabranu poruku u novom prozoru"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Otvori izabranu poruku radi ponovnog slanja"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17909,58 +18596,46 @@ msgstr "Prividni direktorijum na _naslov..."
 msgid "_Attached"
 msgstr "_Priloženo"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiraj u direktorijum"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Napravi filter od poruke"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Idi na"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "Unutar"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Veće"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "Prikaz _poruke"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Premesti u direktorijum"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Sledeća poruka"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Normalan pri_kaz"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Otvori poruku"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Prethodna poruka"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citirano"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Ponovo poša_lji..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "Ala_ti"
@@ -17969,16 +18644,6 @@ msgstr "Ala_ti"
 msgid "_Undelete"
 msgstr "_Povrati"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Zatvori"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Priloži"
@@ -18368,6 +19033,11 @@ msgstr "_Kratki podsetnik"
 msgid "_Send / Receive"
 msgstr "_Pošalji / primi"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Pro_zor"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Prema _preduzeću"
@@ -18435,10 +19105,6 @@ msgstr "Datum završetka:"
 msgid "With _Status"
 msgstr "Dodeli status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Zaduženja"
-
 # Univerzalno vreme, ili UT
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
@@ -18597,6 +19263,34 @@ msgstr "Drugo..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolucija pošta"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Informacija o sastanku"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolucija sažetak"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "<span weight=\"bold\">Fontovi za štampu</span>"
+
 #: widgets/misc/e-expander.c:181
 msgid "Expanded"
 msgstr "Razgranati"
@@ -18711,6 +19405,35 @@ msgstr "Tekst"
 msgid "Find _Now"
 msgstr "Nađi _sada"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 već postoji\n"
+"Želite li da prepišete novim unosom?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Ne mogu da sačuvam u `%s'\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Ne mogu da sačuvam u `%s'\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18721,12 +19444,153 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% završeno)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Preglednik direktorijuma Evolucija adresara"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adresa _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blogče"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Preglednik Evolucija kalendara"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Preglednik Evolucija zaduženja"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Nisam mogao da učitam  gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Nisam mogao da otvorim direktorijum u '%s"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI koju će kalendar pokazati"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Tip pogleda za prikaz"
+
+#~ msgid "Display a message"
+#~ msgstr "Pokaži poruku"
+
+#~ msgid "Alerts"
+#~ msgstr "Upozorenja"
+
+#~ msgid "Time"
+#~ msgstr "Vreme"
+
+#~ msgid "_General"
+#~ msgstr "_Opšte"
+
+#~ msgid "Select source"
+#~ msgstr "Izaberite izvor"
+
+#~ msgid "calendar"
+#~ msgstr "kalendar"
+
+#~ msgid "task list"
+#~ msgstr "spisak zaduženja"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Datoteka kalendara nije mogla biti ažurirana\n"
+
 #~ msgid ""
-#~ "Address book '%s' will be removed. Are you sure you want to continue?"
-#~ msgstr "Adresar „%s“ će biti uklonjen. Sigurno želite da nastavite?"
+#~ "The task backend for\n"
+#~ "%s\n"
+#~ " has crashed."
+#~ msgstr ""
+#~ "Mašinerija zaduženja za \n"
+#~ "%s\n"
+#~ " je pukla."
 
-#~ msgid "New Address Book"
-#~ msgstr "Novi adresar"
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Adresa direktorijuma zaduženja za prikaz"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Nisam mogao da učitam zaduženja u `%s"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Preglednik za direktorijume Evolucija pošte"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder za nit"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtriraj prem _niti"
+
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Neuspešan prenos ostave KIB-ova za POP3: %s"
+
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Neuspešan prenos stanja raširenosti direktorijuma: %s"
+
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Neuspešno otvaranje smeštaja za „%s“: %s"
+
+#~ msgid "S3kr3t 0pt10n"
+#~ msgstr "t4jN4 0pCij4"
+
+#~ msgid "S3kr3t 0pt10n."
+#~ msgstr "t4jN4 0pCij4."
+
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Adresa izvora pošte koji će biti prikazani u pregledu"
+
+#~ msgid "Default shortcut group"
+#~ msgstr "Podrazumevana grupa prečice"
+
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Podrazumevana širina površi sa prečicama"
+
+#~ msgid "Path to the default calendar folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma kalendara"
+
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma kontakata"
+
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma pošte"
+
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Putanja do podrazumevanog direktorijuma zaduženja"
+
+#~ msgid "Physical URI to the default calendar folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma kalendara"
+
+#~ msgid "Physical URI to the default contacts folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma kontakata"
+
+#~ msgid "Physical URI to the default mail folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma pošte"
+
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Fizička adresa do podrazumevanog direktorijuma zaduženja"
+
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Da li se prikazuje površ sa direktorijumima"
+
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Da li se prikazuje površ sa prečicama"
+
+#~ msgid ""
+#~ "Warning: Evolution could not upgrade all your data from version %d.%d.%"
+#~ "d.\n"
+#~ "The data hasn't been deleted, but it will not be seen by this version of "
+#~ "Evolution.\n"
+#~ msgstr ""
+#~ "Upozorenje: Evolucija ne može da dogradi sve vaše podatke iz izdanja %d.%"
+#~ "d.%d.\n"
+#~ "Vaši podaci nisu obrisani, ali neće biti prikazani u ovom izdanju "
+#~ "Evolucije.\n"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ne mogu da pokrenem konzolu Ximian Evolucije: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Ponovo poša_lji..."
 
 #~ msgid "UID of the contacts source that the view will display"
 #~ msgstr "KIB izvora kontakata koji će biti prikazani u pregledu"
@@ -18898,9 +19762,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "S_pouse:"
 #~ msgstr "S_upružnik:"
 
-#~ msgid "_Add"
-#~ msgstr "_Dodaj"
-
 #~ msgid "_Business:"
 #~ msgstr "_Posao:"
 
@@ -19023,15 +19884,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Datum završetka je pre datuma početka!"
 
-#~ msgid "Start Date:"
-#~ msgstr "Datum početka:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Datum završetka:"
-
-#~ msgid "Priority:"
-#~ msgstr "Važnost:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19063,13 +19915,6 @@ msgstr "%s (%d%% završeno)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Ne mogu da kopiram opis datoteke: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19215,9 +20060,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Pregled koji prikazuje kada počinje kalendar"
 
-#~ msgid "Enter the password for %s"
-#~ msgstr "Unesite lozinku za „%s“"
-
 #~ msgid "New task list"
 #~ msgstr "Novi spisak zaduženja"
 
@@ -19274,30 +20116,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Ne mogu da nađem navedeni deljeni direktorijum."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alendar"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Pošta:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "Za_duženja:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "_Vrsta direktorijuma:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Otvori direktorijum drugog korisnika"
-
-#~ msgid "_Account:"
-#~ msgstr "_Nalog:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Ime direktorijuma:"
-
-#~ msgid "_User:"
-#~ msgstr "_Korisnik:"
-
 #~ msgid "Create a new window"
 #~ msgstr "Napravi novi prozor"
 
@@ -19319,75 +20137,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "_Go To Today"
 #~ msgstr "_Idi na danas"
 
-#~ msgid "Unexpected response from IMAP server %s: %s"
-#~ msgstr "Neočekivan odgovor od IMAP servera %s: %s"
-
-#~ msgid "Cannot select folder `%s': Invalid mailbox name"
-#~ msgstr "Ne mogu da izaberem direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot select folder `%s': Bad command"
-#~ msgstr "Ne mogu da izaberem direktorijum „%s“: loša naredba"
-
-#~ msgid "IMAP server %s unexpectedly disconnected: %s"
-#~ msgstr "Veza sa IMAP serverom %s je neočekivano prekinuta: %s"
-
-#~ msgid "Got BYE response"
-#~ msgstr "Primih odgovor BYE"
-
-#~ msgid ""
-#~ "Failed to connect to IMAP server %s in secure mode: Server does not "
-#~ "support STARTTLS"
-#~ msgstr ""
-#~ "Nisam mogao da se povežem na IMAP server %s u bezbednom režimu: server ne "
-#~ "podržava STARTTLS"
-
-#~ msgid ""
-#~ "Cannot authenticate to IMAP server %s using the %s authentication "
-#~ "mechanism"
-#~ msgstr ""
-#~ "Nisam mogao da se prijavim na IMAP server %s pomoću mehanizma prijave „%s“"
-
-#~ msgid "%sPlease enter the IMAP password for %s on host %s"
-#~ msgstr "%sUnesite IMAP lozinku korisnika „%s“ na računaru %s"
-
-#~ msgid "Cannot authenticate to IMAP server %s using %s"
-#~ msgstr "Nisam mogao da se prijavim na IMAP server %s pomoću %s"
-
-#~ msgid "Cannot create folder `%s': Invalid mailbox name"
-#~ msgstr "Ne mogu da napravim direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot create folder `%s': Bad command"
-#~ msgstr "Ne mogu da napravim direktorijum „%s“: loša naredba"
-
-#~ msgid "Cannot delete folder `%s': Special folder"
-#~ msgstr "Ne mogu da obrišem direktorijum „%s“: naročiti direktorijum"
-
-#~ msgid "Cannot delete folder `%s': Invalid mailbox name"
-#~ msgstr "Ne mogu da obrišem direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot delete folder `%s': Bad command"
-#~ msgstr "Ne mogu da obrišem direktorijum „%s“: loša naredba"
-
-#~ msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ne mogu da se pretplatim na direktorijum „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot subscribe to folder `%s': Bad command"
-#~ msgstr "Ne mogu da se pretplatim na direktorijum „%s“: loša naredba"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
-#~ msgstr ""
-#~ "Ne mogu da se odjavim sa direktorijuma „%s“: neispravno ime sandučeta"
-
-#~ msgid "Cannot unsubscribe from folder `%s': Bad command"
-#~ msgstr "Ne mogu da se odjavim sa direktorijuma „%s“: loša naredba"
-
-#~ msgid "Unexpected token in response from IMAP server %s: "
-#~ msgstr "Neočekivani element u odgovoru IMAP servera %s: "
-
-#~ msgid "No data"
-#~ msgstr "Nema podataka"
-
 #~ msgid "<b>Filter Rules</b>"
 #~ msgstr "<b>Pravila filtera</b>"
 
@@ -19403,9 +20152,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "[script]"
 #~ msgstr "[skripta]"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Sledeće veze su trenutno aktivne:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Potraži kontakte"
 
@@ -19946,9 +20692,6 @@ msgstr "%s (%d%% završeno)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "Ova poruka je digitalno potpisana ali ne može biti proverena."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Greška Evolucije"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20046,15 +20789,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "<b>Zvuk alarma</b>"
 
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "<b>Podsetnici</b>"
-
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Uzbune</b>"
-
-#~ msgid "<b>Task List</b>"
-#~ msgstr "<b>Spisak zaduženja</b>"
-
 #~ msgid "<b>Classification</b>"
 #~ msgstr "<b>Klasifikacija</b>"
 
@@ -20753,9 +21487,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "No cards"
 #~ msgstr "Nema karata"
 
-#~ msgid "%d cards"
-#~ msgstr "%d karata"
-
 #~ 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,a,b,v,g,d,đ,ž,z,i,j,k,l,lj,m,n,nj,o,p,r,s,t,ć,u,f,h,c,č,dž,š"
 
@@ -21092,9 +21823,6 @@ msgstr "%s (%d%% završeno)"
 #~ msgid "Configure the appearance of the Evolution Summary here"
 #~ msgstr "Podesite ovde izgled Evolucija sažetka"
 
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolucija sažetak"
-
 #~ msgid "Evolution Summary component"
 #~ msgstr "Komponenta Evolucija sažetka"
 
diff --git a/po/sv.po b/po/sv.po
index b29e22ee07..932fee0c12 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.195 2004/04/30 15:01:34 fejj Exp $
+# $Id: sv.po,v 1.196 2004/05/19 18:35:56 jpr Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -26,6 +26,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolutions adressbok"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Kontakter: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolutionsammanfattning"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -51,16 +61,6 @@ msgstr "kort"
 msgid " card"
 msgstr "1 kort"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Kontakter: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolutionsammanfattning"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Standardsynkroniseringsadress:"
@@ -75,65 +75,20 @@ msgstr "Kunde inte läsa in adressboken"
 msgid "Could not read pilot's Address application block"
 msgstr "Kunde inte läsa pilotens adressprogramblock"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Automatisk ifyllning"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Certifikat"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Konfigurera dina e-postkonton hä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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Kontakter"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adress-popup för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Adressvisare för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Kortvisare för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolutions adressbokskomponent"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Mappvisare för Evolutions adressbok"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolutions e-postinställningskontroll"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Ansluter anonymt till LDAP-servern"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolutions konfigurationskontroll för mappinställningar"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Misslyckades med autentisering.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sAnge lösenord för %s (användare %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -174,41 +129,45 @@ msgstr "_Kontaktgrupp"
 msgid "Create a new contacts group"
 msgstr "Skapa en ny genvägsgrupp"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Migrerar..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "Migrerar \"%s\""
@@ -216,8 +175,8 @@ msgstr "Migrerar \"%s\""
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "På denna dator"
 
@@ -225,7 +184,7 @@ msgstr "På denna dator"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Personligt"
@@ -272,20 +231,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Ansluter anonymt till LDAP-servern"
+#: addressbook/gui/component/addressbook-view.c:674
+#, 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.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Misslyckades med autentisering.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+msgid "New Address Book"
+msgstr "Ny adressbok"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sAnge lösenord för %s (användare %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -305,6 +286,61 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Automatisk ifyllning"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Kontakter"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Certifikat"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Konfigurera dina e-postkonton här"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adress-popup för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Adressvisare för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Kortvisare för Evolutions adressbok"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolutions adressbokskomponent"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolutions e-postinställningskontroll"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolutions konfigurationskontroll för mappinställningar"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  _Visa de baser som stöds "
@@ -326,6 +362,7 @@ msgstr "  _Visa de baser som stöds "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -398,7 +435,7 @@ msgstr "_Kontaktgrupp"
 msgid "Address Book Properties"
 msgstr "Adressbokskällor"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Alltid"
@@ -413,109 +450,99 @@ msgid "Basic"
 msgstr "Grundläggande"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "F_ärger"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Distinguished _name:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Sökbaser som stöds"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Allmänt"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Aldrig"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "En"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Välj en färg"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "S_ökomfattning: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Utgångspunkt för sökning:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "S_ökomfattning: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Söker"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -525,7 +552,7 @@ msgstr ""
 "till din\n"
 "LDAP-server om den stöder SSL eller TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -542,7 +569,7 @@ 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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -556,19 +583,19 @@ msgstr ""
 "att vara\n"
 "sårbar för säkerhetsluckor."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Pren"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Sökbaser som stöds"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -580,7 +607,7 @@ msgstr ""
 "Om du lämnar detta tomt kommer sökningen att börja vid roten av "
 "katalogträdet."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -596,7 +623,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:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 msgid ""
 "This is the full name of your ldap server. For example, \"ldap.mycompany.com"
 "\"."
@@ -604,7 +631,7 @@ msgstr ""
 "Detta är det fullständiga namnet på din ldap-server. Till exempel \"ldap."
 "mittforetag.se\"."
 
-#: addressbook/gui/component/ldap-config.glade.h:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -615,7 +642,7 @@ msgstr ""
 "högt\n"
 "kommer att slöa ned adressboken."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -625,7 +652,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -635,7 +662,7 @@ msgstr ""
 "mapplista.\n"
 "Det används endast för visning."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -647,127 +674,135 @@ msgstr ""
 "En lista med standardportar tillhandahålls. Fråga din systemadministratör "
 "vilken port du ska ange."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Tidsformat:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Använder distinguished name (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Använder e-postadress"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Närsomhelst"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Kontaktgrupp"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Hämtningsgräns:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-postadress:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Inloggningsmetod:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Namn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Portnummer:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "_Port:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: 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:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Servernamn:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_erver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "_Timeout (minuter):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Använd säker anslutning (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kort"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "anslutningsflik"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "allmän-flik"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "minut"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "sökflik"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolutions adressboks namnvalsgränssnitt"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Ta bort alla"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Ta bort"
 
+#: 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 "Namn"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Ta bort alla"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Visa kontaktlista"
@@ -790,23 +825,15 @@ msgstr "Lägg till i kontakter"
 msgid "Unnamed Contact"
 msgstr "Namnlös kontakt:"
 
-#: 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
-msgid "Name"
-msgstr "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
 msgid "Source"
 msgstr "Källkod"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolutions adressboks namnvalsgränssnitt"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -875,142 +902,142 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Adress _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adress:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Jubileum:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Assistent"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "F_ödelsedag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bologna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "K_alender:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "_Ort:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "_Företag:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Kontaktredigerare"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Land:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "A_vdelning:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Ledig/Upptagen-URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Fullständigt _namn..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Hem"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-postadress:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Manager"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Smeknamn:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "An_teckningar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Annat"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Box:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1038,9 +1065,9 @@ msgstr "Sida"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Jobb"
@@ -1074,23 +1101,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Är du säker på att du vill\n"
+"ta bort dessa kontakter?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Är du säker på att du vill\n"
+"ta bort denna kontakt?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Redigerbar"
 
@@ -2065,91 +2108,109 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL Instant Messenger"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "Yahoo Messenger"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-msgid "Service"
-msgstr "Tjänst"
-
-#: 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
-msgid "Location"
-msgstr "Plats"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "Användarnamn"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "Yahoo"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Källbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr "Målbok"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Är ny kontakt"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Skrivbara fält"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Ändrad"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Denna kontakt tillhör dessa kategorier:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Följande anslutningar är aktiva för tillfället:"
+
+#: 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-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL Instant Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "Yahoo Messenger"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+msgid "Service"
+msgstr "Tjänst"
+
+#: 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
+msgid "Location"
+msgstr "Plats"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "Användarnamn"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Snabbinläggning av kontakt"
@@ -2167,22 +2228,6 @@ msgstr "_Fullständigt namn:"
 msgid "E-_mail:"
 msgstr "E-_post:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Är du säker på att du vill\n"
-"ta bort dessa kontakter?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Är du säker på att du vill\n"
-"ta bort denna kontakt?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Adress _2:"
@@ -2330,8 +2375,8 @@ msgstr "kontaktlisteredigerare"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Bok"
 
@@ -2392,6 +2437,460 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Avancerad sökning"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Medlemmar"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Organisation"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grupp"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "Telefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Jobb"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Mobiltelefon"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Personligt"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Notering"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "_Jobbtitel:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-post"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax hem"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Lyckades"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Lagret frånkopplat"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "Åtkomst nekas"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Kortet hittades inte"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokollet stöds inte"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Avbruten"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Kunde inte uppdatera objekt"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Autentisering misslyckades"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Autentisering krävs"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, 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
+msgid "Other error"
+msgstr "Annat fel"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Vi kunde inte öppna denna adressbok. Detta betyder antingen\n"
+"att du har angett en felaktig URI eller att LDAP-servern är\n"
+"onåbar."
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Vi kunde inte öppna denna adressbok. Detta betyder antingen\n"
+"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
+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 ""
+"Fler kort matchade denna fråga än antingen servern är konfigurerad\n"
+"att returnera eller Evolution är konfigurerat att visa.\n"
+"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
+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 ""
+"Tiden för att köra denna fråga överskred servergränsen eller den gräns\n"
+"som du har konfigurerat för denna adressbok. Gör din sökning mer\n"
+"specifik eller höj resultatgränsen i katalogserverinställningarna\n"
+"för denna adressbok."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Fel vid tillägg av kort"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Fel vid ändring av lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Fel vid ändring av kort"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Fel vid borttagning av kort"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s finns redan\n"
+"Vill du skriva över den?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "kort.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "lista"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Flytta kort till"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kopiera kort till"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Flytta kort till"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kopiera kort till"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Välj kontakter från adressboken"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Flera VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard för %s"
+
+#.
+#. * 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 "(ingen)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Primär e-post"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "E-post 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "E-post 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Välj en åtgärd"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Skapa en ny kontakt \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Lägg till adress till befintliga kontakten \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Undersöker adressboken..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Redigera kontaktinformation"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Slå samman e-postadress"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "och ett annat kort."
+msgstr[1] "och ett annat kort."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Visa fullständiga _huvuden"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Spara kontakt som VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Spara i adressboken"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2407,8 +2906,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Fråga"
 
@@ -2463,9 +2962,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Spara som VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2533,7 +3033,7 @@ msgid "Cut"
 msgstr "Klipp ut"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2544,18 +3044,8 @@ msgstr "Kopiera"
 msgid "Paste"
 msgstr "Klistra in"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Ta bort"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Aktuell vy"
 
@@ -2572,7 +3062,7 @@ msgstr ""
 "det igen"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Alla kategorier"
@@ -2613,21 +3103,6 @@ msgstr "Kategorier"
 msgid "Company Phone"
 msgstr "Företagets telefon"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "E-post 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "E-post 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Efternamn"
@@ -2667,29 +3142,14 @@ msgstr "Jordanien"
 msgid "Manager"
 msgstr "Manager"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Mobiltelefon"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Smeknamn"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Notering"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Kontor"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Organisation"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Annan fax"
@@ -2743,21 +3203,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Webbsida"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Bredd"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Höjd"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Har fokus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Markerad"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Har markör"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Fält"
@@ -2774,10 +3242,6 @@ msgstr "Textmodell"
 msgid "Max field name length"
 msgstr "Maximal fältnamnslängd"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Kolumnbredd"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2806,434 +3270,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Adapter"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Markerad"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Har markör"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Medlemmar"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-post"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grupp"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "Telefon"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Jobb"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Personligt"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "_Jobbtitel:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax hem"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Lyckades"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Lagret frånkopplat"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adressboken finns inte"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Åtkomst nekas"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Kortet hittades inte"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Kort-ID finns redan"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokollet stöds inte"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Avbruten"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Kunde inte uppdatera objekt"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Autentisering misslyckades"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Autentisering krävs"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "Det finns inget sådant meddelande"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Annat fel"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Vi kunde inte öppna denna adressbok. Detta betyder antingen\n"
-"att du har angett en felaktig URI eller att LDAP-servern är\n"
-"onåbar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Vi kunde inte öppna denna adressbok. Detta betyder antingen\n"
-"att du har angett en felaktig URI eller att LDAP-servern är\n"
-"onåbar."
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Kan inte öppna adressboken"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Fler kort matchade denna fråga än antingen servern är konfigurerad\n"
-"att returnera eller Evolution är konfigurerat att visa.\n"
-"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:167
-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 ""
-"Tiden för att köra denna fråga överskred servergränsen eller den gräns\n"
-"som du har konfigurerat för denna adressbok. Gör din sökning mer\n"
-"specifik eller höj resultatgränsen i katalogserverinställningarna\n"
-"för denna adressbok."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Denna fråga returnerade inte utan problem."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Vill du spara ändringar?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Förkasta"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Fel vid tillägg av lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Fel vid tillägg av kort"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Fel vid ändring av lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Fel vid ändring av kort"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Fel vid borttagning av lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Fel vid borttagning av kort"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s finns redan\n"
-"Vill du skriva över den?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Skriv över"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "kort.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "lista"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Flytta kort till"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kopiera kort till"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Flytta kort till"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kopiera kort till"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Välj kontakter från adressboken"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Flera VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard för %s"
-
-#.
-#. * 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 "(ingen)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Primär e-post"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Välj en åtgärd"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Skapa en ny kontakt \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Lägg till adress till befintliga kontakten \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Undersöker adressboken..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Redigera kontaktinformation"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Slå samman e-postadress"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "och ett annat kort."
-msgstr[1] "och ett annat kort."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Visa fullständiga _huvuden"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Spara kontakt som VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Spara i adressboken"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Kolumnbredd"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3278,11 +3317,6 @@ msgstr "Evolutions VCard-importör"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Skriv ut kuvert"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3294,6 +3328,11 @@ msgstr "Skriv _ut kontakter..."
 msgid "Print contact"
 msgstr "Skriv _ut kontakter..."
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Skriv ut kuvert"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3482,17 +3521,6 @@ msgstr "Kontakt_lista"
 msgid "This should test the contact print code"
 msgstr "Detta är ett test av reflow canvas-elementet"
 
-#: 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
-#, 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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3551,6 +3579,17 @@ 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
+#, 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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Fel vid inläsning av standardadressboken."
@@ -3563,11 +3602,12 @@ msgstr "Indatafil"
 msgid "No filename provided."
 msgstr "Inget filnamn är angivet."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Namnlös lista"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Ange lösenord"
@@ -3600,120 +3640,55 @@ msgstr "Standardprioritet:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Kunde inte läsa pilotens att-göra-programblock"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Kalender och uppgifter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Kalender"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolutionkalender och -uppgifter"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolutionkalenderns konfigurationskontroll"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolutionkalenderns visare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolutions kalender-/uppgiftsredigerare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolutions uppgiftsvisare"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolutions kalender- och uppgiftskomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolutions e-postkomponent"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Uppgifter"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolutionkalenderns alarmaviseringstjänst"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Startar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Slutar:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolutionalarm"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Alarm den %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "S_täng"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Slu_mra"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Slumringstid (minuter)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Redigera möte"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Slumra"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Öppna"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Ingen beskrivning finns tillgänglig."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3722,12 +3697,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Varning"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3739,7 +3714,7 @@ msgstr ""
 "konfigurerad att skicka e-post. Evolution kommer att\n"
 "visa en normal dialogruta istället."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3756,19 +3731,19 @@ msgstr ""
 "\n"
 "Är du säker på att du vill köra detta program?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Fråga mig inte om detta program igen."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolutionkalenderns alarmaviseringstjänst"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Kunde inte initiera Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Kunde inte initiera gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Kunde inte skapa fabriken för alarmaviseringstjänsten"
 
@@ -3882,61 +3857,46 @@ 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 "_Fråga efter bekräftelse vid borttagning av objekt"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Ta bort färdigställda uppgifter"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Sammanfattningen innehåller"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Beskrivningen innehåller"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Kommentaren innehåller"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Beskrivningen innehåller"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Omatchade"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Kalender"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3949,122 +3909,133 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 msgid "Purge events older than"
 msgstr ""
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "dag"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Nya Kaledonien"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Egenskaper..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Läser in kalendern..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Nytt möte"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Möte"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Skapa ett nytt möte"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Sammanträde"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Skapa en ny sammanträdesbegäran"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Hel_dagsmöte"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Skapa ett nytt heldagsmöte"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Öppna en kalender"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "K_alender:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "Skapa en ny kalender"
 
@@ -4094,15 +4065,36 @@ msgstr "Veckovy"
 msgid "Month View"
 msgstr "Månadsvy"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Sammanfattningen innehåller"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Beskrivningen innehåller"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Kommentaren innehåller"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Beskrivningen innehåller"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Omatchade"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Fel vid öppnande av kalendern"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Metoden stöds inte vid öppnande av kalendern"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Åtkomst nekas för öppnande av kalendern"
 
@@ -4111,19 +4103,6 @@ msgstr "Åtkomst nekas för öppnande av kalendern"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Kunde inte öppna mappen i \"%s\""
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI:n som kalendern kommer att visa"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Typen av vy att visa"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Alternativ för ljudalarm"
@@ -4189,7 +4168,7 @@ msgstr "extra gånger var"
 msgid "hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr "Åtgärd/trigger"
 
@@ -4208,14 +4187,14 @@ msgstr "Grundläggande"
 msgid "Date/Time:"
 msgstr "Datum/tid:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Visa ett meddelande"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Spela ett ljud"
 
+#: 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 "Påminnelser"
@@ -4230,6 +4209,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
 msgid "Summary:"
 msgstr "Sammanfattning:"
@@ -4268,10 +4248,109 @@ msgstr "minut(er)"
 msgid "start of appointment"
 msgstr "start på möte"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Lägg till i kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Lägg till i kalender"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Typ:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "veckor"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Aktiverad"
 
@@ -4287,19 +4366,19 @@ msgstr "Ta inte bort"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Inaktivera"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Aktivera"
 
@@ -4324,163 +4403,177 @@ msgid "60 minutes"
 msgstr "60 minuter"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Varningar"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Ska utföras:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "<b>Ska utföras:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Uppgiftslista"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Ska utföras:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "<b>Ska utföras:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Kalender- och uppgiftsinställningar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Färg för uppgifter som skulle ha gjorts"
 
-#: 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 "Färg för uppgifter som ska utföras idag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Dagen _slutar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "dag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Visning"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "A_ktivera"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "fredag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "timme"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "minut"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "måndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_sön"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "lördag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Visa en påminnelse"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Visa v_eckonummer i datumbläddraren"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "söndag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "U_ppgifter som ska ha utförts idag:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "to_r"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-msgid "Task List"
-msgstr "Uppgiftslista"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "torsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Tid"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Tids_zon:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Tidsformat:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "tisdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "V_eckan börjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "onsdag"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Arbetsvecka"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Arbetsdagar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12-timmars (FM/EM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24-timmars"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Lägg till"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "_Fråga efter bekräftelse vid borttagning av objekt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "T_ryck ihop helger i månadsvyn"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Dagen börjar:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Visning"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4490,145 +4583,46 @@ msgstr "_Visning"
 msgid "_Edit"
 msgstr "_Redigera"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Ledig-/Upptagenbegäran"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_fre"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "Allm_änt"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Dölj färdiga uppgifter efter"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_mån"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Uppgi_fter som skulle ha utförts:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_lör"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Visa sluttiderna på möten i vecko- och månadsvyerna"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Tidsdivisioner:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "t_is"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_ons"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "före varje möte"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Lägg till i kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Uppgiftslista"
-
-#: 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: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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Lägg till i kalender"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Typ:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "veckor"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4711,82 +4705,82 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Du har inte gjort några ändringar, uppdatera redigeraren?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Valideringsfel: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " till "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Färdigt "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Färdigt "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Ska utföras "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Ska utföras "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Kunde inte uppdatera objekt"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Redigera möte"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Möte - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Uppgift - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Dagbokspost - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Ingen sammanfattning"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Spara som..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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 ""
 "Ändringar som görs i detta objekt kan komma att kastas om en uppdatering "
 "kommer"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Kunde inte få tag i aktuell version!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Valideringsfel: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " till "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Färdigt "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Färdigt "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Ska utföras "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Ska utföras "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4913,27 +4907,27 @@ msgstr "Delegera till:"
 msgid "Enter Delegate"
 msgstr "Ange delegerad person"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Möte"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Påminnelse"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Upprepning"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Schemaläggning"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Sammanträde"
 
@@ -4946,7 +4940,7 @@ msgstr "Förfallodatumet är före startdatumet"
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Startdatumet är fel"
 
@@ -5032,10 +5026,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5054,15 +5048,15 @@ msgstr "En organisatör krävs."
 msgid "At least one attendee is required."
 msgstr "Det måste finnas åtminstone en deltagare."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Delegera till..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5344,27 +5338,19 @@ msgstr "_Förkasta ändringar"
 msgid "Save Event"
 msgstr "Spara evenemang"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Välj importör"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Postdestination"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Kalender"
+msgid "_Destination"
+msgstr "Ta bort denna mapp"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-#, fuzzy
-msgid "task list"
-msgstr "Ny uppgift"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+msgid "Task List"
+msgstr "Uppgiftslista"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5392,38 +5378,44 @@ msgid "% _Complete"
 msgstr "% färdigt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Färdigt"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Hög"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Pågår"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Låg"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Inte startad"
 
@@ -5460,11 +5452,11 @@ msgstr "_Webbsideadress:"
 msgid "Assignment"
 msgstr "Tilldelning"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Förfallodatumet är fel"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Kan inte öppna adressboken"
@@ -5473,8 +5465,9 @@ msgstr "Kan inte öppna adressboken"
 msgid "Con_fidential"
 msgstr "_Konfidentiellt"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Beskrivning:"
@@ -5628,101 +5621,55 @@ msgstr "%s vid %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s för en okänd triggertyp"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Publikt"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Privat"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Konfidentiellt"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Slutdatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Startdatum"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Sammanfattning"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Ledig"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Upptagen"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Klicka för att lägga till en uppgift"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Namnlös"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "Ö"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Sta_rtdatum:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "V"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Förfallodatum:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Den geografiska positionen måste anges i formatet: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Status:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "_Prioritet:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Nej"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "_Webbsideadress:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Okänd"
+#: 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 "Publikt"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Återkommande"
+#: 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 "Privat"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Tilldelad"
+#: 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 "Konfidentiellt"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5768,17 +5715,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+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:399
+msgid "Busy"
+msgstr "Upptagen"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Tar bort markerade objekt"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Öppna"
 
@@ -5788,41 +5744,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Klistra _in"
 
@@ -5880,78 +5837,157 @@ msgstr "Prioritet"
 msgid "Start date"
 msgstr "Startdatum"
 
+#: 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 "Sammanfattning"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Sortera efter uppgift"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Nytt _möte..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Nytt _heldagsevenemang"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Nytt sammanträde"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Markera trå_d"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Markera"
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Publicera ledig-/upptageninformation"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Kopiera till mapp..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Fl_ytta till mapp..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Boka sammanträde..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Vidarebefordra som iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Ta bort denna f_örekomst"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Ta bort _alla förekomster"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Gå till _idag"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Gå till datum..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Inställningar..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Slutdatum"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Okänd"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Återkommande"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Nej"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "Ö"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "V"
+
+#: 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 ""
+"Den geografiska positionen måste anges i formatet: \n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5975,36 +6011,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i minutdivisioner"
+#. 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 "fm"
+
+#. 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 "em"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "fm"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "em"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i minutdivisioner"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6112,10 +6148,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Ingen</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Status:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6145,7 +6177,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "OK"
 
@@ -6358,62 +6390,58 @@ msgstr "Bilagan innehåller inte ett giltigt kalendermeddelande"
 msgid "The attachment has no viewable calendar items"
 msgstr "Bilagan har inga visningsbara kalenderobjekt"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Kalenderfilen kunde inte uppdateras!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Uppdateringen färdig\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Objektet är ogiltigt och kan inte uppdateras\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Ett fel uppstod i CORBA-systemet\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Objektet kunde inte hittas\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Närvarostatus är uppdaterad\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Närvarostatus kunde inte uppdateras!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Borttagning färdig"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Objektet skickat!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Objektet kunde inte skickas!\n"
 
@@ -6530,28 +6558,6 @@ msgstr "Delegerat"
 msgid "In Process"
 msgstr "Pågår"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 %Y-%m-%d"
-
-#. 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 "%Y-%m-%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Inte inne"
@@ -6612,7 +6618,34 @@ msgstr "Sammanträdets _starttid:"
 msgid "Meeting _end time:"
 msgstr "Sammanträdets slu_ttid:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 %d %B %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.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 %Y-%m-%d"
+
+#. 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 "%Y-%m-%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+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
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6621,21 +6654,19 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6644,53 +6675,109 @@ msgstr ""
 "Fel vid %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Läser in bilder"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Färdigställer uppgifter..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Tar bort markerade objekt..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Utplånar"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Uppgifter"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Inga möten"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Öppnar uppgifter i %s"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Öppna i %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Skriv ut"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Kalender och uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Konfigurera din tidszon, kalender och uppgiftslista här "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+msgid "Evolution Calendar and Tasks"
+msgstr "Evolutionkalender och -uppgifter"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolutionkalenderns konfigurationskontroll"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolutionkalenderns schemaläggningsmeddelandevisare"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolutions kalender-/uppgiftsredigerare"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolutions kalender- och uppgiftskomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolutions e-postkomponent"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Kalender"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Uppgifter"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "april"
@@ -6828,6 +6915,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Åtkomst nekas för öppnande av kalendern"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Kan inte öppna adressboken"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1:a"
@@ -7047,7 +7151,7 @@ msgid "Contacts: "
 msgstr "Kontakter: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Förhandsgranska"
 
@@ -7059,68 +7163,78 @@ msgstr "Skriv ut objekt"
 msgid "Print Setup"
 msgstr "Skrivarinställningar"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d markerade"
+msgstr[1] "%d markerade"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Läser in bilder"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Ny uppgift"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Uppgift"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Diskussionsgruppskällor"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Uppgiftslista"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Skapa en ny uppgift"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI:t som uppgiftsmappen ska visa"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Kunde inte läsa in uppgifterna i \"%s\""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7133,11 +7247,11 @@ msgstr ""
 "\n"
 "Vill du verkligen ta bort dessa uppgifter?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Fråga mig inte igen."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Skriv ut uppgifter"
 
@@ -8786,7 +8900,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Förbereder mappen \"%s\" för frånkopplat"
@@ -8879,33 +8993,6 @@ msgstr "Ogiltiga argument till (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Fel vid körning av filtersökning: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Kan inte tolka sökuttrycket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Fel vid körning av sökuttrycket: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Utför fråga på okänt huvud: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8938,7 +9025,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Hämtar %d meddelande(n)"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Kan inte tolka sökuttrycket: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Fel vid körning av sökuttrycket: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(matcha-alla) kräver ett ensamt booleskt resultat"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Utför fråga på okänt huvud: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8949,15 +9081,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Misslyckades med att tolka gpg-tips för användarid."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Misslyckades med att tolka gpg-lösenfrasbegäran."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8966,28 +9098,28 @@ msgstr ""
 "Du behöver en lösenfras för att låsa upp nyckeln för\n"
 "användaren: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Avbruten."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 "Misslyckades med att låsa upp hemlig nyckel: 3 felaktiga lösenfraser angivna."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Oväntat svar från GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Misslyckades med att kryptera: inga giltiga mottagare angivna."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8998,87 +9130,67 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Misslyckades med att GPG:a %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Kunde inte skriva data: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Misslyckades med att köra gpg: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Misslyckades med att köra gpg."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Kan inte verifiera meddelandesignatur: kunde inte skapa temporär fil: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Kan inte verifiera meddelandesignatur: kunde inte skapa temporär fil: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Detta är en digitalt signerad meddelandedel"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Indexera innehåll i meddelandetext"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Kunde inte hämta meddelande från redigeraren"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Kunde inte skapa låsande hjälpprogramsrör: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Kan inte grena låsande hjälpprogram: %s"
-
-#: 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 "Kunde inte låsa \"%s\": protokollfel med låshjälpprogram"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Kunde inte låsa \"%s\""
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9099,6 +9211,26 @@ msgstr "Misslyckades med att få lås med fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Misslyckades med att få lås med flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Kunde inte skapa låsande hjälpprogramsrör: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Kan inte grena låsande hjälpprogram: %s"
+
+#: 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 "Kunde inte låsa \"%s\": protokollfel med låshjälpprogram"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Kunde inte låsa \"%s\""
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9355,7 +9487,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Felaktigt autentiseringssvar från servern."
 
@@ -9559,8 +9691,9 @@ msgid "Cannot add MS SMIMEEncKeyPrefs attribute"
 msgstr ""
 
 #: camel/camel-smime-context.c:354
-msgid "Cannot add add encryption certificate"
-msgstr ""
+#, fuzzy
+msgid "Cannot add encryption certificate"
+msgstr "Misslyckades med att hitta certifikat för \"%s\"."
 
 #: camel/camel-smime-context.c:360
 msgid "Cannot add CMS SignerInfo"
@@ -9576,7 +9709,7 @@ msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 msgid "Failed to add data to CMS encoder"
 msgstr "Misslyckades med att lägga till i lokala \"Skickat\"-mappen: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Misslyckades med att hämta METAR-data.\n"
@@ -9647,100 +9780,100 @@ msgstr "Kan inte få mapp: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Kan inte hämta meddelande %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Certifikatsignaturfel"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Dölj signaturtips"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr ""
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP-kommandot misslyckades: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Misslyckades med att hitta certifikat för \"%s\"."
 
 # Klurig!
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Misslyckades med att hitta en gemensam algoritm."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Kunde inte skapa ett S/MIME-avkodningssammanhang."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Misslyckades med att skicka användarnamnet till servern"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Kommandot inte implementerat"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9757,16 +9890,26 @@ msgstr "Kunde inte byta namn på mappen \"%s\": %s existerar"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Kan inte skapa mapp: Ogiltig åtgärd på detta lager"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Papperskorg"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9890,7 +10033,7 @@ msgstr "Nyckelanvändning stöder inte certifikatsignering"
 msgid "Error in application verification"
 msgstr "Fel i programverifiering"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9903,11 +10046,11 @@ msgstr ""
 "Fingeravtryck:     %s\n"
 "Signatur:          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "BRA"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "DÅLIG"
 
@@ -9931,7 +10074,7 @@ msgstr ""
 "Vill du acceptera ändå?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9946,7 +10089,7 @@ msgstr ""
 "\n"
 "Vill du acceptera?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9955,7 +10098,7 @@ msgstr ""
 "Certifikatproblem: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9964,7 +10107,7 @@ msgstr ""
 "Felaktig certifikatdomän: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9973,7 +10116,7 @@ msgstr ""
 "Certifikatet har gått ut: %s\n"
 "Utfärdare: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9987,17 +10130,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Kunde inte tolka URL:en \"%s\""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Fel vid lagring av \"%s\": %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Det finns inget sådant meddelande %s i %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 
@@ -10006,11 +10149,6 @@ msgstr "Kan inte kopiera eller flytta meddelanden till en virtuell mapp"
 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:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10027,10 +10165,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Kontroll av ny e-post"
 
 #: 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 "Kontrollera nya meddelanden i alla mappar"
@@ -10065,6 +10205,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10085,26 +10226,329 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kraftigt fuktdis"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Oväntat svar från IMAP-servern: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Kan inte få mapp: %s: %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 "Servern kopplade ifrån oväntat: %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 "Kan inte få mapp: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Kan inte få mapp: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Kan inte få mapp: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Kan inte hämta meddelande: %s från mappen %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 ""
+"Kan inte hämta meddelande: %s från mappen %s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Kan inte lägga till meddelande i mh-mapp: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Kan inte lägga till meddelande i mh-mapp: %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 ""
+"Kan inte hämta meddelande: %s från mappen %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 ""
+"Kan inte hämta meddelande: %s från mappen %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 ""
+"Kan inte hämta meddelande: %s från mappen %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 ""
+"Kan inte hämta meddelande: %s från mappen %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 "Mappar"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Visa endast prenumererade mappar"
+
+#: camel/providers/imap4/camel-imap4-provider.c:44
+#: camel/providers/imap/camel-imap-provider.c:59
+msgid "Override server-supplied folder namespace"
+msgstr "Åsidosätt mappnamnrymden som servern tillhandahåller"
+
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "Namnrymd"
+
+#: 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 "För läsande och lagrande av e-post på IMAP-servrar."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+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
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "IMAP-tjänst för %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: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/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 "Kunde inte ansluta till %s (port %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Anslutning avbruten"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Okänt fel"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Kan inte ansluta till POP-servern %s: Inget stöd för begärd "
+"autentiseringsmekanism."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sAnge SMTP-lösenordet för %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Misslyckades med autentisering för POP-servern %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Mappnamnet \"%s\" är ogiltigt eftersom det innehåller tecknet \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "Kommando"
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Kan inte ta bort mapp: %s: Ogiltig åtgärd"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Kan inte byta namn på mapp: %s: Ogiltig åtgärd"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Säg upp prenumeration på mappen \"%s\""
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Oväntat svar från IMAP-servern: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Inga uppgifter"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Åtgärden avbruten"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Servern kopplade ifrån oväntat: %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:1089
-msgid "Unknown error"
-msgstr "Okänt fel"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10149,21 +10593,21 @@ msgstr "Kunde inte skapa katalogen %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Kunde inte läsa in sammanfattning för %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Mappen förstördes och återskapades på servern."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Letar efter ändrade meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Kan inte hämta meddelande: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10179,25 +10623,25 @@ msgstr ""
 "Kan inte hämta meddelande: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Det finns inget sådant meddelande"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Detta meddelande är inte tillgängligt för tillfället"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Hämtar meddelandeinformation för nya meddelanden"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Kunde inte hitta meddelandetext i FETCH-svaret."
 
@@ -10239,23 +10683,6 @@ msgstr "Misslyckades med att ansluta till LDAP-server"
 msgid "Command:"
 msgstr "Kommando"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Mappar"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Visa endast prenumererade mappar"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Åsidosätt mappnamnrymden som servern tillhandahåller"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Namnrymd"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Tillämpa filtren på nya meddelanden i INBOX på denna server"
@@ -10278,86 +10705,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP-server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP-tjänst för %s på %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Kunde inte ansluta till %s (port %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS är inte tillgänglig"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Anslutning avbruten"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL-förhandlingar misslyckades"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Du angav inte något lösenord."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10368,25 +10752,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Det finns ingen mapp %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Mappnamnet \"%s\" är ogiltigt eftersom det innehåller tecknet \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10394,7 +10771,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Okänd föräldermapp: %s"
@@ -10500,58 +10877,58 @@ msgstr ""
 "Kan också användas för läsande av ett träd i mappar av Elm-, Pine- eller "
 "Mutt-typ."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Lagringsroten %s är inte en absolut sökväg"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Lagringsroten %s är ingen vanlig katalog"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Kan inte få mapp: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Lokala lager har ingen inkorg"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Lokal brevlådefil %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Kunde inte byta namn på mappen %s till %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Kunde inte byta namn på \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Kunde inte ta bort mappsammanfattningsfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Kunde inte ta bort mappindexfilen \"%s\": %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10619,7 +10996,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10955,7 +11332,7 @@ 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:258
+#: 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
@@ -10964,8 +11341,8 @@ msgid "User cancelled"
 msgstr "Användaren avbröt"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10974,48 +11351,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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 "Internt fel: uid är i ogiltigt format: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Fel vid automatiskt sparande av meddelande: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Du kan inte kopiera meddelanden från denna papperskorgsmapp."
@@ -11137,7 +11514,7 @@ msgstr "Kunde inte hämta grupp: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Kunde inte hämta meddelande: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11190,8 +11567,8 @@ msgstr "Inget meddelande med uid %s"
 msgid "Retrieving POP message %d"
 msgstr "Hämtar POP-meddelande %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
@@ -11647,7 +12024,7 @@ msgstr "%.0f M"
 msgid "%.0fG"
 msgstr "%.0f G"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "bilaga"
 
@@ -11691,6 +12068,102 @@ msgstr "MIME-typ:"
 msgid "Suggest automatic display of attachment"
 msgstr "Föreslå automatisk visning av bilaga"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "S_ignera alltid utgående meddelanden när detta konto används"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr ""
+"Kunde inte öppna filen %s:\n"
+"%s"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Kunde inte hämta meddelande från redigeraren"
+
+#: composer/e-msg-composer.c:1561
+msgid "Untitled Message"
+msgstr "Namnlöst meddelande"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Öppna fil"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Automatiskt genererad"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Signatur:"
+
+#: 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.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 "Skriv ett meddelande"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Kan inte skapa redigerarfönstret:\n"
+"Kan inte aktivera adressväljarkontrollen."
+
+#: 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 ""
+"Kunde inte skapa redigerarfönstret:\n"
+"Kan inte aktivera HTML-redigerarkomponenten.\n"
+"Försäkra dig om att du har rätt versioner av\n"
+"gtkhtml och libgtkhtml installerade.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Kunde inte skapa redigerarfönstret:\n"
+"Kan inte aktivera HTML-redigerarkomponenten."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Redigeraren innehåller ett meddelande som inte är text och som inte kan "
+"redigeras.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Postdestination"
@@ -11773,213 +12246,136 @@ msgstr "<klicka här för att välja en mapp>"
 msgid "Attach file(s)"
 msgstr "Bifoga fil(er)"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "S_ignera alltid utgående meddelanden när detta konto används"
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Kan inte kryptera detta meddelande: ingen klartext att kryptera"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr ""
-"Kunde inte öppna filen %s:\n"
-"%s"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Kunde inte hämta meddelande från redigeraren"
-
-#: composer/e-msg-composer.c:1551
-msgid "Untitled Message"
-msgstr "Namnlöst meddelande"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Öppna fil"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Automatiskt genererad"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Signatur:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Skriv ett meddelande"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Bifoga en fil till meddelandet"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Kan inte skapa redigerarfönstret:\n"
-"Kan inte aktivera adressväljarkontrollen."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Kunde inte skapa redigerarfönstret:\n"
-"Kan inte aktivera HTML-redigerarkomponenten.\n"
-"Försäkra dig om att du har rätt versioner av\n"
-"gtkhtml och libgtkhtml installerade.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Kunde inte skapa redigerarfönstret:\n"
-"Kan inte aktivera HTML-redigerarkomponenten."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Redigeraren innehåller ett meddelande som inte är text och som inte kan "
-"redigeras.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
+"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/mail-composer-errors.xml.in.h:2
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid "All accounts have been removed."
-msgstr "Varje konto måste ha ett unikt namn."
+msgid "Unfinished messages found"
+msgstr "Tråda meddelandelista"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+msgid "Do you want to recover unfinished messages?"
+msgstr "Vill du spara ändringar?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Kunde inte skapa sammanfattning"
+msgid "Don't Recover"
+msgstr "Ta inte bort"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Kunde inte spara signaturfilen: %s"
+msgid "Recover"
+msgstr "Ta bort"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Kunde inte spara signaturfilen: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Förkasta ändringar"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Vill du spara ändringar?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Fel vid sparande av genvägar."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Ta inte bort"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Varning: Ändrat meddelande"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Fel vid sparande av genvägar."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Är du säker på att du vill ta bort detta namnlösa möte?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Ta bort"
+msgid "Discard Changes"
+msgstr "_Förkasta ändringar"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Spara meddelande som..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Kunde inte skapa sammanfattning"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Tråda meddelandelista"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Kunde inte spara signaturfilen: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Varning: Ändrat meddelande"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
 #, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Bifoga en fil till meddelandet"
+msgid "All accounts have been removed."
+msgstr "Varje konto måste ha ett unikt namn."
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "Du måste konfigurera ett konto innan du kan skriva brev."
 
@@ -12115,7 +12511,8 @@ msgstr ""
 "Det finns redan en fil med det namnet.\n"
 "Ska den skrivas över?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Skriv över fil?"
 
@@ -12292,81 +12689,97 @@ msgstr "Välj en tid att jämföra med"
 msgid "_Filter Rules"
 msgstr "Filterregler"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Fel i reguljära uttrycket \"%s\":\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Sammanträdesuppdatering"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Du måste välja ett datum."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Distinguished _name:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Du måste ange ett filnamn."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Sammanfattar mapp"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Tilldelning"
+msgid "Missing folder."
+msgstr "Sammanfattar mapp"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Du måste ange en mapp."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Ingen server har valts"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Fel i reguljära uttrycket \"%s\":\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Du måste välja ett datum."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Tilldelning"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Du måste ge detta filter ett namn."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Du måste ge denna virtuella mapp ett namn."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Du måste ange ett filnamn."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Du måste ange en mapp."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Ingen server har valts"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12379,66 +12792,11 @@ msgstr "Välj en fil"
 msgid "<b>Then</b>"
 msgstr "<b>Ska utföras:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Välj mapp"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "viktigt"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Att-göra"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Senare"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Regelnamn: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Namnlös"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Ska utföras:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Utför åtgärder"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "om alla villkor uppfylls"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "om några villkor uppfylls"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "inkommande"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "utgående"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12531,6 +12889,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Senare"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Regelnamn: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Ska utföras:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "om alla villkor uppfylls"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "om några villkor uppfylls"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Utför åtgärder"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Delegerat"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Ersätt"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "besvarad"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Inkludera:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "inkommande"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "utgående"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12661,7 +13090,7 @@ msgstr "är inte flaggad"
 msgid "Junk Test"
 msgstr "juni"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etikett"
@@ -12702,7 +13131,7 @@ msgid "Play Sound"
 msgstr "Spela ljud"
 
 # [Status] [är] [Läst]
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Läst"
 
@@ -12772,9 +13201,9 @@ msgstr "börjar med"
 msgid "Stop Processing"
 msgstr "Stoppa behandling"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12837,105 +13266,62 @@ msgstr "Ämnet innehåller inte"
 msgid "Virtual _Folders"
 msgstr "Virtuella mappar"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Lägg till"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Källa för virtuell mapp"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Redigerarinställningar"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Konfigurera e-postinställningar, inklusive säkerhet och meddelandevisning, "
-"här"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr ""
-"Konfigurera stavningskontroll, signaturer, och meddelanderedigeraren här"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Konfigurera dina e-postkonton här"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolutions e-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolutions e-posts konfigurationskontroll för konton"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolutions e-postkomponent"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolutions e-postredigerare"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolutions e-postredigerarkonfigurationskontroll"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolutions e-postmappvisare"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolutions e-postinställningskontroll"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "E-post"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-postkonton"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-postinställningar"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Standard]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Kontonamn"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Namnlös"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Språk"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Välj ett signaturskript"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Signatur(er)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Vidarebefordrat meddelande"
+
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Skapa _virtuell mapp från sökning..."
 
@@ -12973,274 +13359,455 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Ange var mappen ska skapas:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Skapa regel"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Mapp_namn:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Virtuella mappar"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Inkorg"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Läser in..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Flytta"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Avboka uppgift"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Välj mapp"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopiera"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Skapa en ny mapp"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Byt namn på mappen \"%s\" till:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "Byt namn på mapp"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Visa"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Öppna i nytt fönster"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Flytta"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Ny mapp..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Byt namn"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "Virtuella mappar"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Inkorg"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Redigera som nytt meddelande..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Skriv _ut"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Sva_ra till avsändaren"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Svara till _lista"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Svara till _alla"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Vidare_befordra"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "Föl_j upp..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "Fla_gga färdig"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "T_öm flagga"
 
-#: mail/em-folder-view.c:787 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 "_Markera som läst"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Markera som ovi_ktigt"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Markera som _oläst"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Markera som _viktigt"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Ångra borttagning"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Fl_ytta till mapp..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "_Kopiera till mapp..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Lägg till avsändaren i adress_boken"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Till_ämpa filter"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filterregler"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Ska_pa regel från meddelande"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Virtuell mapp på _ämne"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Virtuell mapp på _avsändare"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Virtuell mapp på _mottagare"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Virtuell mapp på sänd_lista"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "Virtuell mapp på avsändare"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Filtrera på _ämne"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Filtrera på _avsändare"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Filtrera på _mottagare"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Filtrera på sä_ndlista"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Filtrera på _avsändare"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Standard"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Skriv ut meddelande"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Kopiera länkplats"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Klicka för att lägga till en uppgift"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Från"
+
+#: 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 "Svara till"
+
+#: 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 "Till"
+
+#: 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 "Kopia"
+
+#: 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 "Blindkopia"
+
+#: 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
+#, fuzzy
+msgid "Newsgroups"
+msgstr "Diskussionsgruppskällor"
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s-bilaga"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Schemat stöds inte"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Fel vid sökning"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Kan inte verifiera lövsignatur"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Klicka för att lägga till en uppgift"
+msgid "Retrieving `%s'"
+msgstr "Hämtar meddelande %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Tilldelad"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Spara signatur"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Spara signatur"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "kryptera"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "kryptera"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Felaktig del med extern meddelandetext."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Pekare till FTP-plats (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Pekare till lokal fil (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Pekare till fjärrdata (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Pekare till okänd extern data (typen \"%s\")"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Flyttar meddelanden"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "E-postprogram"
+
+#. 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 ""
+
+#. 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
@@ -13248,45 +13815,30 @@ msgstr "Klicka för att lägga till en uppgift"
 msgid "Matches: %d"
 msgstr "Träffar:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Tilldelad"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Detta meddelande är digitalt signerat och har befunnits äkta."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Spara signatur"
-
-#: mail/em-format-html-display.c:647
+#: 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 ""
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Spara signatur"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13295,237 +13847,95 @@ msgstr ""
 "input_token innehåller en ogiltig signatur, eller en signatur som inte kunde "
 "verifieras."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "kryptera"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "kryptera"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_Certifikat-ID:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Certifikatet är inte giltigt ännu"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Skulle ha utförts:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "den %d %B %Y %k.%M"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Visa inuti"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Dölj"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sida %d av %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Hämtar meddelande %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Felaktig del med extern meddelandetext."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Pekare till FTP-plats (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Pekare till lokal fil (%s) giltig på platsen \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Pekare till lokal fil (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Pekare till fjärrdata (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Pekare till okänd extern data (typen \"%s\")"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Flyttar meddelanden"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Från"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Svara till"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Till"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Kopia"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Blindkopia"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "E-postprogram"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Datum"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-#, fuzzy
-msgid "Newsgroups"
-msgstr "Diskussionsgruppskällor"
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s-bilaga"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Kunde inte tolka MIME-meddelande. Visar som källkod."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Schemat stöds inte"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Fel vid sökning"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Kan inte verifiera lövsignatur"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Varje vecka"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_En dag"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "En _vecka"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "En _månad"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13533,25 +13943,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Misslyckades med att skapa rör till \"%s\": %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr ""
+"Kunde inte skapa mappen \"%s\":\n"
+"%s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Kan inte kopiera filhandtag: %s\n"
+"%s"
+
+#: mail/em-migrate.c:1715
+#, 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
+#, 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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Misslyckades med att skapa rör till \"%s\": %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Misslyckades med att slå upp värden \"%s\": %s"
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Kan inte spara utdatafilen: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13562,99 +14004,83 @@ msgstr "Spara som..."
 msgid "untitled_image.%s"
 msgstr "Namnlöst meddelande"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 #, fuzzy
 msgid "Set as _Background"
 msgstr "Bakgrund:"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Svara till avsändaren"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Öppna länk i webbläsare"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Skicka _meddelande till lista..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Lägg till adressbok"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Öppna i %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr ""
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Prenumerera"
 
-#: mail/em-subscribe-editor.c:637 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 "Mapp"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Välj en server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Ingen server har valts"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Visa inte detta meddelande igen."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filter"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Vidarebefordrat meddelande"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a %Y-%m-%d klockan %H.%M skrev %%s:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Meddelande"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Spara meddelande som..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Adress"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Öppnar meddelanden från \"%s\""
@@ -13674,11 +14100,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13791,168 +14217,169 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Lista med signaturer"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Lista med signaturer"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "_Logga filteråtgärder i:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Standardprioritet:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Notifiering om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Notifiering om ny post"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: mail/evolution-mail.schemas.in.in.h:56
 #, fuzzy
 msgid ""
 "Prompt the user when he or she tries to send a message without a Subject."
 msgstr "Fråga då meddelanden skickas med ett _tomt ämne"
 
-#: mail/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "_Fråga då HTML-meddelanden skickas till kontakter som inte vill ha dem"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Fr_åga då meddelanden skickas med endast blindkopiemottagare angivna"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14008,8 +14435,9 @@ msgid "Spell check inline"
 msgstr "Stavnings_kontroll"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Standardprioritet:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14153,33 +14581,65 @@ msgstr ""
 msgid "spamd port"
 msgstr "Importera"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolutions Elm-importör"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolutions Netscape Mail-importör"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Redigerarinställningar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolutions Outlook Express 4-importör"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr ""
+"Konfigurera e-postinställningar, inklusive säkerhet och meddelandevisning, "
+"här"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolutions Pine-importör"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr ""
+"Konfigurera stavningskontroll, signaturer, och meddelanderedigeraren här"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolutions mbox-importör"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Konfigurera dina e-postkonton här"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolutions e-post"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolutions e-posts konfigurationskontroll för konton"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolutions e-postkomponent"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolutions e-postredigerare"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolutions e-postredigerarkonfigurationskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolutions e-postinställningskontroll"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-postkonton"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "E-postinställningar"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_E-post"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14187,15 +14647,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Var vänlig vänta"
 
@@ -14227,19 +14687,47 @@ msgid "Select folder to import into"
 msgstr "Välj mapp"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Importerar"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Viktig post"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolutions Elm-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolutions Netscape Mail-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolutions Outlook Express 4-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolutions Pine-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolutions mbox-importör"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Genomsöker %s"
@@ -14249,7 +14737,7 @@ msgstr "Genomsöker %s"
 msgid "Priority Filter \"%s\""
 msgstr "Prioritetsfilter \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14275,7 +14763,7 @@ msgstr ""
 "Kontrollera de importerade filtren för att försäkra dig om\n"
 "att allting fortfarande fungerar som det är tänkt."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14287,7 +14775,7 @@ msgstr ""
 "tråd\", som inte stöds i Evolution.\n"
 "Dessa filter kommer att kastas."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14301,24 +14789,24 @@ msgstr ""
 "ändrades till att testa huruvida den strängen finns\n"
 "eller inte finns i meddelandetexten."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution importerar din gamla Netscape-data"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Importerar data"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Inställningar"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-postfilter"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14352,128 +14840,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolutions kontoredigerare"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Användar_namn:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Sökväg:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "E-post till %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Ämnet är %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "E-post från %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "Sändlistan %s"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "besvarad"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Lägg till filterregel"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d markerade"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d oskickade"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Utkast"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d skickade"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d oskickade"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d totalt"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr " (XXX olästa)"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d markerade"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Nytt e-postmeddelande"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_E-postmeddelande"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Skriv ett nytt e-postmeddelande"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Ny virtuell mapp"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-postfilter"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Skapa en ny mapp"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI:n som kalendern kommer att visa"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Kontrollerar tjänst"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Ansluter till server..."
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Identitet"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14483,12 +14982,12 @@ msgstr ""
 "behöver du inte fylla i, såvida du inte vill inkludera denna information i "
 "den e-post du skickar."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Mottagande av post"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14496,15 +14995,15 @@ msgstr ""
 "Ange information om din server för inkommande e-post nedan. Om du inte är "
 "säker bör du fråga din systemadministratör eller Internetleverantör."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Välj mellan följande alternativ"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Skickande av post"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14512,11 +15011,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Kontohantering"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14529,14 +15028,6 @@ 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.c:888
-msgid "Checking Service"
-msgstr "Kontrollerar tjänst"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Ansluter till server..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14853,7 +15344,8 @@ msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Fast _breddsteg:"
 
 #: mail/mail-config.glade.h:82
@@ -15180,353 +15672,457 @@ msgstr "färg"
 msgid "description"
 msgstr "beskrivning"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "En mapp med namnet \"%s\" finns redan. Använd ett annat namn."
+msgid "Invalid authentication"
+msgstr "Autentisering"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s."
 
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Är du säker på att du vill ta bort detta konto?"
+#. 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-errors.xml.in.h:4
-#, fuzzy
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Check to make sure your password is spelled correctly.  Remember that many "
+"passwords are case sensitive; your caps lock might be on."
 msgstr ""
-"Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
-#: mail/mail-errors.xml.in.h:5
+#. 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 "Är du säker på att du vill skicka om alla %d meddelanden?"
+
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Ta bort alla borttagna meddelanden från alla mappar permanent"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Du skickar ett HTML-formaterat brev. Försäkra dig om att följande\n"
+"mottagare vill ha, och kan ta emot, HTML-formaterad e-post:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
+msgid "_Send"
+msgstr "Skicka"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Är du säker på att du vill skicka om alla %d meddelanden?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Kan inte kopiera mapp: %s"
+msgid "Use default drafts folder?"
+msgstr "Öppnar standarduppgiftsmappen"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Kan inte få mapp: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Kan inte öppna utkastmappen för detta konto.\n"
+"Vill du använda standardmappen för utkast?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Kunde inte skapa temporär katalog: %s"
+msgid "Use _Default"
+msgstr "Standard"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Kan inte skapa katalogen\n"
-"%s\n"
-"Fel: %s"
+"Är du säker på att du vill öppna alla %d meddelanden i separata fönster?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Kan inte ta bort mapp:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
+msgid "_Expunge"
+msgstr "T_öm"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Mappen \"%s\" finns inte."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Ta bort alla borttagna meddelanden från alla mappar permanent"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Kan inte flytta mapp: %s"
+msgid "_Empty Trash"
+msgstr "Töm _papperskorgen"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Kunde inte uppdatera objekt"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Du har oskickade meddelanden, vill du ändå avsluta?"
+
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Kunde inte uppdatera objekt"
+msgid "Error while {0}."
+msgstr ""
+"Fel vid \"%s\":\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Kan inte öppna meddelande"
+msgid "Error while performing operation."
+msgstr ""
+"Fel vid utförande av åtgärd:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
+
+#. 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-errors.xml.in.h:25
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
+msgid "Enter password."
+msgstr "Ange lösenord"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Fel vid läsning av filterinformation:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Kunde inte skapa katalogen %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Kan inte spara till \"%s\":\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Välj ett signaturskript"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Kan inte skapa katalogen\n"
+"%s\n"
+"Fel: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Kunde inte spara signaturfilen: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Ta bort \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Verkligen ta bort kontot?"
+msgid "Cannot create temporary save directory."
+msgstr "Kunde inte skapa temporär katalog: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Förkasta ändringar"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Vill du spara ändringar?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Ta inte bort"
+msgid "File exists but cannot overwrite it."
+msgstr "Filen finns, skriv över?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Ange lösenord"
+msgid "File exists but is not a regular file."
+msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Fel vid läsning av filterinformation:\n"
+"Kan inte ta bort mapp:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Fel vid utförande av åtgärd:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Kan inte ta bort mapp: %s: Det finns ingen sådan mapp"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Fel vid \"%s\":\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Filen finns, skriv över?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Kan inte byta namn på mapp: %s: Det finns ingen sådan mapp"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Filen \"%s\" finns inte eller är ingen vanlig fil."
+msgid "Delete \"{0}\"?"
+msgstr "Ta bort \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Verkligen ta bort mappen \"%s\"?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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 "En mapp med namnet \"%s\" finns redan. Använd ett annat namn."
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Autentisering"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Kan inte flytta mapp: %s"
 
-#: mail/mail-errors.xml.in.h:48
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "Mail filters automatically updated."
-msgstr "Uppdatera automatiskt"
+msgid "Cannot open source \"{2}\"."
+msgstr "Kunde inte uppdatera objekt"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "Kan inte öppna meddelande"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Kan inte kopiera mapp: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Du skickar ett HTML-formaterat brev. Försäkra dig om att följande\n"
-"mottagare vill ha, och kan ta emot, HTML-formaterad e-post:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Kan inte få mapp: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Verkligen ta bort mappen \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Kunde inte uppdatera objekt"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Du har inte fyllt i all nödvändig information."
+
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "Du kan inte skapa två konton med samma namn."
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
 #, fuzzy
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+msgid "Delete account?"
+msgstr "Verkligen ta bort kontot?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Är du säker på att du vill ta bort detta konto?"
+
+#. mail:ask-delete-account secondary
+#: mail/mail-errors.xml.h:168
+msgid "If you proceed, the account information will be deleted permanently."
 msgstr ""
-"Följande virtuella mappar:\n"
-"%sAnvände den borttagna mappen:\n"
-"    \"%s\"\n"
-"och har uppdaterats."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Ta inte bort"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Följande virtuella mappar:\n"
-"%sAnvände den borttagna mappen:\n"
-"    \"%s\"\n"
-"och har uppdaterats."
+msgid "Could not save signature file."
+msgstr "Kunde inte spara signaturfilen: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Välj ett signaturskript"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "_Förkasta ändringar"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP-servern %s stöder inte den begärda autentiseringstypen %s."
+msgid "Do you wish to save your changes?"
+msgstr "Vill du spara ändringar?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15534,86 +16130,99 @@ msgstr ""
 "\n"
 "Vill du spara dina ändringar?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Kan inte öppna utkastmappen för detta konto.\n"
-"Vill du använda standardmappen för utkast?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Standard"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Förkasta ändringar"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Öppnar standarduppgiftsmappen"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Du har inte fyllt i all nödvändig information."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Du har oskickade meddelanden, vill du ändå avsluta?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Du kan inte skapa två konton med samma namn."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Mappen \"%s\" finns inte."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "_Förkasta ändringar"
-
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Töm _papperskorgen"
-
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "T_öm"
+msgid "vFolders automatically updated."
+msgstr "Uppdatera automatiskt"
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Send"
-msgstr "Skicka"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Följande virtuella mappar:\n"
+"%sAnvände den borttagna mappen:\n"
+"    \"%s\"\n"
+"och har uppdaterats."
 
-#: mail/mail-errors.xml.in.h:75
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
 #, fuzzy
-msgid "vFolders automatically updated."
+msgid "Mail filters automatically updated."
 msgstr "Uppdatera automatiskt"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+#, fuzzy
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Följande virtuella mappar:\n"
+"%sAnvände den borttagna mappen:\n"
+"    \"%s\"\n"
+"och har uppdaterats."
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. 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-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Skriv över"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pingar %s"
@@ -15622,20 +16231,20 @@ msgstr "Pingar %s"
 msgid "Working"
 msgstr "Arbetar"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Filtrerar mapp"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Hämtar post"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Misslyckades med att tillämpa utgående filter: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15644,115 +16253,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:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Skickar meddelande %d av %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Misslyckades med att avkoda meddelandet."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Färdig."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Sparar meddelande till mappen"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Flyttar meddelanden till %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Kopierar meddelanden till %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Genomsöker mappar i \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Vidarebefordrade meddelanden"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Öppnar lagret %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Byter namn på mappen %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Lagrar mappen \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Uppdaterar mapp"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Tömmer mapp"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Tömmer papperskorgen i \"%s\""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Lokala mappar"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Hämtar meddelande %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15761,7 +16370,7 @@ msgstr ""
 "Kan inte spara utdatafilen: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15770,11 +16379,11 @@ msgstr ""
 "Fel vid sparande av meddelanden till: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Sparar bilaga"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15783,17 +16392,17 @@ msgstr ""
 "Kan inte skapa utdatafil: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Kunde inte skriva data: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Kopplar från %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Ansluter igen till %s"
@@ -15858,24 +16467,24 @@ msgstr "Uppdaterar..."
 msgid "Waiting..."
 msgstr "Väntar..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Användaren avbröt åtgärden."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Ange lösenord för %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Ange lösenord"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Kom ihåg detta lösenord"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Kom ihåg detta lösenord för resten av denna session"
 
@@ -15915,89 +16524,94 @@ msgstr "Vidarebefordrat meddelande"
 msgid "Invalid folder: `%s'"
 msgstr "Öppnar mappen %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Ställer in virtuell mapp: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Uppdaterar virtuella mappar för uri: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Uppdaterar virtuella mappar för uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Virtuella mappar"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Redigera virtuell mapp"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Ny virtuell mapp"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Oläst"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Läst"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Besvarad"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Flera olästa meddelanden"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Flera meddelanden"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Lägsta"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Lägre"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Högre"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Högsta"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Idag %H.%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Igår %H.%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %H.%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %H.%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Genererar meddelandelista"
 
@@ -16029,43 +16643,43 @@ msgstr "Mottaget"
 msgid "Size"
 msgstr "Storlek"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Ring"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Vidarebefordra inte"
 
-#: mail/message-tag-followup.c:64
+#: mail/message-tag-followup.c:75
 msgid "Follow-Up"
 msgstr "Följ upp"
 
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "För information"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Vidarebefordra"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Inget svar krävs"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Svara"
 
-#: mail/message-tag-followup.c:70 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 "Svara till alla"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Granska"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "Flagga att följa upp"
 
@@ -16110,20 +16724,6 @@ msgstr "_Prenumerera"
 msgid "_Unsubscribe"
 msgstr "_Säg upp prenumeration"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolutionskalet"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolutions testkomponent"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16131,110 +16731,54 @@ msgstr "40%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Byt namn på denna genvägsgrupp"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Växla om mappraden ska visas"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "_Visa genvägsraden"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Standardprioritet:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Evolutions e-postkonfigurationsgränssnitt"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Öppnar standarduppgiftsmappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Öppnar standarduppgiftsmappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Öppnar standarduppgiftsmappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Öppnar standarduppgiftsmappen"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Växla om mappraden ska visas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Växla om genvägsraden ska visas"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-post"
@@ -16243,6 +16787,32 @@ msgstr "E-post"
 msgid "Brought to you by"
 msgstr "Presenteras av"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Okänt fel"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Ogiltiga argument"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Kan inte registrera på OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Konfigurationsdatabasen hittades inte"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Allmänt fel"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Namnlös)"
@@ -16387,11 +16957,11 @@ msgstr "Misslyckades med att köra gpg."
 msgid "_Import"
 msgstr "Importera"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Kopplar från anslutningar..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Inställningar för Evolution"
 
@@ -16433,11 +17003,35 @@ msgstr "Mappnamnet kan inte innehålla tecknet \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" och \"..\" är reserverade mappnamn."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "E-post till %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Fel vid körning av %s."
@@ -16451,14 +17045,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug-buddy kunde inte köras."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Om Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "A_rbeta ansluten"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "A_rbeta frånkopplad"
 
@@ -16466,48 +17061,6 @@ msgstr "A_rbeta frånkopplad"
 msgid "Work Offline"
 msgstr "Arbeta frånkopplad"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution håller på att koppla från."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Ogiltiga argument"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Kan inte registrera på OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Konfigurationsdatabasen hittades inte"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Allmänt fel"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Kryssruta"
@@ -16581,6 +17134,42 @@ msgstr "Aktiva anslutningar"
 msgid "Click OK to close these connections and go offline"
 msgstr "Klicka OK för att stänga dessa anslutningar och arbeta frånkopplad"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "K_alender:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+msgid "_Contacts:"
+msgstr "_Kontakter:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_E-post:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Uppgifter:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Mapp_typ:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Öppna en annan användares mapp"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Mappnamn:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Användare:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolutions konfigurationsassistent"
@@ -16624,6 +17213,20 @@ msgstr ""
 "Klicka på knappen \"Verkställ\" för att spara dina\n"
 "inställningar. "
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolutionskalet"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolutions testkomponent"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Klicka på \"Importera\" för att börja importera filen till Evolution. "
@@ -16688,13 +17291,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution kan importera data från följande filer:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16725,58 +17328,49 @@ msgstr ""
 "Vi hoppas att du gläds åt resultatet av vårt hårda arbete, och vi\n"
 "inväntar med spänning dina bidrag!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Tack\n"
 "Ximian Evolution-teamet\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Tala inte om för mig igen"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Kan inte komma åt Ximian Evolution-skalet."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Starta i frånkopplat läge"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Starta i anslutet läge"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Tvinga fram nedstängning av alla evolution-komponenter"
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Tvinga uppgradering av konfigurationsfiler från Evolution 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Skicka felsökningsinformation från alla komponenter till en fil."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16785,14 +17379,80 @@ msgstr ""
 "%s: --online och --offline kan inte användas tillsammans.\n"
 "  Använd %s --help för mer information.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Skriv ut Mitt Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolutions kontoassistent"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Certifikat-ID:"
@@ -17049,12 +17709,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Certifikat-ID:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Kort-ID finns redan"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%d-%m-%Y"
@@ -17275,6 +17929,12 @@ msgstr "Ämnet är %s"
 msgid "Certificate Signature Value"
 msgstr "Certifikatsignaturfel"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Kort-ID finns redan"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17316,12 +17976,12 @@ msgstr "Standardämne för meddelandet."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Kunde inte köra \"%s\": %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "Stänger ned %s (%s)\n"
@@ -17385,7 +18045,7 @@ msgid "Select all contacts"
 msgstr "Markera alla kontakter"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+msgid "Send a message to the selected contacts."
 msgstr "Skicka ett meddelande till de markerade kontakterna."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17417,8 +18077,8 @@ msgstr "Visa den aktuella kontakten"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Åtgärder"
@@ -17436,7 +18096,8 @@ msgid "_Preview Pane"
 msgstr "F_örhandsgranskningspanel"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_Spara som VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17567,11 +18228,21 @@ msgstr "Visa den aktuella kontakten"
 msgid "Week"
 msgstr "Vecka"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Arbetsvecka"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Möte"
 
+#: 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 "S_täng"
+
 #: 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
@@ -17893,6 +18564,16 @@ msgstr "_Omvänd markering"
 msgid "_Threaded Message List"
 msgstr "_Trådad meddelandelista"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "S_täng"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18139,7 +18820,8 @@ msgid "Open the selected message in a new window"
 msgstr "Öppna det markerade meddelandet i ett nytt fönster"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Öppna det markerade meddelandet i redigeraren för återsändning av det"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18256,58 +18938,46 @@ msgstr "Virtuell mapp på _ämne..."
 msgid "_Attached"
 msgstr "_Bifogad"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Kopiera till mapp"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Skapa filter från meddelande"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Gå till"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inuti"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Större"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "M_eddelandevisning"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Flytta till mapp"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Nästa meddelande"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Normal visning"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Öppna meddelande"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Föregående meddelande"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Citerad"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Skicka _om..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "V_erktyg"
@@ -18316,16 +18986,6 @@ msgstr "V_erktyg"
 msgid "_Undelete"
 msgstr "_Ångra borttagning"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "S_täng"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Bifoga"
@@ -18722,6 +19382,11 @@ msgstr "Snabbsökning"
 msgid "_Send / Receive"
 msgstr "_Skicka / Ta emot"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Sök nu"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Efter företa_g"
@@ -18795,10 +19460,6 @@ msgstr "Förfallodatum:"
 msgid "With _Status"
 msgstr "Ställ in status"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Uppgifter"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18957,6 +19618,34 @@ msgstr "Annan..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution-fel"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolutions e-post"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Sammanträdesinformation"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Skickade meddelanden och utkast"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19074,6 +19763,35 @@ msgstr "Text"
 msgid "Find _Now"
 msgstr "Sök _nu"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 finns redan\n"
+"Vill du skriva över den?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Kan inte spara till \"%s\":\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Kan inte spara till \"%s\":\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19084,14 +19802,142 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% färdigt)"
 
-#~ 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?"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Mappvisare för Evolutions adressbok"
 
-#~ msgid "New Address Book"
-#~ msgstr "Ny adressbok"
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Adress _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bologna"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolutionkalenderns visare"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolutions uppgiftsvisare"
+
+#~ msgid "Snoo_ze"
+#~ msgstr "Slu_mra"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Kunde inte initiera gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Kunde inte öppna mappen i \"%s\""
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI:n som kalendern kommer att visa"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Typen av vy att visa"
+
+#~ msgid "Display a message"
+#~ msgstr "Visa ett meddelande"
+
+#~ msgid "Alerts"
+#~ msgstr "Varningar"
+
+#~ msgid "Time"
+#~ msgstr "Tid"
+
+#~ msgid "_General"
+#~ msgstr "Allm_änt"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Välj importör"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Kalender"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Ny uppgift"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Kalenderfilen kunde inte uppdateras!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI:t som uppgiftsmappen ska visa"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Kunde inte läsa in uppgifterna i \"%s\""
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolutions e-postmappvisare"
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "Virtuell mapp på avsändare"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Filtrera på _avsändare"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Misslyckades med att skapa rör till \"%s\": %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Misslyckades med att skapa rör till \"%s\": %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Misslyckades med att slå upp värden \"%s\": %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI:n som kalendern kommer att visa"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Byt namn på denna genvägsgrupp"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "_Visa genvägsraden"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Öppnar standarduppgiftsmappen"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Öppnar standarduppgiftsmappen"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Öppnar standarduppgiftsmappen"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Öppnar standarduppgiftsmappen"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Växla om mappraden ska visas"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Växla om genvägsraden ska visas"
+
+#, fuzzy
+#~ msgid "Cannot register the Ximian Evolution shell."
+#~ msgstr "Kan inte komma åt Ximian Evolution-skalet."
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Kan inte initiera Ximian Evolution-skalet: %s"
+
+#~ msgid "Send a mess to the selected contacts."
+#~ msgstr "Skicka ett meddelande till de markerade kontakterna."
+
+#~ msgid "_Resend..."
+#~ msgstr "Skicka _om..."
 
 #, fuzzy
 #~ msgid "The URI that the address book will display"
@@ -19266,9 +20112,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Partner:"
 
-#~ msgid "_Add"
-#~ msgstr "_Lägg till"
-
 #~ msgid "_Business:"
 #~ msgstr "_Företag:"
 
@@ -19392,17 +20235,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Due date is before start date!"
 #~ msgstr "Förfallodatumet är före startdatumet!"
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Sta_rtdatum:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Förfallodatum:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "_Prioritet:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19434,13 +20266,6 @@ msgstr "%s (%d%% färdigt)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Kan inte kopiera filhandtag: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19595,10 +20420,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgstr "Förhandsgranskar kalendern som ska skrivas ut"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Ange lösenord för %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Ny uppgift"
 
@@ -19657,33 +20478,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Kan inte skapa den angivna utdelade mappen."
 
-#~ msgid "C_alendar:"
-#~ msgstr "K_alender:"
-
-#~ msgid "_Contacts:"
-#~ msgstr "_Kontakter:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_E-post:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Uppgifter:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Mapp_typ:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Öppna en annan användares mapp"
-
-#~ msgid "_Account:"
-#~ msgstr "_Konto:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Mappnamn:"
-
-#~ msgid "_User:"
-#~ msgstr "_Användare:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Skriv ett nytt e-brev"
@@ -19734,9 +20528,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Add script signature"
 #~ msgstr "Lägg till skriptsignatur"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Följande anslutningar är aktiva för tillfället:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Sök efter kontakter"
 
@@ -21193,9 +21984,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Asia"
 #~ msgstr "Asien"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Assuan"
 
@@ -22246,9 +23034,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -25300,9 +26085,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28120,9 +28902,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Shown"
 #~ msgstr "Visade"
 
-#~ msgid "No tasks"
-#~ msgstr "Inga uppgifter"
-
 #~ msgid "blue"
 #~ msgstr "blå"
 
@@ -29156,9 +29935,6 @@ msgstr "%s (%d%% färdigt)"
 #~ "Kan inte ta bort mappen:\n"
 #~ "%s"
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution-fel"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -29685,9 +30461,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Delete news feed"
 #~ msgstr "Ta bort nyhetskälla"
 
-#~ msgid "_Mail"
-#~ msgstr "_E-post"
-
 #~ msgid "_Weather"
 #~ msgstr "_Väder"
 
@@ -31574,9 +32347,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Kunde inte öppna katalog för diskussionsgruppsserver: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Kan inte öppna eller skapa .newsrc-fil för %s: %s"
-
 #~ msgid "_Assistant's name:"
 #~ msgstr "_Assistentens namn:"
 
@@ -31817,9 +32587,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Reminder of your appointment at "
 #~ msgstr "Påminnelse om ditt möte klockan "
 
-#~ msgid "Snooze"
-#~ msgstr "Slumra"
-
 #~ msgid "Summarizing folder"
 #~ msgstr "Sammanfattar mapp"
 
@@ -31934,9 +32701,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "_Refresh time (seconds):"
 #~ msgstr "_Uppdateringstid (sekunder):"
 
-#~ msgid "IMAPv4"
-#~ msgstr "IMAPv4"
-
 #~ msgid "Standard Unix mailbox file"
 #~ msgstr "Standard Unix-brevlådefil"
 
@@ -32018,9 +32782,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "%A, %d %B %Y"
 #~ msgstr "%A %d %B %Y"
 
-#~ msgid "Print My Evolution"
-#~ msgstr "Skriv ut Mitt Evolution"
-
 #~ msgid "Printing of My Evolution failed"
 #~ msgstr "Utskrift av Mitt Evolution misslyckades"
 
@@ -32658,9 +33419,6 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Redo the undone action"
 #~ msgstr "Gör om den ångrade åtgärden"
 
-#~ msgid "Replace"
-#~ msgstr "Ersätt"
-
 #~ msgid "Replace a string"
 #~ msgstr "Ersätt en sträng"
 
@@ -33152,15 +33910,9 @@ msgstr "%s (%d%% färdigt)"
 #~ msgid "Corrupted message from dispatching thread?"
 #~ msgstr "Trasigt meddelande från döende tråd?"
 
-#~ msgid "Unsubscribe from folder \"%s\""
-#~ msgstr "Säg upp prenumeration på mappen \"%s\""
-
 #~ msgid "Ca_lendar"
 #~ msgstr "Ka_lender"
 
-#~ msgid "Create Rule"
-#~ msgstr "Skapa regel"
-
 #~ msgid "Fi_lter on Sender"
 #~ msgstr "Fi_ltrera på avsändare"
 
@@ -33682,6 +34434,3 @@ msgstr "%s (%d%% färdigt)"
 
 #~ msgid "Configure the todo conduit"
 #~ msgstr "Konfigurerar att göra-listan"
-
-#~ msgid "Send a message to the selected contacts."
-#~ msgstr "Skicka ett meddelande till de markerade kontakterna."
diff --git a/po/tr.po b/po/tr.po
index a5a4c31d21..9bec64d5b2 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -4,7 +4,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: evolution\n"
-"POT-Creation-Date: 2004-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -20,6 +20,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution Adres Defteri"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Bağlantılar: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution e-posta programı."
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -45,16 +55,6 @@ msgstr "kart"
 msgid " card"
 msgstr "1 kart"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Bağlantılar: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution e-posta programı."
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Öntanımlı Eşzamanlama Adresi:"
@@ -69,67 +69,20 @@ msgstr "Adres defteri yüklenemedi"
 msgid "Could not read pilot's Address application block"
 msgstr "Pilot adres uygulama defteri okunamadı"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "Otomatik Tamamlama"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "Sertifikalar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Posta hesaplarını buradan yapılandırın"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Bağlantılar"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution Adres Defteri"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Adres defteri menüsü mimarisi"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution Adres Defteri adres görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution Adres Defteri kart görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution Adres Defteri bileşeni"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution Adres Defteri dizin görüntüleyici"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution e-posta özet bileşeni."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "E-posta özet bileşen mimarisi"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Kimlik denetimi yapılamadı.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s%s için parolayı girin (kullanıcı: %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -170,41 +123,45 @@ msgstr "_Bağlantılar:"
 msgid "Create a new contacts group"
 msgstr "Yeni bir kısayol grubu yarat"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "Geçiş yapılıyor..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 msgid "Migrating `%s':"
 msgstr "'%s' geçiş yapılıyor:"
@@ -212,8 +169,8 @@ msgstr "'%s' geçiş yapılıyor:"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "Bu Bilgisayarda"
 
@@ -221,7 +178,7 @@ msgstr "Bu Bilgisayarda"
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Kişisel"
@@ -270,20 +227,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "LDAP sunucuya anonim bağlantı kuruluyor"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Kimlik denetimi yapılamadı.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Yeni Adres Defteri"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s%s için parolayı girin (kullanıcı: %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -303,6 +282,63 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "Otomatik Tamamlama"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Bağlantılar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "Sertifikalar"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Posta hesaplarını buradan yapılandırın"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution Adres Defteri"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Adres defteri menüsü mimarisi"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution Adres Defteri adres görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution Adres Defteri kart görüntüleyici"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution Adres Defteri bileşeni"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution e-posta özet bileşeni."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "E-posta özet bileşen mimarisi"
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "_Desteklenen Türleri Denetle "
@@ -324,6 +360,7 @@ msgstr "_Desteklenen Türleri Denetle "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -396,7 +433,7 @@ msgstr "_Bağlantılar:"
 msgid "Address Book Properties"
 msgstr "Adres Defteri Kaynakları"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Her zaman"
@@ -411,113 +448,103 @@ msgid "Basic"
 msgstr "Temel"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Renkler"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Bağlantı"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "_DN:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "_DN:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Desteklenen Arama Tabanları"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Genel"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Hiç bir zaman"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Biri"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Bir renk seçin"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Arama"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
 "your LDAP server supports SSL or TLS."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -534,7 +561,7 @@ 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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -547,19 +574,19 @@ msgstr ""
 "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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Desteklenen Arama Tabanları"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -567,7 +594,7 @@ msgid ""
 "directory tree."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -577,34 +604,34 @@ msgid ""
 "your base.\n"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
 "be \n"
 "too large will slow down your address book."
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 ""
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
 "It is for display purposes only. "
 msgstr "Bu, Evolution dizin listesinde görüntülenecek olan isimdir."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -617,128 +644,136 @@ msgstr ""
 "kullanılacağını \n"
 "öğrenmek için sistem yöneticinize danışın."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Zaman biçimi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "_SSL/TLS kullan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "DN kullanarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "E-posta adresi kullanılarak"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Ne zaman mümkünse"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Bağlantılar:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "İ_ndirme sınırı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "E-posta adresi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "_Giriş yöntemi:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "İ_sim:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Port numarası:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Ö_ncelik:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Arama tabanı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "_Sunucu adı:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "S_unucu:"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: 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:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "_Güvenli bağlantı (SSL) kullan:"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "kart"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "bağlantı-sekmesi"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "genel-sekme"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "dakika"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "arama sekmesi"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution Adres Defteri isim seçim arayüzü"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Tümünü Sil"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Sil"
 
+#: 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 "İsim"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Tümünü Sil"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Bağlantı Listesini Görüntüle"
@@ -761,23 +796,15 @@ msgstr "Bağlantılara Ekle"
 msgid "Unnamed Contact"
 msgstr "İsimsiz Bağlantı"
 
-#: 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
-msgid "Name"
-msgstr "İsim"
-
 #: 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
 msgid "Source"
 msgstr "Kaynak"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: 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/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution Adres Defteri isim seçim arayüzü"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -850,143 +877,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "_2. Adres:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "_Adres:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Yıldönümü:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Yardımcı"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "_Doğum günü:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Blog"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "_Takvim:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Ş_ehir:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Şirket"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Bağlantı Düzenleyici"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Ü_lke:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "_Bölüm:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "_Boş/Meşgul URL:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "_Tam İsim..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Ev"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "E-posta Adresi:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Yönetici"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "_Lakap:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Notlar:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Diğer"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "_Posta Kutusu:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1014,9 +1041,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "İş"
@@ -1051,23 +1078,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Gerçekten bu bağlantları\n"
+"silmek istiyor musunuz?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"Gerçekten bu bağlantıyı\n"
+"silmek istiyor musunuz?"
+
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Düzenlenebilir"
 
@@ -2046,97 +2089,115 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "İ_letiyi Gönder"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Servis hazır"
-
-#: 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 "Konum: "
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Kullanıcı adı:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Grup"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr "Kaynak Kitabı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "Bu Yeni Bir Bağlantı"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Düzenlenebilir Alanlar"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Değiştirildi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Bu bağlantı adı aşağıdaki sınıflandırmalara girer:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
+
+#: 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "İ_letiyi Gönder"
+
+#: 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 "Servis hazır"
+
+#: 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 "Konum: "
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Kullanıcı adı:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Bağlantıyı Hızlı Ekle"
@@ -2154,22 +2215,6 @@ msgstr "_Tam İsim:"
 msgid "E-_mail:"
 msgstr "_E-posta:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Gerçekten bu bağlantları\n"
-"silmek istiyor musunuz?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Gerçekten bu bağlantıyı\n"
-"silmek istiyor musunuz?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "_2. Adres:"
@@ -2319,8 +2364,8 @@ msgstr "bağlantı-listesi-düzenleyici"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Kitap"
 
@@ -2381,6 +2426,448 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Gelişmiş Arama"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "Liste Üyeleri"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "E-posta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Kurum"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Grup"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "İş"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Cep Telefonu"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Kişisel"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Not"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "Meslek Tanımı"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "E-posta"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "Web sayfası"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Başarıldı"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Depo çevrimdışı"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+msgid "Permission denied"
+msgstr "İzin yok"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "Bağlantı bulunamadı"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "Protokol desteklenmiyor"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "İptal Edildi"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+msgid "Authentication Failed"
+msgstr "Kimlik Denetimi Başarısız."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Kimlik Denetimi İsteniyor"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "İleti bulunmuyor"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Diğer hata"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+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
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+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
+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:168
+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 ""
+"Bu sorgunun tamamlanmasına kadar geçen süre, bu adres defteri için\n"
+"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
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr ""
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+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
+msgid "Error adding contact"
+msgstr "Bağlantı eklenirken hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Liste düzenlenirken hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "Bağlantı düzenlenirken bir hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+msgid "Error removing contact"
+msgstr "Bağlantıyı silerken bir hata oluştu"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"%d kartın görüntülenmesi için %d yeni pencerenin \n"
+"açılması gerekiyor. Gerçekten tüm bu kartları \n"
+"görmek istiyor musunuz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s dosyası mevcut\n"
+"Üzerine yazmak istiyor musunuz?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "kart.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "liste"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Kartı taşı:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Kartı kopyala:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Kartları taşı:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Kartları kopyala:"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Adres Defterinden Bağlantıları Seç"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Çoklu VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s için VCard"
+
+#.
+#. * 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 "(hiçbiri)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Birincil E-posta Adresi"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "2. E-posta Adresi"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "3. E-posta Adresi"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Bir Eylem Seçin"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Yeni bir bağlantı yarat: \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "\"%s\" bağlantısına adres ekle"
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Adres Defterini Araştırılıyor..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Bağlantı Bilgisini Düzenle"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "E-posta Adresini Birleştir"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "ve diğer 1 kart."
+msgstr[1] "ve diğer 1 kart."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "_Kapsamlı Başlıkları Göster"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Bağlantıyı VCard olarak kaydet"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Adres Defterine kaydet"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 msgid "No contacts"
 msgstr "Bağlantı yok"
@@ -2395,8 +2882,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Arama"
 
@@ -2451,9 +2938,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "VCard olarak kaydet"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2521,7 +3009,7 @@ msgid "Cut"
 msgstr "Kes"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2532,18 +3020,8 @@ msgstr "Kopyala"
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Sil"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Şimdiki Görünüm"
 
@@ -2556,7 +3034,7 @@ msgid ""
 msgstr ""
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Herhangi bir Kategori"
@@ -2597,21 +3075,6 @@ msgstr "Kategoriler"
 msgid "Company Phone"
 msgstr "Şirket Telefonu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "E-posta"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "2. E-posta Adresi"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "3. E-posta Adresi"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Tam İsim"
@@ -2650,29 +3113,14 @@ msgstr "Ürdün"
 msgid "Manager"
 msgstr "Yönetici"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Cep Telefonu"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Lakap"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Not"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Ofis"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Kurum"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Başka Fakslar"
@@ -2725,21 +3173,29 @@ msgstr "Birim"
 msgid "Web Site"
 msgstr "Web Sayfası"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Genişlik"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Yükseklik"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr ""
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Seçili"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr ""
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Alan"
@@ -2756,10 +3212,6 @@ msgstr "Metin Modeli"
 msgid "Max field name length"
 msgstr "Azami alan adı uzunluğu"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Sütun Genişliği"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2788,422 +3240,9 @@ msgstr ""
 msgid "Adapter"
 msgstr ""
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Seçili"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "Liste Üyeleri"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "E-posta"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Grup"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "İş"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Kişisel"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "Meslek Tanımı"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "Web sayfası"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Başarıldı"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Depo çevrimdışı"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Adres defteri bulunamadı"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "İzin yok"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "Bağlantı bulunamadı"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Bu kart numarası var"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Protokol desteklenmiyor"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "İptal Edildi"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "'%s' adı değiştirilemedi: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Kimlik Denetimi Başarısız."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Kimlik Denetimi İsteniyor"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-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:67
-#, fuzzy
-msgid "No such source"
-msgstr "İleti bulunmuyor"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Diğer hata"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-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:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-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:140
-msgid "Unable to open addressbook"
-msgstr "Adres defterini açamadım"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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:167
-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 ""
-"Bu sorgunun tamamlanmasına kadar geçen süre, bu adres defteri için\n"
-"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:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr ""
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Bu arama başarısızlıkla sonuçlandı."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Sil"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Liste eklenirken hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "Bağlantı eklenirken hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Liste düzenlenirken hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "Bağlantı düzenlenirken bir hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Listeyi silerken bir hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "Bağlantıyı silerken bir hata oluştu"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"%d kartın görüntülenmesi için %d yeni pencerenin \n"
-"açılması gerekiyor. Gerçekten tüm bu kartları \n"
-"görmek istiyor musunuz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s dosyası mevcut\n"
-"Üzerine yazmak istiyor musunuz?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Üzerine yaz"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "kart.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "liste"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Kartı taşı:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Kartı kopyala:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Kartları taşı:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Kartları kopyala:"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Adres Defterinden Bağlantıları Seç"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Çoklu VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s için VCard"
-
-#.
-#. * 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 "(hiçbiri)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Birincil E-posta Adresi"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Bir Eylem Seçin"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Yeni bir bağlantı yarat: \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "\"%s\" bağlantısına adres ekle"
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Adres Defterini Araştırılıyor..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Bağlantı Bilgisini Düzenle"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "E-posta Adresini Birleştir"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "ve diğer 1 kart."
-msgstr[1] "ve diğer 1 kart."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "_Kapsamlı Başlıkları Göster"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Bağlantıyı VCard olarak kaydet"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Adres Defterine kaydet"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Sütun Genişliği"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3247,11 +3286,6 @@ msgstr "Evolution VCard alıcısı"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vcf, .gcrd)"
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "Zarfı yazdır"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3263,6 +3297,11 @@ msgstr "Seçili bağlantıları yazdır"
 msgid "Print contact"
 msgstr "Seçili bağlantıları yazdır"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "Zarfı yazdır"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 bn. Tahoma"
@@ -3449,18 +3488,6 @@ msgstr "B_ağlantı Listesi"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "İleti açılamadı"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Kart bulunamadı"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3518,6 +3545,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "İleti açılamadı"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Kart bulunamadı"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Öntanımlı adres defteri yüklenemedi."
@@ -3530,11 +3569,12 @@ msgstr "Girdi Dosyası"
 msgid "No filename provided."
 msgstr "Dosya adı belirtilmedi."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "İsimsiz Liste"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Parolayı Girin"
@@ -3567,120 +3607,55 @@ msgstr "Öntanımlı Öncelik:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Pilot ToDO uygulama bloğu okunamadı"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Takvim ve Görevler"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Takvim"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr ""
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution Takvim ve Görevler"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution Takvim yapılandırma denetimi"
-
-#: 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 "Evolution Takvim görüntüleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution Takvim/Görev düzenleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution Görev izleyici"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution Takvim ve Görev bileşeni"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution Test Bileşeni"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Görevler"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution Takvim alarm bildirim servisi"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Başlangıç:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Bitiş:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution Alarmı"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "%s tarihinde Alarm"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "_Kapat"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "_Dinlenme"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Dinlenme zamanı (dakika)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Toplantıyı düzenle"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "_Dinlenme"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Aç"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Açıklama yok."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3689,12 +3664,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Uyarı"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3702,7 +3677,7 @@ msgid ""
 "a normal reminder dialog box instead."
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3713,19 +3688,19 @@ msgid ""
 "Are you sure you want to run this program?"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Tekrar sorma."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution Takvim alarm bildirim servisi"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Bonobo'yu başlatamadım"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Gnome-vfs başlatılamıyor"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Alarm bilgilendirme servis mimarisi oluşturamadım"
 
@@ -3838,61 +3813,46 @@ 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 "Öğ_eleri silmeden önce sor"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Öğ_eleri silmeden önce sor"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Biten görevleri sil"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Gün gezgininde tarih numaralarını göster"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Özet içeriği"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Tanım içeriği"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Açıklama içeriği"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Tanım içeriği"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Eşleme yok"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Takvim"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3904,123 +3864,134 @@ msgstr ""
 "\n"
 "Gerçekten bu görevleri silmek istiyor musunuz?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "küçük"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "gün"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%d %B %A %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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%d %b %a"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 "%d %b %a %Y"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Yeni Kaledonya"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Özellikler..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Takvim yükleniyor..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Takvim"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Yeni randevu"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Randevu"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Yeni bir randevu oluştur"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Yeni toplantı"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "_Toplantı"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "Yeni bir toplantı isteği oluştur"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Yeni Tüm Gün Randevusu"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Tüm Gün Randevusu"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "Yeni bir tüm gün randevusu oluştur"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Yeni Kaledonya"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Takvim:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Yeni bir dizin yarat"
@@ -4051,15 +4022,36 @@ msgstr "Hafta Görünümü"
 msgid "Month View"
 msgstr "Ay Görünümü"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Özet içeriği"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Tanım içeriği"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Açıklama içeriği"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Tanım içeriği"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Eşleme yok"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Takvimi açarken bir hata oluştu"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr ""
 
@@ -4068,19 +4060,6 @@ msgstr ""
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "`%s' dizini açılamadı."
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "Takvimin gösterecek olduğu URI"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr ""
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Ses Alarm Seçenekleri"
@@ -4148,7 +4127,7 @@ msgstr ""
 msgid "hours"
 msgstr "saat"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4167,14 +4146,14 @@ msgstr "Temel"
 msgid "Date/Time:"
 msgstr "Tarih/Zaman:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Bir mesaj göster"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Bir ses çal"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4190,6 +4169,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
 msgid "Summary:"
 msgstr "Özet:"
@@ -4228,10 +4208,110 @@ msgstr "dakika"
 msgid "start of appointment"
 msgstr "randevu başlangıcı"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Bir dosya dı vermelisiniz"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "Yeni Takvim Ekle"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Görev Listesi Grubu"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Yeni Takvim Ekle"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Tip:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "hafta"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Etkin"
 
@@ -4247,19 +4327,19 @@ msgstr "Silme"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Kapat"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Etkinleştir"
 
@@ -4284,164 +4364,177 @@ msgid "60 minutes"
 msgstr "60 dakika"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Alarmlar"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Başlangıç:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Hatırlatıcılar"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Görev Listesi"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Son tarih:</b> "
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Çalışma Haftası"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Takvim ve Görev Ayarları"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Tamamlanamayan görevlerin rengi"
 
-#: 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 "Bugün tamamlanması gereken görevlerin rengi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Gün _bitimi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Gün"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Göster"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Etkinleştir"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Cuma"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Dakika"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Pazartesi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Paz"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Cumartesi"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Bir hatırlatıcı göster"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "_Gün gezgininde tarih numaralarını göster"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Pazar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "_Bugünün işleri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "P_er"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "_Görev Listesi"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Perşembe"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Zaman"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Zaman _dilimi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Zaman biçimi:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Salı"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Hafta başı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Çarşamba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Çalışma Haftası"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Çalışma günleri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 saat (ÖÖ/ÖS)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 saat"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Ekle ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Öğ_eleri silmeden önce sor"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Ay görünümünde hafta sonlarını sıkıştır"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Gün başı:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Göster"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4451,146 +4544,46 @@ msgstr "_Göster"
 msgid "_Edit"
 msgstr "_Düzenle"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Boş/Meşgul İsteği"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Cum"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Genel"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "_Tamamlanan görevleri bu süre sonunda gizle: "
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "P_zt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Zamanı geçen görevler:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "_Cmt"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Hafta ve ay görünümlerinde randevu bitiş saatlerini göster"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Zaman dilimleri:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Sal"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Ç_ar"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "her randevudan önce"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Bir dosya dı vermelisiniz"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "Yeni Takvim Ekle"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Görev Listesi Grubu"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Takvim Grubu"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Yeni Takvim Ekle"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Tip:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "hafta"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4669,81 +4662,81 @@ msgstr ""
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Hiç değişiklik yapılmadı. Düzenleyici güncellensin mi?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Onaylama hatası: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Tamamlanan "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Tamamlanan "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-#, fuzzy
-msgid " (Due "
-msgstr "Tarihe göre "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Tarihe göre "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Öğe güncellenemedi"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Randevuyu Düzenle"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Randevu - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Görev - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr ""
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Özet yok"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Farklı kaydet..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: 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:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Şimdiki e-posta işlemini iptal et"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Onaylama hatası: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Tamamlanan "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+#, fuzzy
+msgid " (Due "
+msgstr "Tarihe göre "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Tarihe göre "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4870,27 +4863,27 @@ msgstr "Dağıt:"
 msgid "Enter Delegate"
 msgstr ""
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Randevu"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Hatırlatıcı"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Tekrarlama"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Zaman Düzenleme"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Toplantı"
 
@@ -4902,7 +4895,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Başlangıç tarihi yanlış"
 
@@ -4991,10 +4984,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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,15 +5006,15 @@ msgstr "Bir düzenleyen kişi olmak zorunda."
 msgid "At least one attendee is required."
 msgstr "En az bir katılan olmalıdır."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "_Dağıt..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5299,27 +5292,20 @@ msgstr "_Değişiklikleri Sil"
 msgid "Save Event"
 msgstr "Olayı Kaydet"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Aktarıcıyı seçin"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Açıklama yok"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Takvim"
+msgid "_Destination"
+msgstr "Bu dizini sil"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
-msgstr "Yeni görev listesi"
+msgid "Task List"
+msgstr "_Görev Listesi"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5347,38 +5333,44 @@ msgid "% _Complete"
 msgstr "_Biten %"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Tamamlandı"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Yüksek"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "İşlemde"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Düşük"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Normal"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Başlamadı"
 
@@ -5416,11 +5408,11 @@ msgstr "Web Sayfası:"
 msgid "Assignment"
 msgstr "Görevlendirme"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Bitiş tarihi hatalı"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Adres defterini açamadım"
@@ -5429,8 +5421,9 @@ msgstr "Adres defterini açamadım"
 msgid "Con_fidential"
 msgstr "_Gizli"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Açıklama:"
@@ -5584,101 +5577,53 @@ msgstr "%s sunucu %s"
 msgid "%s for an unknown trigger type"
 msgstr ""
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Genel"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Özel"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Gizli"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Bitiş Tarihi"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Başlangıç Tarihi"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Özet"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Boş"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Meşgul"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "K"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Görev eklemek için tıklayın"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "G"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "İsimsiz"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "D"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+msgid "Start Date:"
+msgstr "Başlangıç Tarihi:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "B"
+#: calendar/gui/e-cal-component-preview.c:216
+msgid "Due Date:"
+msgstr "Son tarih:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Coğrafi konum aşağıdaki biçimde girilmelidir:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Durum:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+msgid "Priority:"
+msgstr "Öncelik:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Hayır"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Web Sayfası:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Bilinmiyor"
+#: 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 "Genel"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Tekrarlama"
+#: 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 "Özel"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Görevlendirildi"
+#: 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 "Gizli"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5724,17 +5669,26 @@ msgstr "%90"
 msgid "100%"
 msgstr "%100"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Boş"
+
+#: 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 "Meşgul"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 msgid "Deleting selected objects"
 msgstr "Seçilen bağlantılar siliniyor"
 
-#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Aç"
 
@@ -5743,41 +5697,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Yapıştır"
 
@@ -5835,78 +5790,157 @@ msgstr "Öncelik"
 msgid "Start date"
 msgstr "Başlangıç Tarihi"
 
+#: 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 "Özet"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Görev sıralama"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Yeni _Randevu..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Y_eni Tüm Gün Olayı"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Yeni Toplantı"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Yeni Görev"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Konumu _Seç"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "_Seç..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "_Boş/Meşgul Bilgisini Yayınla"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Dizine Kopyala..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Dizine Taşı..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "_Toplantı Tarihi Ayarla..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_iCalendar olarak Yönlendir..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "_Bu Oluşumu Sil"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "_Tüm Oluşumları Sil"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "_Bugüne Git"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "_Güne Git..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Ayarlar..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Bitiş Tarihi"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Bilinmiyor"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Tekrarlama"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Hayır"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "K"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "G"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "D"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "B"
+
+#: 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 ""
+"Coğrafi konum aşağıdaki biçimde girilmelidir:\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -5930,36 +5964,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i dakika bölmeleri"
+#. 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 "öö"
+
+#. 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 "ös"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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 "%d %B %A"
 
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "öö"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "ös"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i dakika bölmeleri"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6068,10 +6102,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Hiçbiri</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Durum:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6101,7 +6131,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Tamam"
 
@@ -6314,59 +6344,55 @@ msgstr "Bu eklenti geçerli bir takvim mesajını içermiyor."
 msgid "The attachment has no viewable calendar items"
 msgstr "Bu eklentide görüntülenebilir takvim öğeleri bulunmuyor"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Takvim dosyası güncellenemedi!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Güncelleme tamamlandı\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA sisteminde bir hata oluştu\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Öğe bulunamadı\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr ""
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Katılımcı bilgileri güncellendi\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Katılımcı bilgileri güncellenemedi!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Bitiş Tamamlandı"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Öğe gönderildi!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Öğe gönderilemedi!\n"
 
@@ -6483,28 +6509,6 @@ msgstr ""
 msgid "In Process"
 msgstr "İşlemde"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%d %B %A, %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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 "%d %b %Y %a"
-
-#. 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 "%d/%m/%Y"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Ofiste Değil"
@@ -6565,7 +6569,34 @@ msgstr "Toplantı b_aşlama saati :"
 msgid "Meeting _end time:"
 msgstr "Toplantı _bitiş saati:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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 "%d %B %A, %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.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 "%d %b %Y %a"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "%s İçin Parolayı Girin"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6574,21 +6605,19 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "%s tarihinde görevler açılıyor"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6597,53 +6626,109 @@ msgstr ""
 "'%s' hatası:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Görevler tamamlanıyor..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Seçilen öğeler siliniyor..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Siliniyor"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Görevler"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Randevu yok."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Yüklenen Resimler"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "%s içinde aç..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Takvim ve Görevler"
+
+#: 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 "Evolution Takvim ve Görevler"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution Takvim yapılandırma denetimi"
+
+#: 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 "Evolution Takvim/Görev düzenleyici"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution Takvim ve Görev bileşeni"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution Test Bileşeni"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Takvim"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "_Görevler"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Nisan"
@@ -6781,6 +6866,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Adres defterini açamadım"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Adres defterini açamadım"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7000,7 +7102,7 @@ msgid "Contacts: "
 msgstr "Bağlantılar: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Yazdırma Önizleme"
 
@@ -7012,68 +7114,78 @@ msgstr "Öğeyi Yazdır"
 msgid "Print Setup"
 msgstr "Yazdırma Ayarları"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Görev Listesi"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Yüklenen Resimler"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "_Görev"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Yeni görev"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Görev Listesi Grubu"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Yeni bir görev oluştur"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "Gösterilecek görevler dizininin URI'si"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "%s içindeki görevler yüklenemedi."
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7085,11 +7197,11 @@ msgstr ""
 "\n"
 "Gerçekten bu görevleri silmek istiyor musunuz?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Tekrar sorma."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Yazdırma Görevleri"
 
@@ -8738,7 +8850,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, fuzzy, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "'%s' dizinine kaydediliyor"
@@ -8831,33 +8943,6 @@ msgstr ""
 msgid "Error executing filter search: %s: %s"
 msgstr "%s filtre taramasını çalıştırırken hata oldu: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Arama deyimi ayrıştırılamadı: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Arama deyimi çalıştırılamadı: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(hepsini-eşle) boolean sonuç içermelidir"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8890,7 +8975,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "%d ileti alınıyor"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Arama deyimi ayrıştırılamadı: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Arama deyimi çalıştırılamadı: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(hepsini-eşle) boolean sonuç içermelidir"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(hepsini-eşle) boolean sonuç içermelidir"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(hepsini-eşle) boolean sonuç içermelidir"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Bilinmeyen başlık üzerinde arama yapılıyor: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8901,42 +9031,42 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr ""
 
-#: camel/camel-gpg-context.c:764
+#: 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:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "İptal edildi."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr ""
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, fuzzy, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "POP sunucusundan beklenmeyen cevap: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr ""
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8947,82 +9077,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "%s verisi üzerinde GPG işlemi uygulanamadı: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 çalıştırılamadı: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 çalıştırılamadı."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr ""
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Boru yaratılamadı: %s"
-
-#: camel/camel-lock-client.c:113
-#, fuzzy, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Boru yaratılamadı: %s"
-
-#: 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 kilitlenemedi"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9045,6 +9155,26 @@ msgstr "fcntl(2) kullanılırken kilitleme hatası: %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "flock(2) kullanılırken kilitleme hatası: %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: camel/camel-lock-client.c:113
+#, fuzzy, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Boru yaratılamadı: %s"
+
+#: 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 kilitlenemedi"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9286,7 +9416,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Sunucudan hatalı kimlik sınama yanıtı."
 
@@ -9487,7 +9617,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_Sertifika No:"
 
 #: camel/camel-smime-context.c:360
@@ -9504,7 +9634,7 @@ msgstr "S/MIME kodlama içeriği oluşturulamıyor."
 msgid "Failed to add data to CMS encoder"
 msgstr "%s geçici mektup dosyasını oluştururken hata: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Kimlik denetimi yapılamadı.\n"
@@ -9575,98 +9705,98 @@ msgstr "%s dizini alınamadı: %s"
 msgid "Cannot set message digests"
 msgstr "%s. ileti alınamadı: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Sertifika imza hatası"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Geçerli imza"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Sunucu: %s, Tür: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP komutu başarısız oldu: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "\"%s\" için sertifika bulunamadı."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "S/MIME kodlama içeriği oluşturulamıyor."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "LDAP sunucuyla bağlantı başarısız oldu"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Komut henüz tanınmıyor"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9683,16 +9813,26 @@ msgstr "%s dizini alınamadı: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Dizin oluşturulamadı: Geçersiz işlem"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "%s dizini silinemedi. Geçersiz işlem"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Çöp"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9814,7 +9954,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr "Uygulama doğrulamada hata"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9827,11 +9967,11 @@ msgstr ""
 "Fingerprint:      %s\n"
 "İmza:             %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "UYGUN"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "HATALI"
 
@@ -9855,7 +9995,7 @@ msgstr ""
 "Yine de kabul etmek istiyor musunuz?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9870,7 +10010,7 @@ msgstr ""
 "\n"
 "Yine de kabul etmek istiyor musunuz?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9879,7 +10019,7 @@ msgstr ""
 "Sertifika hatalı:%s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9888,7 +10028,7 @@ msgstr ""
 "Hatalı sertifika alanı: %s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9897,7 +10037,7 @@ msgstr ""
 "Sertifikanın süresi dolmuş:%s\n"
 "Veren: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9909,17 +10049,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "URL açılamadı: %s"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "'%s' kaydında hata: %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Bu isimle bir ileti yok: %s (%s)"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr ""
 
@@ -9928,11 +10068,6 @@ msgstr ""
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9949,10 +10084,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "geçici dizin kapatılamadı: %s"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Yeni iletiler denetleniyor"
 
 #: 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 "Yeni iletileri tüm dizinlerde denetle"
@@ -9986,6 +10123,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10007,26 +10145,330 @@ msgstr ""
 msgid "Checklist"
 msgstr "Kalın sisli"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %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 "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %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 "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %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 iletisi %s dizininden alınamadı\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 iletisi %s dizininden alınamadı\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "İleti mh dizinine eklenemedi: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "İleti mh dizinine eklenemedi: %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 iletisi %s dizininden alınamadı\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 iletisi %s dizininden alınamadı\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 iletisi %s dizininden alınamadı\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 iletisi %s dizininden alınamadı\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 "Dizinler"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Sadece üye olunan dizinleri göster"
+
+#: 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 "İsim alanı"
+
+#: 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 sunucuları ileti alma ve göndermede kullanmak için"
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 server using a plaintext password."
+msgstr ""
+"Bu seçenek IMAP sunucusuna açık metin parola kullanarak bağlantı kurulmasını "
+"sağlar."
+
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr ""
+
+#: 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:140
+#: 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 adresine bağlantı kurulamadı (%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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Bağlantı iptal edildi"
+
+#: 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"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"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
+#, fuzzy, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr ""
+"POP sunucusuyla bağlantı kurulamadı.\n"
+"Parola iletiminde hata: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Bilinmeyen hata"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"%s POP sunucusuyla bağlantı kurulamadı: Belirtilen kimlik sınama protokolü "
+"desteklenmiyor."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sLütfen %s@%s için SMTP parolasını giriniz"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "%s POP sunucusuyla kimlik denetimi başarısız oldu: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Dizin içinde yeni satır karakteri bulunamaz."
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "%s dizini silinemedi: Böyle bir dizin yok"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr ""
+"\n"
+"Açıklama: "
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "%s dizini silinemedi. Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "%s dizininin adı değiştirilemedi: Geçersiz işlem"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "%s dizini alınamadı: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "IMAP sunucusundan beklenmeyen cevap: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Görev yok"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "İşlem iptal edildi"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Sunucu beklenmedik bir şekilde bağlantıyı kesti: %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:1089
-msgid "Unknown error"
-msgstr "Bilinmeyen hata"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10071,21 +10513,21 @@ msgstr "%s dizini yaratılamadı: %s"
 msgid "Could not load summary for %s"
 msgstr "%s için özet bilgisi yüklenemedi"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Sunucudaki dizin silindi ve yeniden oluşturuldu."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Değiştirilen iletiler taranıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "İleti alınamadı: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10101,25 +10543,25 @@ msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "İleti bulunmuyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Bu ileti kullanılabilir değil"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 msgid "Fetching summary information for new messages"
 msgstr "Yeni iletilerdeki özet bilgiler alınıyor"
 
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "FETCH cevabında ileti gövdesi bulunamadı"
 
@@ -10163,23 +10605,6 @@ msgstr ""
 "\n"
 "Açıklama: "
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Dizinler"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Sadece üye olunan dizinleri göster"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "İsim alanı"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "Bu sunucudaki GELEN kutusunda bulunan yeni iletilere filtreleri uygula"
@@ -10202,90 +10627,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP sunucu %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 adresine bağlantı kurulamadı (%d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS mevcut değil"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Bağlantı iptal edildi"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, fuzzy, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr ""
-"POP sunucusuyla bağlantı kurulamadı.\n"
-"Parola iletiminde hata: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "%s sunucusuna bağlantı kurulamadı"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Bir parola girmediniz."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10296,25 +10676,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Bu isimde bir dizin yok: `%s'"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Dizin içinde yeni satır karakteri bulunamaz."
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10322,7 +10695,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, fuzzy, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Bilinmeyen hata: %s"
@@ -10427,58 +10800,58 @@ msgid ""
 msgstr ""
 "Standart UNIX posta kutularından ileti alma ve göndermede kullanmak için"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "%s saklama dizininde hata"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "%s saklama dizini geçersiz"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 dizini alınamadı: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Yerel disklerde gelen dizini bulunmasın"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Yerel mektup dosyası %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "%s dizininin adı %s olarak değiştirilemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "'%s' adı değiştirilemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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' dizin özet dosyası silinemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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' dizin indeks dosyası silinemedi: %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10545,7 +10918,7 @@ msgstr "`%s' dizini silinemedi: %s"
 msgid "not a maildir directory"
 msgstr "maildir dizini değil"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10883,7 +11256,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10892,8 +11265,8 @@ 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:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10902,48 +11275,48 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "İletilerin otomatik kaydında hata: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "geçici dizin kapatılamadı: %s"
@@ -11067,7 +11440,7 @@ msgstr "Grup alınamadı: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "İleti alınamadı: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11120,8 +11493,8 @@ msgstr "%s kullanıcı numarasıyla ileti yok"
 msgid "Retrieving POP message %d"
 msgstr "%d. POP iletisi alınıyor"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Bilinmeyen hata"
 
@@ -11572,7 +11945,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "ek"
 
@@ -11617,6 +11990,99 @@ msgstr "MIME türü:"
 msgid "Suggest automatic display of attachment"
 msgstr "Eklentinin otomatik gösterimini öner"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "İleti açılamadı"
+
+#: composer/e-msg-composer.c:1291
+#, fuzzy
+msgid "Unable to retrieve message from editor"
+msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Başlıksız İleti)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Dosyayı aç"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Otomatik"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "İmza:"
+
+#: 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.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 "Bir ileti yaz"
+
+#: 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 ""
+"Düzenleyici penceresi oluşturulamadı:\n"
+"HTML düzenleyici programı çalıştırılamadı.\n"
+"Lütfen sistemde gtkhtml ve libgtkhtml programlarının\n"
+"kurulu olduğunu denetleyin.\n"
+
+#: composer/e-msg-composer.c:3279
+#, fuzzy
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
+"e-posta bilgilerinizi girmediniz."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 #, fuzzy
 msgid "Posting destination"
@@ -11702,208 +12168,135 @@ msgstr "<bir dizin seçmek için tıklayın>"
 msgid "Attach file(s)"
 msgstr "Bir dosya ekle"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "Bu _hesabı kullanırken her zaman giden iletileri imzala"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "İleti açılamadı"
-
-#: composer/e-msg-composer.c:1281
-#, fuzzy
-msgid "Unable to retrieve message from editor"
-msgstr "%s üzerindeki POP sunucusundan iletiler alınamadı: "
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Başlıksız İleti)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Dosyayı aç"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Otomatik"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "İmza:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "İletiyi bir dosya ekle"
 
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
 
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
+#. 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 ""
 
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Bir ileti yaz"
-
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
 
-#: composer/e-msg-composer.c:3165
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 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"
+"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 ""
-"Düzenleyici penceresi oluşturulamadı:\n"
-"HTML düzenleyici programı çalıştırılamadı.\n"
-"Lütfen sistemde gtkhtml ve libgtkhtml programlarının\n"
-"kurulu olduğunu denetleyin.\n"
 
-#: composer/e-msg-composer.c:3269
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
-msgstr ""
-"E-posta düzenleme penceresi açılmadı, çünkü adınızı ve\n"
-"e-posta bilgilerinizi girmediniz."
-
-#: composer/e-msg-composer.c:4274
-msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(Burada düzenlenmesi mümkün olmayan bir bilgi vardır.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Sonraki O_kunmamış İleti"
 
-#: composer/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+msgid "Do you want to recover unfinished messages?"
+msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Boru yaratılamadı: %s"
+msgid "Don't Recover"
+msgstr "Silme"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "İ_mza dosyası kaydedilemedi: %s"
+msgid "Recover"
+msgstr "Sil"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "İ_mza dosyası kaydedilemedi: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "_Değişiklikleri Sil"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Kısayolları kaydederken hata oldu."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Silme"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Uyarı: İleti Değiştirildi"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Kısayolları kaydederken hata oldu."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Gerçekten bu randevuyu silmek istiyor musunuz?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Sil"
+msgid "Discard Changes"
+msgstr "_Değişiklikleri Sil"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "İletiyi Farklı Kaydet..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Boru yaratılamadı: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Sonraki O_kunmamış İleti"
+msgid "Could not read signature file \"{0}\"."
+msgstr "İ_mza dosyası kaydedilemedi: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Uyarı: İleti Değiştirildi"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "İletiyi bir dosya ekle"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12029,7 +12422,8 @@ msgstr ""
 "Aynı isimde bir dosya zaten var\n"
 "Üzerine yazılsın mı?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Dosya üzerine yazılsın mı?"
 
@@ -12208,81 +12602,97 @@ msgstr "Bir Zaman Dilimi Seçin"
 msgid "_Filter Rules"
 msgstr "Filtre Kuralları"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"`%s' düzgün deyiminde hata var:\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Toplantı Güncellemesi"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Bir tarih seçmelisiniz."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "_DN:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Bir dosya dı vermelisiniz"
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "%s dizini siliniyor"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Görevlendirme"
+msgid "Missing folder."
+msgstr "%s dizini siliniyor"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Bu dizin adı belirtmelisiniz."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Hiç sunucu seçilmedi"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"`%s' düzgün deyiminde hata var:\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Bir tarih seçmelisiniz."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Görevlendirme"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Bu filtrenin adını değiştirmelisiniz."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Bu vfolder adını değiştirmelisiniz."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Bir dosya dı vermelisiniz"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Bu dizin adı belirtmelisiniz."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Hiç sunucu seçilmedi"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12295,66 +12705,11 @@ msgstr "Bir dosya seç"
 msgid "<b>Then</b>"
 msgstr "<b>Son tarih:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Dizini Seçin"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Önemli"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Yapılacaklar"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Sonra"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Test"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Kural adı:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "İsimsiz"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Son tarih:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Eylemleri işlet"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "tüm kriterler sağlanırsa"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "herhangi bir kriter sağlanırsa"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "gelen"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "giden"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12440,6 +12795,76 @@ 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
+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
+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
+msgid "Later"
+msgstr "Sonra"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Test"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Kural adı:"
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Son tarih:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "tüm kriterler sağlanırsa"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "herhangi bir kriter sağlanırsa"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Eylemleri işlet"
+
+#: filter/filter-rule.c:877
+msgid "All related"
+msgstr ""
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Alıcılar"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Cevaplanan"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "İçer:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "gelen"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "giden"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 #, fuzzy
@@ -12576,7 +13001,7 @@ msgstr "İşaretli"
 msgid "Junk Test"
 msgstr "Haziran"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Etiket"
@@ -12617,7 +13042,7 @@ msgstr "Programdan çık"
 msgid "Play Sound"
 msgstr "Ses çal:"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Oku"
 
@@ -12690,9 +13115,9 @@ msgstr "başlayan"
 msgid "Stop Processing"
 msgstr "İşlemeyi Durdur"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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"
@@ -12757,110 +13182,63 @@ msgstr "Konu içermez"
 msgid "Virtual _Folders"
 msgstr "Sanal Dizinler"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Ekle"
+
+#: filter/vfolder-rule.c:573
 #, fuzzy
 msgid "VFolder source"
 msgstr "vFolder Kaynakları"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Düzenleyici Tercihleri"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "İleti tercihleri, güvenlik ve diğer ayarları buradan yapılandırın"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "İmla denetimi, imza ve metin düzenleyiciyi buradan yapılandırın"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Posta hesaplarını buradan yapılandırın"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "E-posta özet bileşen mimarisi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution e-posta programı."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution e-posta programı."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "E-posta özet bileşen mimarisi"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution e-posta dizin görüntüleme bileşeni."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution e-posta özet bileşeni."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "İleti"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "E-posta Hesapları"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "E-posta Tercihleri"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Öntanımlı]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Hesap adı"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Protokol"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "İsimsiz"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Dil(ler)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "İmza Ekle"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "İmza(lar)"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Yönlendirilmiş İleti"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Arama sonucundan  _Sanal Dizin Yarat..."
 
@@ -12898,275 +13276,451 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "Dizinin nerede yaratılacağını belirtin:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 msgid "Folder _name:"
 msgstr "Dizin _adı:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VDizin"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Gelen"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Yükleniyor..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr ""
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Taşı"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Görevi İptal Et"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Dizini seçin"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Kopyala"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "\"%s\" dizinini yeniden adlandır:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Dizini yeniden adlandır"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Göster"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Yeni Pencerede Aç"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Taşı"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "_Yeni Dizin..."
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "_Yeniden adlandır"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "VDizin"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Gelen"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Yeni İleti Olarak _Düzenle..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_Yazdır"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "_Gönderene Cevapla"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "_Listeye Cevapla"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "_Herkese Cevapla"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Yönlendir"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Tamamlandı"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "_Bayrağı Temizle"
 
-#: mail/em-folder-view.c:787 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 "_Okunmuş Olarak İşaretle"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Ö_nemsiz Olarak İşaretle"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Oku_nmamış Olarak İşaretle"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Ö_nemli Olarak İşaretle"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "_Silme"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Dizine Taşı..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "D_izine Kopyala..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "_Göndereni Adres Defterine Ekle"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "_Filtreleri Uygula"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Filtre Kuralları"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "_Bu İletiden Bir Kural Yarat"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "_Konuya Göre VFolder"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "_Gönderene Göre VFolder"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "_Alıcılara Göre VFolder"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "_E-posta Listesi Üzerinde VFolder"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "_Gönderene Göre VFolder"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "_Konuya Göre Filtrele"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "_Gönderene Göre Filtrele"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "_Alıcılara Göre Filtrele"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "_E-posta Listesine Göre Filtrele"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "_Gönderene Göre Filtrele"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Öntanımlı"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "İletiyi Yazdır"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Adresi Kopyala"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Görev eklemek için tıklayın"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Gönderen"
+
+#: 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 "Yanıtla"
+
+#: 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 "Alıcı"
+
+#: 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 "Bilgi"
+
+#: 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 "Gizli"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s ek"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Desteklenmeyen şema"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Sertifika imzası açılamadı"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Sertifika imzası açılamadı"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Görev eklemek için tıklayın"
+msgid "Retrieving `%s'"
+msgstr "%s numaralı ileti alınıyor"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Görevlendirildi"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+msgid "Valid signature"
+msgstr "Geçerli imza"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+msgid "Invalid signature"
+msgstr "Geçersiz imza"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+msgid "Unencrypted"
+msgstr "Şifrelenmemiş"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+msgid "Encrypted"
+msgstr "Şifrelenmiş"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Bozuk harici gövde"
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "FTP adresine bağ (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "%s yerel dosyasına bağ (\"%s\" adresinde geçerli)"
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Yerel dosyaya bağ (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Uzak veri adresine bağ (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "İletiler taşınıyor"
+
+#. pseudo-header
+#: mail/em-format-html.c:1523 mail/em-format-quote.c:309
+#: mail/em-mailer-prefs.c:930
+msgid "Mailer"
+msgstr "E-postalayıcı"
+
+#. 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 ""
+
+#. 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
@@ -13174,12 +13728,7 @@ msgstr "Görev eklemek için tıklayın"
 msgid "Matches: %d"
 msgstr "Eşleşenler:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Görevlendirildi"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13187,11 +13736,7 @@ msgid ""
 msgstr ""
 "Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-msgid "Valid signature"
-msgstr "Geçerli imza"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13199,254 +13744,111 @@ msgid ""
 msgstr ""
 "Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-msgid "Invalid signature"
-msgstr "Geçersiz imza"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-msgid "Unencrypted"
-msgstr "Şifrelenmemiş"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-msgid "Encrypted"
-msgstr "Şifrelenmiş"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 msgid "_View Certificate"
 msgstr "_Sertifikayı Görüntüle"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Sertifika geçersiz"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 #, fuzzy
 msgid "Overdue:"
 msgstr "_Zamanı geçen görevler:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "İzle"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 msgid "_Hide"
 msgstr "_Gizle"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Sayfa: %d / %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "%s numaralı ileti alınıyor"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Bozuk harici gövde"
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "FTP adresine bağ (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "%s yerel dosyasına bağ (\"%s\" adresinde geçerli)"
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Yerel dosyaya bağ (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Uzak veri adresine bağ (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Bilinmeyen harici veriye bağ (\"%s\" türünde)"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "İletiler taşınıyor"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Gönderen"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Yanıtla"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Alıcı"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Bilgi"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Gizli"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "E-postalayıcı"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Tarih"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s ek"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "MIME iletisi açılamadı: Kaynak kodu gösteriliyor."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Desteklenmeyen şema"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Sertifika imzası açılamadı"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Sertifika imzası açılamadı"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Her yıl"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Bir gün"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "B_ir hafta"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Bi_r ay"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13454,25 +13856,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "'%s' geçiş yapılamadı: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "%s dizini alınamadı: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "'%s' geçiş yapılamadı: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"Çıkış dosyası yaratılamadı: %s\n"
+" %s"
+
+#: mail/em-migrate.c:1919
+#, 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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "'%s' makinesi bulunamadı: %s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "%s iletisi önbelleğe yazılamadı: %s"
+
+#: mail/em-migrate.c:2480
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13483,95 +13917,79 @@ msgstr "Farklı Kaydet..."
 msgid "untitled_image.%s"
 msgstr "Başlıksız İleti"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "_Gönderene cevapla"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "_Bağlantıyı Tarayıcıda Aç"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "İletiyi _listeye gönder..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "Adres Defterine Ek_le"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "%s içinde aç..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Sunucu LDAPv3 şema bilgisini desteklemiyor"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Üye ol"
 
-#: mail/em-subscribe-editor.c:637 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 "Dizin"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Lütfen bir sunucu seçiniz."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Hiç sunucu seçilmedi"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Bu mesajı bir daha gösterme."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Filtreler"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Yönlendirilmiş İleti"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, 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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "İleti"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "İletiyi Farklı Kaydet..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 msgid "Add address"
 msgstr "Adres ekle"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "%s'ten E-posta"
@@ -13591,11 +14009,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13709,167 +14127,168 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "E-posta Hesapları"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "E-posta Hesapları"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 #, fuzzy
 msgid "Log filter actions to the specified log file."
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 #, fuzzy
 msgid "Logfile to log filter actions"
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 #, fuzzy
 msgid "Logfile to log filter actions."
 msgstr "Filtre eylemlerini buraya kaydet:"
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Öntanımlı Öncelik:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Yeni Posta Bildirimi"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "HTML iletileri istemeyen bağlantılara ileti gönderirken beni _uyar"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "Sadece _Bcc alıcıların tanımlı olduğu iletileri gönderirken beni uyar"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13925,8 +14344,9 @@ msgid "Spell check inline"
 msgstr "İmla _Denetimi"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Öntanımlı Öncelik:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14069,37 +14489,68 @@ msgstr ""
 msgid "spamd port"
 msgstr "Aktar"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution e-posta programı."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Düzenleyici Tercihleri"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "İleti tercihleri, güvenlik ve diğer ayarları buradan yapılandırın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "İmla denetimi, imza ve metin düzenleyiciyi buradan yapılandırın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Posta hesaplarını buradan yapılandırın"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution e-posta programı."
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "E-posta özet bileşen mimarisi"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail component"
 msgstr "Evolution e-posta programı."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Evolution e-posta programı."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "E-posta özet bileşen mimarisi"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution e-posta özet bileşeni."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "E-posta Hesapları"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "E-posta Tercihleri"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "İ_leti"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14107,15 +14558,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Lütfen bekleyiniz"
 
@@ -14147,19 +14598,51 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Alınıyor"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Dosyalar Alınıyor"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution e-posta programı."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution e-posta programı."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution e-posta programı."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution e-posta programı."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "%s taranıyor"
@@ -14169,7 +14652,7 @@ msgstr "%s taranıyor"
 msgid "Priority Filter \"%s\""
 msgstr "Öncelik Filtresi \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14184,7 +14667,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14192,7 +14675,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14201,24 +14684,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution, Netscape verilerini alıyor."
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution, Netscape verilerini alıyor."
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "E-posta Filtreleri"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14252,128 +14735,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution Hesap Düzenleyici"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Makina:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Kullanıcı adı:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "_Yol:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "%s adresine postala"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Konu: %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "%s'ten E-posta"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s posta listesi"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Cevaplanan"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Filtre Kuralı Ekle"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d seçili"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d gönderilmemiş"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Taslaklar"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d gönderilmiş"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d gönderilmemiş"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "toplam %d"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d gönderilmemiş"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d seçili"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Yeni İleti"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "_İletiyi Gönder"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Yeni bir e-posta hazırla"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Yeni VDizin"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "E-posta Filtreleri"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Yeni bir dizin yarat"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "Takvimin gösterecek olduğu URI"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Servis Denetleniyor"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "Sunucuya bağlantı kuruluyor..."
+
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Kimlik"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14383,12 +14877,12 @@ msgstr ""
 "e-posta adresinizin içinde görünmesini istemiyorsanız seçimlik alanları "
 "doldurmanıza gerek yoktur. "
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Alınan İletiler"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14397,15 +14891,15 @@ msgstr ""
 "kullandığınızı bilmiyorsanız sistem yöneticinize, ya da İnternet servis "
 "sağlayıcınıza başvurun."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Lütfen aşağıdaki seçeneklerden birisini seçiniz"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Gönderilen İletiler"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14414,11 +14908,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Hesap Yöneticisi"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14431,14 +14925,6 @@ 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.c:888
-msgid "Checking Service"
-msgstr "Servis Denetleniyor"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Sunucuya bağlantı kuruluyor..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14759,7 +15245,8 @@ msgid "Execute Command..."
 msgstr "Komut Çalıştır..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "_Eş aralıklı:"
 
 #: mail/mail-config.glade.h:82
@@ -15090,340 +15577,455 @@ msgstr "rengi ile tanımla"
 msgid "description"
 msgstr "açıklama"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Kimlik Denetimi"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Tüm dizindeki tüm silinmiş iletileri tamamen sil"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
+"biçimli iletiler almak istemiyorlar:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
+msgid "_Send"
+msgstr "Gönder"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Gerçekten %d iletiyi yeniden göndermek istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Dizin kopyalanamadı: %s"
+msgid "Use default drafts folder?"
+msgstr "Öntanımlı görevler dizini açılıyor"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "%s dizini alınamadı: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Bu hesap için taslak dizini açılamadı.\n"
+"Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Geçici dizin yaratılamadı: %s"
+msgid "Use _Default"
+msgstr "Öntanımlı"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"%s dizini yaratılamadı\n"
-"\n"
-"Hata: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Gerçekten %d iletiyi farklı pencerelerde açmak istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Dizin silinemedi:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "%s dizini silinemedi: Böyle bir dizin yok"
+msgid "_Expunge"
+msgstr "_Sil"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "%s dizini bulunamadı."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Tüm dizindeki tüm silinmiş iletileri tamamen sil"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Dizin taşınamadı: %s"
+msgid "_Empty Trash"
+msgstr "Çöpü _Boşalt"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "'%s' adı değiştirilemedi: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Henüz gönderilmemiş iletileriniz var. Yine de çıkmak istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "'%s' adı değiştirilemedi: %s"
+msgid "Error while {0}."
+msgstr ""
+"'%s' sırasında hata:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "İleti açılamadı"
+msgid "Error while performing operation."
+msgstr ""
+"İşlem sırasında hata:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
+msgid "Enter password."
+msgstr "Parolayı Girin"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Filtre bilgisini yüklerken hata oluştu:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "%s dizini yaratılamadı: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "İleti alınamadı: %s\n"
 "  %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "İmza Ekle"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"%s dizini yaratılamadı\n"
+"\n"
+"Hata: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "İ_mza dosyası kaydedilemedi: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Sil: \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Bağlantıyı Sil?"
+msgid "Cannot create temporary save directory."
+msgstr "Geçici dizin yaratılamadı: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "_Değişiklikleri Sil"
+#. 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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Silme"
+msgid "File exists but cannot overwrite it."
+msgstr "Dosya var. Üzerine yazılsın mı?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Parolayı Girin"
+msgid "File exists but is not a regular file."
+msgstr "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Filtre bilgisini yüklerken hata oluştu:\n"
+"Dizin silinemedi:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"İşlem sırasında hata:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "%s dizini silinemedi: Böyle bir dizin yok"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"'%s' sırasında hata:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Dosya var. Üzerine yazılsın mı?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "%s dizininin adı değiştirilemedi: Bu isimde bir dizin yok"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "`%s' dosyası bulunamadı, ya da normal bir dosya değil."
+msgid "Delete \"{0}\"?"
+msgstr "Sil: \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Gerçekten \"%s\" dizini silinsin mi?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Kimlik Denetimi"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Dizin taşınamadı: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "'%s' adı değiştirilemedi: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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 "İleti açılamadı"
 
-#: mail/mail-errors.xml.in.h:50
-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: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 "Dizin kopyalanamadı: %s"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"HTML biçimli bir ileti gönderiyorsunuz. Ancak aşağıdaki alıcılar, HTML "
-"biçimli iletiler almak istemiyorlar:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "%s dizini alınamadı: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Gerçekten \"%s\" dizini silinsin mi?"
+msgid "Cannot open source \"{1}\""
+msgstr "'%s' adı değiştirilemedi: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Gerekli tüm bilgiler verilmedi."
 
-#: mail/mail-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
+msgid "You may not create two accounts with the same name."
+msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
 
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Bağlantıyı Sil?"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Gerçekten bu hesabı silmek istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. 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-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Silme"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "İ_mza dosyası kaydedilemedi: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "İmza Ekle"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "%s IMAP sunucusu %s kimlik sınama yöntemini desteklemiyor"
+msgid "Discard changed?"
+msgstr "_Değişiklikleri Sil"
+
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15431,85 +16033,87 @@ msgstr ""
 "\n"
 "Değişiklikleri kaydetmek istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
 msgstr ""
-"Bu hesap için taslak dizini açılamadı.\n"
-"Öntanımlı taslak dizinini kullanmak istiyor musunuz?"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use _Default"
-msgstr "Öntanımlı"
-
-#: mail/mail-errors.xml.in.h:65
-#, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Öntanımlı görevler dizini açılıyor"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Gerekli tüm bilgiler verilmedi."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Henüz gönderilmemiş iletileriniz var. Yine de çıkmak istiyor musunuz?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "İki hesabı aynı isimlerle oluşturamazsınız."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "%s dizini bulunamadı."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "Çöpü _Boşalt"
-
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "_Sil"
-
-#: mail/mail-errors.xml.in.h:74
-#, fuzzy
-msgid "_Send"
-msgstr "Gönder"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. 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-errors.xml.in.h:79
-msgid "{1}."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-folder-cache.c:786
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
+#, fuzzy
+msgid "_Overwrite"
+msgstr "Üzerine yaz"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "%s adresine ping gönderiliyor"
@@ -15518,135 +16122,135 @@ msgstr "%s adresine ping gönderiliyor"
 msgid "Working"
 msgstr "Çalışıyor"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Dizin filtreleniyor"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "İleti Alınıyor"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "%d / %d ileti gönderiliyor"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "İletinin açılmasında hata."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Tamamlandı."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "İletiler dizine kaydediliyor"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "İletiler %s'e taşınıyor"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "İletiler %s'e kopyalanıyor"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Yönlendirilmiş iletiler"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "%s dizini açılıyor"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "%s deposu açılıyor"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "%s dizini siliniyor"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "'%s' dizinine kaydediliyor"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Dizin tazeleniyor"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Dizin siliniyor"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Yerel Dizinler"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "%s numaralı ileti alınıyor"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15655,7 +16259,7 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15664,11 +16268,11 @@ msgstr ""
 "İletilerin kaydında hata: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Ek kaydediliyor"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15677,17 +16281,17 @@ msgstr ""
 "Çıkış dosyası yaratılamadı: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Veri yazılamadı: %s."
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "%s bağlantısı kesiliyor"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "%s adresine bağlantı kuruluyor"
@@ -15751,24 +16355,24 @@ msgstr "Güncelleniyor..."
 msgid "Waiting..."
 msgstr "Bekleniyor..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Kullanıcı işlemi iptal etti."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "%s İçin Parolayı Girin"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Parolayı Girin"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Bu parolayı hatırla"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "_Bu oturumun sonuna kadar girilen parolayı hatırla"
 
@@ -15810,89 +16414,94 @@ msgstr "Yönlendirilmiş ileti"
 msgid "Invalid folder: `%s'"
 msgstr "Geçersiz dizin:'%s'"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "VDizin yaratılıyor: %s"
 
-#: mail/mail-vfolder.c:207
+#: mail/mail-vfolder.c:235
 #, fuzzy, c-format
-msgid "Updating vfolders for uri: %s"
+msgid "Updating vFolders for '%s:%s'"
 msgstr "\"%s\" içinde dizinler taranıyor"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "\"%s\" içinde dizinler taranıyor"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vDizinler"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "VDizin Düzenle"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Yeni VDizin"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Görünmeyen"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Görünen"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Cevaplanan"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Çoklu Görülmeyen İleti"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Çoklu İletiler"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "En Düşük"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Düşük"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Yüksek"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "En Yüksek"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Bugün %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Dün %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l %M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "İleti listesi oluşturuluyor"
 
@@ -15925,43 +16534,43 @@ msgstr "Alındı"
 msgid "Size"
 msgstr "Boyut"
 
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "Çağrı"
 
-#: mail/message-tag-followup.c:63
+#: mail/message-tag-followup.c:74
 msgid "Do Not Forward"
 msgstr "Yönlendirme"
 
-#: 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 "Bilginize"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Yönlendir"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Cevaba Gerek Yok"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Cevapla"
 
-#: mail/message-tag-followup.c:70 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 "Herkese cevapla"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr ""
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16006,130 +16615,60 @@ msgstr "_Üye ol"
 msgid "_Unsubscribe"
 msgstr "Ü_yelikten çık"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution Kabuğu"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution Test Bileşeni"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Bu kısayol grubunu yeniden isimlendir"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Dizin çubuğunu göster/gizle"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Kısayol çubuğunu gizle"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Öntanımlı Öncelik:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Öntanımlı Öncelik:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "İleti yapılandırma arayüzü"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Öntanımlı görevler dizini açılıyor"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Öntanımlı görevler dizini açılıyor"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Öntanımlı görevler dizini açılıyor"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Öntanımlı görevler dizini açılıyor"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Dizin çubuğunu göster/gizle"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Kısayol çubuğunu göster/gizle"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "E-posta"
@@ -16138,6 +16677,32 @@ msgstr "E-posta"
 msgid "Brought to you by"
 msgstr "Yazarlar"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Bilinmeyen hata"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Geçersiz argümanlar"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "OAF'a kayıt yapılamadı"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Yapılandırma Veritabanı bulunamadı"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Genel hata"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(isimsiz)"
@@ -16278,11 +16843,11 @@ msgstr "gpg çalıştırılamadı."
 msgid "_Import"
 msgstr "Aktar"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Bağlantılar kesiliyor..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution Ayarları"
 
@@ -16319,11 +16884,35 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "%s adresine postala"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "%s çalıştırırken bir hata oldu."
@@ -16337,14 +16926,15 @@ msgid "Bug buddy could not be run."
 msgstr "Bug-buddy çalıştırılamadı."
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Ximian Evolution Hakkında"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Ç_evrimiçi Çalış"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Çe_vrimdışı Çalış"
 
@@ -16352,48 +16942,6 @@ msgstr "Çe_vrimdışı Çalış"
 msgid "Work Offline"
 msgstr "Çevrimdışı Çalış"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution çevrimdışı çalışmak üzere hazırlanıyor."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Geçersiz argümanlar"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "OAF'a kayıt yapılamadı"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Yapılandırma Veritabanı bulunamadı"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Genel hata"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Denetim kutusu"
@@ -16469,6 +17017,43 @@ msgstr ""
 "Bu bağlantıları kapatmak ve İnternet bağlantısını ayırmak için Tamam "
 "düğmesine tıklayın"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Takvim:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Bağlantılar: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "İ_leti:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Görevler:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+msgid "Folder _type:"
+msgstr "Dizin _türü:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Başka Bir Kullanıcının Dizinini Aç"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Hesap:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "_Dizin Adı:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Kullanıcı:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution Kurulum Yardımcısı"
@@ -16510,6 +17095,20 @@ msgstr ""
 "\n"
 "Ayarları kaydetmek için \"Uygula\" düğmesine tıklayın."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution Kabuğu"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution Test Bileşeni"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "\"Aktar\" düğmesine tıklayarak dosyaları Evolution'a aktarın."
@@ -16573,13 +17172,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution, aşağıdaki dosyalardan veri alabilir:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16593,69 +17192,126 @@ msgid ""
 "eagerly await your contributions!\n"
 msgstr ""
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr "Teşekkürler. Ximian Evolution Grubu\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Tekrar sorma"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Ximian Evolution Kabuğuna erişilemedi."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Çevrimdışı çalışmaya başla"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Çevrimiçi çalışmaya başla"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "Tüm Evolution bileşenlerini kapat"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Tüm hata ayıklama verilerini bir dosyaya yazdır."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
 "  Use %s --help for more information.\n"
 msgstr ""
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Ximian Evolution Kabuğuna erişilemedi."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution Hesap Sihirbazı"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_Sertifika No:"
@@ -16908,12 +17564,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_Sertifika No:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Bu kart numarası var"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17130,6 +17780,12 @@ msgstr "Konu: %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Bu kart numarası var"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17171,12 +17827,12 @@ msgstr "İletinin öntanımlı konusu."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "'%s' çalıştırılamadı: %s\n"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr "%s (%s) kapatılıyor\n"
@@ -17240,7 +17896,8 @@ msgid "Select all contacts"
 msgstr "Tüm Bağlantıkları Seç"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Seçilen bağlantılara bir mesaj gönder."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17272,8 +17929,8 @@ msgstr ""
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Eylemler"
@@ -17291,7 +17948,8 @@ msgid "_Preview Pane"
 msgstr "Önizleme _Panosu"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "_VCard Olarak Kaydet"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17422,11 +18080,21 @@ msgstr "şimdiki zaman"
 msgid "Week"
 msgstr "Hafta"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Çalışma Haftası"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Randevu"
 
+#: 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 "_Kapat"
+
 #: 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
@@ -17750,6 +18418,16 @@ 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
+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
+msgid "_Close"
+msgstr "_Kapat"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18003,7 +18681,8 @@ msgid "Open the selected message in a new window"
 msgstr "Seçilen iletiyi yeni bir pencerede aç"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Seçilen iletiyi düzenleyicide yeniden göndermek üzere aç"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18123,58 +18802,46 @@ msgstr "_Konuya Göre VFolder..."
 msgid "_Attached"
 msgstr "_Ekli"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "Dizine _Kopyala"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "İ_letiden Bir Filtre Yarat"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "_Git"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Bağlantılı"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Daha büyük"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "İleti _Görünümü"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Dizine _Taşı"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Sonraki İleti"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Normal _Gösterim"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "İ_letiyi Aç "
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Ö_nceki İleti"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr ""
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Y_eniden Gönder..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Araçlar"
@@ -18183,16 +18850,6 @@ msgstr "_Araçlar"
 msgid "_Undelete"
 msgstr "_Silme"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "_Kapat"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Ekle"
@@ -18591,6 +19248,11 @@ msgstr "E-posta Tercihleri"
 msgid "_Send / Receive"
 msgstr "_Gönder / Al"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "_Pencere"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Ş_irkete Göre"
@@ -18661,10 +19323,6 @@ msgstr "_Tarihe Göre:"
 msgid "With _Status"
 msgstr "Durum belirt"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Görevler"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18822,6 +19480,34 @@ msgstr "Diğer..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Evolution Hatası"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Toplantı Bilgisi"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Gönderilen ve Taslak İletileri"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -18940,6 +19626,35 @@ msgstr "Metin"
 msgid "Find _Now"
 msgstr "Ş_imdi Bul"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 dosyası mevcut\n"
+"Üzerine yazmak istiyor musunuz?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"İleti alınamadı: %s\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"İleti alınamadı: %s\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18950,9 +19665,130 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%%%d tamamlandı)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution Adres Defteri dizin görüntüleyici"
+
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Yeni Adres Defteri"
+#~ msgid "Address 2:"
+#~ msgstr "_2. Adres:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Blog"
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution Takvim görüntüleyici"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution Görev izleyici"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Gnome-vfs başlatılamıyor"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "`%s' dizini açılamadı."
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "Takvimin gösterecek olduğu URI"
+
+#~ msgid "Display a message"
+#~ msgstr "Bir mesaj göster"
+
+#~ msgid "Alerts"
+#~ msgstr "Alarmlar"
+
+#~ msgid "Time"
+#~ msgstr "Zaman"
+
+#~ msgid "_General"
+#~ msgstr "_Genel"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Aktarıcıyı seçin"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Takvim"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Yeni görev listesi"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Takvim dosyası güncellenemedi!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "Gösterilecek görevler dizininin URI'si"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "%s içindeki görevler yüklenemedi."
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution e-posta dizin görüntüleme bileşeni."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "_Gönderene Göre VFolder"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "_Gönderene Göre Filtrele"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "'%s' geçiş yapılamadı: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "'%s' geçiş yapılamadı: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "'%s' makinesi bulunamadı: %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "Takvimin gösterecek olduğu URI"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Bu kısayol grubunu yeniden isimlendir"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Kısayol çubuğunu gizle"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Öntanımlı görevler dizini açılıyor"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Öntanımlı görevler dizini açılıyor"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Öntanımlı görevler dizini açılıyor"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Öntanımlı görevler dizini açılıyor"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Dizin çubuğunu göster/gizle"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Kısayol çubuğunu göster/gizle"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Ximian Evolution Kabuğu başlatılamadı: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Y_eniden Gönder..."
 
 #, fuzzy
 #~ msgid "The URI that the address book will display"
@@ -19115,9 +19951,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Eş:"
 
-#~ msgid "_Add"
-#~ msgstr "_Ekle"
-
 #~ msgid "_Business:"
 #~ msgstr "_İş:"
 
@@ -19236,15 +20069,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ "detaylı bilgiye sahip olmalısınız. Lütfen bu bilgiler için \n"
 #~ "gerekiyorsa sistem yöneticiniz ile görüşün."
 
-#~ msgid "Start Date:"
-#~ msgstr "Başlangıç Tarihi:"
-
-#~ msgid "Due Date:"
-#~ msgstr "Son tarih:"
-
-#~ msgid "Priority:"
-#~ msgstr "Öncelik:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19277,14 +20101,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ "Çıkış dosyası yaratılamadı: %s\n"
 #~ " %s"
 
-#, fuzzy
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Çıkış dosyası yaratılamadı: %s\n"
-#~ " %s"
-
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
@@ -19410,10 +20226,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "Yazdırılacak olan takvimi önizler"
 
-#, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "%s İçin Parolayı Girin"
-
 #~ msgid "New task list"
 #~ msgstr "Yeni görev listesi"
 
@@ -19470,30 +20282,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Belirlenen paylaşımlı dizin açılamadı."
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Takvim:"
-
-#~ msgid "_Mail:"
-#~ msgstr "İ_leti:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Görevler:"
-
-#~ msgid "Folder _type:"
-#~ msgstr "Dizin _türü:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Başka Bir Kullanıcının Dizinini Aç"
-
-#~ msgid "_Account:"
-#~ msgstr "_Hesap:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "_Dizin Adı:"
-
-#~ msgid "_User:"
-#~ msgstr "_Kullanıcı:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Yeni bir dizin yarat"
@@ -19806,9 +20594,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Yardımcı"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Halen aşağıdaki bağlantılar etkin durumda:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Bağ_lantıları Ara"
 
@@ -20041,9 +20826,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgstr ""
 #~ "Bu ileti dijital olarak imzalanmış, fakat güvenli olduğu kanıtlanmamıştır."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution Hatası"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20144,18 +20926,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgstr "Bu takvimi yazdır"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Hatırlatıcılar"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Başlangıç:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Görev Listesi"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Sınıflandırma"
 
@@ -21318,9 +22088,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Asia"
 #~ msgstr "Asia"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22371,9 +23138,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22437,9 +23201,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Cross City"
 
@@ -25422,9 +26183,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28228,9 +28986,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Shown"
 #~ msgstr "Gösterilen"
 
-#~ msgid "No tasks"
-#~ msgstr "Görev yok"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Açıklama Yok)"
 
@@ -29396,9 +30151,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "Delete news feed"
 #~ msgstr "Tüm _haber grupları:"
 
-#~ msgid "_Mail"
-#~ msgstr "İ_leti"
-
 #~ msgid "_Weather"
 #~ msgstr "_Hava Durumu"
 
@@ -30329,9 +31081,6 @@ msgstr "%s (%%%d tamamlandı)"
 #~ msgid "This message contains invalid recipients:"
 #~ msgstr "Bu ileti geçersiz alıcılar içeriyor:"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "%s için .newsrc dosyası oluşturulamadı: %s"
-
 #~ msgid "Waiting for connection to LDAP server..."
 #~ msgstr "LDAP sunucuyla bağlantı bekleniyor..."
 
diff --git a/po/uk.po b/po/uk.po
index 4496cc189e..b95fc9c062 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -22,6 +22,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Переглядач мінікартки адресної книги Evolution"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Контакти:"
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Вікно Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -47,16 +57,6 @@ msgstr "картки"
 msgid " card"
 msgstr "1 картка"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Контакти:"
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Вікно Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Типова адреса синхронізації:"
@@ -72,73 +72,20 @@ msgstr "Не вдалося завантажити %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Не вдалося зчитати блок адреса програми \"Пілот\""
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Теки автозавершення"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "Ідентифікатор сертифіката:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Контакти"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Перевірочний компонент Evolutuion."
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Переглядач мінікартки адресної книги Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Анонімний доступ до сервера LDAP"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Неможливо автентифікуватися.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sВведіть пароль для %s (користувач %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -181,42 +128,46 @@ msgstr "_Контакти:"
 msgid "Create a new contacts group"
 msgstr "Створити нову групу ярликів"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "На вдалося пройти автентифікацію на сервері LDAP"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "Неможливо виконати запит на Кореневому DSE"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "Відповідь сервера не містить підтримуваних баз пошуку"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: addressbook/gui/component/addressbook-config.c:1245
 msgid "This server does not support LDAPv3 schema information"
 msgstr "Цей сервер не підтримує схему інформації LDAPv3"
 
-#: addressbook/gui/component/addressbook-config.c:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "Помилка при отриманні схеми інформації"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Очікування..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Зондування %s"
@@ -224,8 +175,8 @@ msgstr "Зондування %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -233,7 +184,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Особисте"
@@ -283,20 +234,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Анонімний доступ до сервера LDAP"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Неможливо автентифікуватися.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Адресна книга"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sВведіть пароль для %s (користувач %s)"
+#: 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
+#: 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
+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
+#: 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 "Контакти"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -316,6 +289,68 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Теки автозавершення"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Контакти"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "Ідентифікатор сертифіката:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Налаштовування поштових рахунків"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Перевірочний компонент Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+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
 msgid "  S_how Supported Bases "
 msgstr " Показати підтримувані бази "
@@ -337,6 +372,7 @@ msgstr " Показати підтримувані бази "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -409,7 +445,7 @@ msgstr "_Контакти:"
 msgid "Address Book Properties"
 msgstr "Джерело адресної книги"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Завжди"
@@ -424,110 +460,100 @@ msgid "Basic"
 msgstr "Основні"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Кольори"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "З'єднання"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "Відокремлене _ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Відокремлене _ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Межа завантаження:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr ""
 "Для автентифікації на сервері Evolution буде використовувати електрону адресу"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Підтримувані бази пошуку"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Ніколи"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Один рівень"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Вибір кольору"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "Простір по_шуку: "
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "Простір по_шуку: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Пошук"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -537,7 +563,7 @@ msgstr ""
 "LDAP лише, якщо\n"
 "він підтримує SSL або TLS."
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -555,7 +581,7 @@ msgstr ""
 "TLS, бо\n"
 "ваше з'єднання вже захищене."
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -568,19 +594,19 @@ msgstr ""
 "що ваше з'єднання не буде безпечним, та ви будете уразливі до порушення "
 "безпеки."
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Всі нижчі рівні"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Підтримувані бази пошуку"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -592,7 +618,7 @@ msgstr ""
 "залишите це поле порожнім - пошук виконуватиметься з кореневого елементу "
 "сервера."
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -608,13 +634,13 @@ msgstr ""
 "Простір пошуку \"Один рівень\" включає тільки елементи, які знаходяться на "
 "один рівень нижче\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -625,7 +651,7 @@ msgstr ""
 "великого\n"
 "значення сповільнить роботу записної книжки."
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -635,7 +661,7 @@ msgstr ""
 "оберете тут \"Ел.адреса\" ви мусите мати анонімний доступ до вашого сервера "
 "LDAP"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -644,7 +670,7 @@ msgstr ""
 "Назва цього сервера, що буде показана в вашому списку тек Evolution.\n"
 "Воно використовується тільки для показу."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -655,132 +681,139 @@ msgstr ""
 "Існує список стандартних портів. Запитайте вашого системного адміністратора\n"
 "який порт слід зазначити."
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Формат часу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "Використовувати _SSL/TLS:"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Використовувати відокремлену назву (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Використовувати електронну адресу:"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Усякий раз коли можливо"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Контакти:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Межа завантаження:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Сп_осіб реєстрації:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "Ім'я:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Порт:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Пріоритет:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "База по_шуку:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Назва _сервера:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "кожні"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "За_тримка (в хвилинах):"
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Використовувати безпечне з'єднання (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "картки"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 #, fuzzy
 msgid "connecting-tab"
 msgstr "Повторне встановлення з'єднання з %s"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 #, fuzzy
 msgid "general-tab"
 msgstr "Загальне"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "хвилини"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 #, fuzzy
 msgid "searching-tab"
 msgstr "Пошук"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Видалити все"
+msgid "Select Contacts from Address Book"
+msgstr "Вибрати контакти з книги адрес"
 
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "Видалити все"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "Показати список контактів"
@@ -803,23 +836,16 @@ msgstr "Додати до контактів"
 msgid "Unnamed Contact"
 msgstr "Неназваний контакт"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "Джерело"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Вибрати контакти з книги адрес"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Інтерфейс вибору імені у книзі адрес Evolution"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -892,143 +918,143 @@ msgid "<b>Work</b>"
 msgstr "Робочий тиждень"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Адреса _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "Адреса:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "Річниця:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Помічник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Дата народження:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Болонья"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "Календар"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Місто:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Компанія"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Редактор контактів"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "Країна:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Відділ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL зайнятості:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Повне ім'я..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Домашня"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 #, fuzzy
 msgid "MSN Messenger"
 msgstr "Поштове повідомлення"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Електронна адреса:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Керівник"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Прізвисько:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "Нотатки:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Інша"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "А/С:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1056,9 +1082,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Робота"
@@ -1091,23 +1117,39 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"Ви впевнені, що хочете\n"
+"стерти ці контакти?"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Редаговане"
 
@@ -2088,100 +2130,118 @@ msgstr "Замбія"
 msgid "Zimbabwe"
 msgstr "Зімбабве"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "Надіслати повідомлення"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Неназваний список"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-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-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Порто"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Групове"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Джерело"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Новий контакт"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Поля для запису"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Змінено"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "Відсутній редактор категорій."
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Цей контакт належить до таких категорій:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "Оберіть серед наступних параметрів"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "Нігер"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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 "Не вдалося знайти віджета для поля: \"%s\""
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+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:280
 msgid "Contact Quick-Add"
 msgstr "Швидке додавання контакту"
@@ -2202,22 +2262,6 @@ msgstr "Повне ім'я:"
 msgid "E-_mail:"
 msgstr "Ел.пошта"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"Ви впевнені, що хочете\n"
-"стерти ці контакти?"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"Ви впевнені, що хочете\n"
-" стерти ці контакти?"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Адреса _2:"
@@ -2372,8 +2416,8 @@ msgstr "Редактор контактів"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Книга"
 
@@ -2434,6 +2478,459 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "Складний пошук"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, fuzzy
+msgid "List Members"
+msgstr "Члени"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+#, fuzzy
+msgid "E-mail"
+msgstr "Ел.пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Організація"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Бостон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Групове"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Автомобільний телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Робота"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Болонья"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "Мобільний телефон"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "Особисте"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Примітки"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Посада:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Ел.пошта"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Домашній факс"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Успішно"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Репозиторій поза мережею"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, fuzzy
+msgid "Address Book does not exist"
+msgstr "Адресна книга не існує"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+#, 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:58
+msgid "Permission denied"
+msgstr "Доступ заборонено"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "Картки не знайдено"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, fuzzy
+msgid "Contact ID already exists"
+msgstr "Ідентифікатор картки вже існує"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "Протокол не підтримується"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Скасовано"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+msgstr "Не вдалося відкрити загальну теку: %s"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "Збій автентифікації."
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "Вимагається автентифікація"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+#, fuzzy
+msgid "No such source"
+msgstr "Неправильне повідомлення"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "Інша помилка"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, 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/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Не вдається відкрити книгу адрес. Це означає, що або ви\n"
+"вказали неправильний URI, або не працює сервер LDAP"
+
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+msgstr ""
+"Ця версія Evolution не має підтримки LDAP. Якщо вам\n"
+"потрібна підтримка LDAP в Evolution, ви повинні\n"
+"встановити LDAP з указаного нижче посилання, а потім\n"
+"скомпілювати версію Evolution з CVS.\n"
+
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, 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"
+"вказали неправильний URI, або не працює сервер LDAP"
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "Не вдалося відкрити адресну книгу"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"Кількість карток, що відповідають запиту перевищує кількість,\n"
+"яку сервер здатен повернути, або кількість, яку Evolution може\n"
+"відобразити. Зробіть ваш запит більш специфічним або підвищить\n"
+"обмеження у властивостях серверу цієї книги адрес."
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"Час виконання запиту перевищує обмеження серверу або обмеження\n"
+"встановлене для цієї книги адрес. Зробіть ваш запит більш \n"
+"специфічним або підвищить обмеження у властивостях серверу цієї книги адрес."
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "Механізм цієї книги адрес не спроможний проаналізувати цей запит."
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "Механізм цієї книги адрес відмовився виконати цей запит."
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "Помилка додавання списку"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Помилка додавання картки"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Помилка модифікування списку"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Помилка модифікації картки"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "Помилка видалення списку"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Помилка видалення картки"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"При відкритті картки %d  буде також відкрито нове вікно %d.\n"
+"Ви справді бажаєте відкрити всі ці картки?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s вже існує\n"
+"Хочете переписати?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "список"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Перенести картку у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Скопіювати картку у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Перенести картки у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Копіювати картки у"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Вибрати контакти з книги адрес"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Декілька VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "vCard для %s"
+
+#.
+#. * 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"
@@ -2449,8 +2946,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Запит"
 
@@ -2505,9 +3002,10 @@ msgstr "Адресна книга"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Зберегти як VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2575,7 +3073,7 @@ msgid "Cut"
 msgstr "Вирізати"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2586,18 +3084,8 @@ msgstr "Скопіювати"
 msgid "Paste"
 msgstr "Вставити"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Стерти"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Поточний вигляд"
 
@@ -2613,7 +3101,7 @@ msgstr ""
 "Щоб використовувати її знову потрібно перезавантажити Evolution"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Будь-яка категорія"
@@ -2654,21 +3142,6 @@ msgstr "Категорії"
 msgid "Company Phone"
 msgstr "Телефон компанії"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Ел.пошта"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Ел.пошта 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Ел.пошта 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Прізвище"
@@ -2708,29 +3181,14 @@ msgstr "Йорданія"
 msgid "Manager"
 msgstr "Керівник"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Мобільний телефон"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Прізвисько"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Примітки"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Офіс"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Організація"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Інший факс"
@@ -2784,21 +3242,29 @@ msgstr "Не прочитано"
 msgid "Web Site"
 msgstr "Сайт"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Ширина"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Висота"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "Поле"
@@ -2815,10 +3281,6 @@ msgstr "Текстова модель"
 msgid "Max field name length"
 msgstr "Максимальна довжина імені поля"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Ширина стовпчика"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2847,433 +3309,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Члени"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "Ел.пошта"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Бостон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Групове"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Автомобільний телефон"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Робота"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Болонья"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Особисте"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Посада:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Домашній факс"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Успішно"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Репозиторій поза мережею"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, fuzzy
-msgid "Address Book does not exist"
-msgstr "Адресна книга не існує"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-#, 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:57
-msgid "Permission denied"
-msgstr "Доступ заборонено"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Картки не знайдено"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, fuzzy
-msgid "Contact ID already exists"
-msgstr "Ідентифікатор картки вже існує"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "Протокол не підтримується"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Скасовано"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-msgstr "Не вдалося відкрити загальну теку: %s"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "Збій автентифікації."
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "Вимагається автентифікація"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS недоступна"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-#, fuzzy
-msgid "No such source"
-msgstr "Неправильне повідомлення"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "Інша помилка"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, 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/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 LDAP server is unreachable."
-msgstr ""
-"Не вдається відкрити книгу адрес. Це означає, що або ви\n"
-"вказали неправильний URI, або не працює сервер LDAP"
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-msgstr ""
-"Ця версія Evolution не має підтримки LDAP. Якщо вам\n"
-"потрібна підтримка LDAP в Evolution, ви повинні\n"
-"встановити LDAP з указаного нижче посилання, а потім\n"
-"скомпілювати версію Evolution з CVS.\n"
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, 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"
-"вказали неправильний URI, або не працює сервер LDAP"
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "Не вдалося відкрити адресну книгу"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Кількість карток, що відповідають запиту перевищує кількість,\n"
-"яку сервер здатен повернути, або кількість, яку Evolution може\n"
-"відобразити. Зробіть ваш запит більш специфічним або підвищить\n"
-"обмеження у властивостях серверу цієї книги адрес."
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"Час виконання запиту перевищує обмеження серверу або обмеження\n"
-"встановлене для цієї книги адрес. Зробіть ваш запит більш \n"
-"специфічним або підвищить обмеження у властивостях серверу цієї книги адрес."
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "Механізм цієї книги адрес не спроможний проаналізувати цей запит."
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "Механізм цієї книги адрес відмовився виконати цей запит."
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "Цей запит не було завершено відповідним чином."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "Ви хочете змінити зміни?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "_Скасувати"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Помилка додавання списку"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Помилка додавання картки"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Помилка модифікування списку"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Помилка модифікації картки"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Помилка видалення списку"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Помилка видалення картки"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"При відкритті картки %d  буде також відкрито нове вікно %d.\n"
-"Ви справді бажаєте відкрити всі ці картки?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s вже існує\n"
-"Хочете переписати?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Переписати"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "Помилка запису %s: %s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "список"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Перенести картку у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Скопіювати картку у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Перенести картки у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Копіювати картки у"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Вибрати контакти з книги адрес"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Декілька VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "vCard для %s"
-
-#.
-#. * 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: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-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Ширина стовпчика"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3320,11 +3358,6 @@ msgstr "Редактор пошти Evolutuion."
 msgid "VCard (.vcf, .gcrd)"
 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.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3336,6 +3369,11 @@ msgstr "Надрукувати вибрані контакти"
 msgid "Print contact"
 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"
 msgstr "Tahoma 10 пт"
@@ -3522,18 +3560,6 @@ msgstr "_Список контактів"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Неможливо відкрити повідомлення"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Картки не знайдено"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3591,6 +3617,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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Неможливо відкрити повідомлення"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Картки не знайдено"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Помилка при завантаженні типової книги адрес."
@@ -3603,11 +3641,12 @@ msgstr "Вхідний файл"
 msgid "No filename provided."
 msgstr "Не вказано назви файлу."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Неназваний список"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Ввід пароля"
@@ -3640,126 +3679,55 @@ msgstr "Типовий пріоритет:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Неможливо зчитати програмний блок завдань \"Пілота\""
 
-#: 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
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Календар"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Налаштуйте ваш часовий пояс, Календар та Список завдань "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-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
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Переглядач iTip/iMip з календарю Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Сигнал Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Компонент відображення поштової теки Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Перевірочний компонент Evolutuion."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Завдання"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-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:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Сигнал Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: 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 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 "Закрити"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Показати пізніше"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Час засипання (в хвилинах)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "Ви_правити зустріч"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Немає опису."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3768,12 +3736,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3785,7 +3753,7 @@ msgstr ""
 "Замість цього Evolution буде показувати звичайне вікно\n"
 "нагадування."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3802,19 +3770,20 @@ msgstr ""
 "\n"
 "Ви впевнені, що бажаєте виконати цю програму?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Конструктор для послуги сповіщення"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Не вдалось ініціалізувати Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Не вдалось ініціалізувати gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Не вдалося створити фабрику послуги сповіщення"
 
@@ -3927,61 +3896,46 @@ 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:27
+#: 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:28
+#: 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:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Показати номера тижнів у навігаторі дат"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Зведення містить"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Опис містить"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Коментар містить"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Опис містить"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Інше"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3993,126 +3947,137 @@ msgstr ""
 "\n"
 "Дійсно стерти ці завдання?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "повертає менше ніж"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "діб"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Властивості..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Завантаження календаря..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: 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:1234
 msgid "New appointment"
 msgstr "Нова зустріч"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Зустріч"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Засідання"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Створити новий запит на засідання"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Нова щоденна зустріч"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "_Щоденна зустріч"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Створити нову зустріч"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "Нова Каледонія"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "Календар"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Створити нову теку"
@@ -4143,15 +4108,36 @@ msgstr "Перегляд тижня"
 msgid "Month View"
 msgstr "Перегляд місяця"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Зведення містить"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Опис містить"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Коментар містить"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Опис містить"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Інше"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Помилка під час відкриття календаря"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Метод не підтримується під час відкриття календарю"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Відказано в доступі при відкриття календарю"
 
@@ -4160,19 +4146,6 @@ msgstr "Відказано в доступі при відкриття кале�
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Неможливо відкрити теку у '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI, який відобразить календар"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Спосіб перегляду для відображення"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Параметри звукових сповіщень"
@@ -4243,7 +4216,7 @@ msgstr "додатковий час кожні"
 msgid "hours"
 msgstr "години"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4262,14 +4235,14 @@ msgstr "Основи"
 msgid "Date/Time:"
 msgstr "Дата й час:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Показати повідомлення"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Відтворити звук"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4285,6 +4258,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
 msgid "Summary:"
 msgstr "Зведення:"
@@ -4323,10 +4297,110 @@ msgstr "хвилин"
 msgid "start of appointment"
 msgstr "початок зустрічі"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "Необхідно вказати назву файлу."
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+#, fuzzy
+msgid "Calendar Properties"
+msgstr "Помилка iCalendar"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "Нова Каледонія"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Тип:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Увімкнено"
 
@@ -4342,19 +4416,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Увімкнути"
 
@@ -4379,164 +4453,177 @@ msgid "60 minutes"
 msgstr "60 хвилин"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Сповіщення"
+#, 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 "Календарна інформація"
+
+#: 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/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "Відображати"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "Увімкнути"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: 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:563
 msgid "Friday"
 msgstr "П'ятниця"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Хвилини"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Понеділок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_Ндл"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Субота"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Показати нагадування"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: 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:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Неділя"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "_Завдання на сьогодні:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "Чтв"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Список завдань"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Четвер"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Час"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Часовий пояс:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Формат часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Вівторок"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "_Тиждень починається:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Середа"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Робочий тиждень"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Робочі дні:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 годин (дп/пп)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 години"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Додати"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: 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:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "Стискати вихідні дні при перегляді місяцю"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_День починається:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "Відображати"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4546,146 +4633,46 @@ msgstr "Відображати"
 msgid "_Edit"
 msgstr "_Редагування"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Відповісти про зайнятість"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "Птн"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "Загальне"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Прибирати виконані завдання через"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "Пнд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "_Запізнілі завдання:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "Сбт"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: 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:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "Розділювачі _часу:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "Втр"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "Срд"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "Перед початком кожної зустрічі"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "Необхідно вказати назву файлу."
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "Метод, необхідний для завантаження \"%s\", не підтримується"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Помилка iCalendar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "Нова Каледонія"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Тип:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "тижнів"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4766,83 +4753,83 @@ msgstr "%s  Ви внесли зміни. Забути ці зміни та он
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  Ви не зробили змін, поновити вікно редагування?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "Помилка під час перевірки: %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " до "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Виконано "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Виконано "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Обумовлені завдання"
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Обумовлені завдання "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Не вдалося оновити об'єкт!"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Виправити зустріч"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: 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:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: 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:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Немає зведення"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Зберегти як..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Внесені в цей елемент зміни може бути скасовано, якщо прийде оновлення по ел."
 "пошті"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Неможливо отримати поточну версію!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "Помилка під час перевірки: %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " до "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Виконано "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Виконано "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Обумовлені завдання"
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Обумовлені завдання "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4971,27 +4958,27 @@ msgstr "Доручити:"
 msgid "Enter Delegate"
 msgstr "Ввести делегата"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Зустріч"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Нагадування"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Повторення"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Засідання"
 
@@ -5003,7 +4990,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Неправильна дата початку"
 
@@ -5093,10 +5080,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5115,15 +5102,15 @@ msgstr "Потрібно вказати організатора."
 msgid "At least one attendee is required."
 msgstr "Потрібен хоча б один учасник."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "Доручити..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5411,26 +5398,19 @@ msgstr "Скасувати зміни"
 msgid "Save Event"
 msgstr "Календарні події"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Виберіть імпортер"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+msgid "Select destination"
 msgstr "Вибрати теку призначення для імпорту цих даних"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Календар"
+msgid "_Destination"
+msgstr "Стерти цю теку"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Список завдань"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5459,38 +5439,44 @@ msgid "% _Complete"
 msgstr "% виконання:"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Високий"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Низький"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Звичайний"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Не розпочато"
 
@@ -5528,11 +5514,11 @@ msgstr "Адреса сторінки WWW:"
 msgid "Assignment"
 msgstr "Призначення"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Неправильна дата виконання"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Не вдалося відкрити адресну книгу"
@@ -5541,8 +5527,9 @@ msgstr "Не вдалося відкрити адресну книгу"
 msgid "Con_fidential"
 msgstr "Кон_фіденційне"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Опис:"
@@ -5697,101 +5684,56 @@ msgstr "%s на %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s для невідомого типу перемикача"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Загальне"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Приватне"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Конфіденційне"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Дата завершення"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Дата початку"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Зведення"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Вільний"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Зайнятий"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "Пн"
+#: 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-model-tasks.c:302
-msgid "S"
-msgstr "Пд"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Без заголовку"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-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-model-tasks.c:304
-msgid "W"
-msgstr "Зх"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "Дата ви_конання:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Географічне положення потрібно вводити у такому форматі: \n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Стан:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "Пріоритет:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Ні"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Адреса сторінки WWW:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:872
-msgid "Recurring"
-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-cal-model.c:874
-msgid "Assigned"
-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%"
@@ -5837,17 +5779,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 msgid "Updating objects"
 msgstr "Оновити об'єкти"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "Відкрити"
 
@@ -5857,41 +5808,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: 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:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "Вставити"
 
@@ -5949,78 +5901,157 @@ msgstr "Пріоритет"
 msgid "Start date"
 msgstr "Дата початку"
 
+#: 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:11
 msgid "Task sort"
 msgstr "Сортування завдання"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Нова зустріч..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Нова щоденна подія"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Нове засідання"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Нове завдання"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Вибрати гілку"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Стерти..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "Опублікувати інформацію про зайнятість"
 
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Скопіювати до теки..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "Перенести в теку..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "За_планувати зустріч..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "Переслати як i_Calendar"
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "Стерти цей екземпляр"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Стерти всі екземпляри"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Сьогодні"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Перейти на дату..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "_Параметри..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Дата завершення"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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
@@ -6044,36 +6075,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i хвилинне поділення"
+#. 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 "дп"
+
+#. 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 "пп"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "дп"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "пп"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i хвилинне поділення"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6182,10 +6213,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Немає</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Стан:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6215,7 +6242,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Гаразд"
 
@@ -6428,59 +6455,55 @@ msgstr "Долучений файл не містить правильно сф�
 msgid "The attachment has no viewable calendar items"
 msgstr "Долучений файл не містить елементів календаря, які можна переглянути"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Неможливо оновити календарний файл!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Оновлення виконано\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "Неможливо оновити стан учасника, бо елемент вже не існує"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "Об'єкт є неправильним і не може бути оновлений\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "Ця відповідь не від поточного учасника. Додати його як учасника?"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "Неможливо оновити стан учасника, бо поточний стан не правильний!\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "Трапилась помилка в системі CORBA\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "Неможливо знайти об'єкт\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "Ви не маєте прав для оновлення календарю\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "Стан учасника оновлено!\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "Неможливо оновити стан учасника!\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Видалення завершено"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Елемент відіслано!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Елемент не може бути відіслано!\n"
 
@@ -6597,28 +6620,6 @@ msgstr "Доручено"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "За межами офісу"
@@ -6679,7 +6680,34 @@ msgstr "Час початку зібрання:"
 msgid "Meeting _end time:"
 msgstr "Час завершення зібрання:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B %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.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 %d.%m.%Y"
+
+#. 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 "%d.%m.%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "Введіть пароль для %s"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6688,21 +6716,19 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Відкривання завдань на %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6711,53 +6737,112 @@ msgstr ""
 "Помилка на %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Завершення завдання..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Стирання вибраних об'єктів"
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Викреслення"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Завдання"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Немає зустрічей."
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Завантаження зображень"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Відкрити в %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Турін"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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
+#, fuzzy
+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_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Компонент відображення поштової теки Evolutuion."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Перевірочний компонент Evolutuion."
+
+#: 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 "Квітень"
@@ -6895,6 +6980,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Відказано в доступі при відкриття календарю"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Не вдалося відкрити адресну книгу"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1."
@@ -7114,7 +7216,7 @@ msgid "Contacts: "
 msgstr "Контакти:"
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Перегляд друку"
 
@@ -7126,68 +7228,78 @@ msgstr "Надрукувати елемент"
 msgid "Print Setup"
 msgstr "Параметри друку"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d вибрано"
+msgstr[1] "%d вибрано"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Завантаження зображень"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "Завдання"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Нове завдання"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Список завдань"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Створити нову завдання"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI, що буде показано у теці завдань"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Не вдалося завантажити завдання в \"%s\""
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7199,11 +7311,11 @@ msgstr ""
 "\n"
 "Дійсно стерти ці завдання?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Не питати знову."
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "Надрукувати завдання"
 
@@ -8857,7 +8969,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Готуємо теку '%s' для переходу в режим offline"
@@ -8950,33 +9062,6 @@ msgstr "Неправильні аргументи до (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Помилка виконання фільтрованого пошуку: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Неможливо проаналізувати пошуковий вираз: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Помилка виконання пошукового виразу: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(співпадають всі) потребує єдиного логічного результату"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Виконання запиту на невідомий заголовок: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9010,7 +9095,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Отримання %d повідомлень"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Неможливо проаналізувати пошуковий вираз: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Помилка виконання пошукового виразу: %s:\n"
+"%s"
+
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(співпадають всі) потребує єдиного логічного результату"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(співпадають всі) потребує єдиного логічного результату"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Виконання запиту на невідомий заголовок: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9021,15 +9151,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr ""
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Неможливо проаналізувати запит паролю gpg."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9038,27 +9168,27 @@ msgstr ""
 "Потрібен пароль, щоб відкрити ключ для \n"
 "користувача: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Відмінено."
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Неможливо відкрити секретний ключ: отримано 3 неправильних пароля."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Неочікувана відповідь від GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Неможливо зашифрувати: не визначено жодного отримувачів"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9069,89 +9199,69 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "Збій GPG %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr ""
 "Неможливо перевірити підпис повідомлення: не вдалося створити тимчасовий "
 "файл: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Цю частину повідомлення підписано цифровим підписом"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Тіло містить"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Неможливо отримати повідомлення від редактора"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Не вдалося створити канал до блокіратора: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Не вдалося запустити блокіратор: %s"
-
-#: 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 "Неможливо заблокувати '%s': помилка протоколу з блокиратором"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Не вдалося заблокувати %s"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9172,6 +9282,26 @@ msgstr "Не вдалось зробити блокування за допом�
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Не вдалось зробити блокування за допомогою flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Не вдалося створити канал до блокіратора: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Не вдалося запустити блокіратор: %s"
+
+#: 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 "Неможливо заблокувати '%s': помилка протоколу з блокиратором"
+
+#: 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"
@@ -9422,7 +9552,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Неправильна автентифікація від сервера."
 
@@ -9622,7 +9752,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "Ідентифікатор сертифіката:"
 
 #: camel/camel-smime-context.c:360
@@ -9639,7 +9769,7 @@ msgstr "Неможливо створити контекст декодуван�
 msgid "Failed to add data to CMS encoder"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Неможливо автентифікуватися.\n"
@@ -9710,99 +9840,99 @@ msgstr "Не вдалося отримати теку: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Неможливо отримати повідомлення %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Помилка підпису сертифікату"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Редагувати підпис"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Сервер: %s, Тип: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Збій команди IMAP: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Не вдалося знайти сертифікат для \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "Не вдалося знайти загальний алгоритм."
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Створити правило з повідомлення"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Неможливо створити контекст декодування S/MIME."
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Неможливо з'єднатись з сервером LDAP"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Команди не реалізовано"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9819,16 +9949,26 @@ msgstr "Не вдалося отримати теку: %s: %s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "Не вдалося створити теку: неприпустима операція у цьому сховище"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "Неможливо стерти теку: %s: неправильна операція"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "Неможливо перейменувати теку: %s: неправильна операція"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "Смітник"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9950,7 +10090,7 @@ msgstr "Використання ключа не підтримує підпис
 msgid "Error in application verification"
 msgstr "Помилка при перевірці додатку"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9963,11 +10103,11 @@ msgstr ""
 "Відбиток:       %s\n"
 "Підпис:         %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "ГАРАЗД"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "НЕПРАВИЛЬНИЙ"
 
@@ -9991,7 +10131,7 @@ msgstr ""
 "Бажаєте прийняти його?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -10006,7 +10146,7 @@ msgstr ""
 "\n"
 "Бажаєте прийняти його?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -10015,7 +10155,7 @@ msgstr ""
 "Проблема сертифікату: %s\n"
 "Подавець: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -10024,7 +10164,7 @@ msgstr ""
 "Сертифікат має неправильний домен: %s\n"
 "Подавець: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10033,7 +10173,7 @@ msgstr ""
 "Строк дії сертифікату вийшов: %s\n"
 "Подавець: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10047,17 +10187,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Неможливо проаналізувати URL \"%s\""
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Помилка збереження \"%s\": %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Неправильне повідомлення %s в %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
@@ -10066,11 +10206,6 @@ msgstr "Неможливо скопіювати або перенести пов
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "Неможливо стерти теку: %s: немає такої теки"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "Неможливо перейменувати теку: %s: неправильна операція"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10087,10 +10222,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "Не вдалося закрити тимчасову теку: %s"
 
 #: 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 "Перевіряти нову пошту в усіх теках"
@@ -10125,6 +10262,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10144,26 +10282,322 @@ msgstr "Під'єднуватись до IMAP серверу з використ
 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: %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 "Не вдалося отримати теку: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Не вдалося отримати теку: %s: %s"
+
+#: 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: %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:429
+#, 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
+#, c-format
+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:140
+#: 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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "З'єднання скасовано"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Невідома помилка"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Неможливо під'єднатися до POP серверу %s: Відсутня підтримка потрібного "
+"механізму автентифікації."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sВведіть SMTP пароль для %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Ім'я теки \"%s\" не є коректним тому, що містить символ \"%c\""
+
+#: 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: %s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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: %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: %s"
+
+#: 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "Операцію скасовано"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Сервер несподівано розірвав з'єднання: %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:1089
-msgid "Unknown error"
-msgstr "Невідома помилка"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10208,21 +10642,21 @@ msgstr "Не вдалося створити каталог %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Не вдалося завантажити зведення для %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Пошук змінених повідомлень."
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -10238,25 +10672,25 @@ msgstr ""
 "Неможливо отримати повідомлення: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Неправильне повідомлення"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Цього повідомлення зараз не існує"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "Не вдалося знайти тіла повідомлення у відповіді на FETCH."
 
@@ -10298,23 +10732,6 @@ msgstr "Неможливо з'єднатись з сервером LDAP"
 msgid "Command:"
 msgstr "Компанія"
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Теки"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Показувати лише підписані теки"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "Замінити запропонований сервером простір назв тек"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Простір назв"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10338,86 +10755,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "Для зчитування та збереження пошти на серверах IMAP."
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "Сервер IMAP %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "IMAP сервіс для %s на %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS недоступна"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "З'єднання скасовано"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "Неможливо під'єднатисья до IMAP серверу %s в безпечному режимі: %s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "Розширення SSL/TLS не підтримується"
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "Збій при встановленні сеансу SSL"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, fuzzy, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "Не вдалося з'єднатись з %s (порт %d): %s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "Сервер IMAP %s не підтримує запитаного типу автентифікації %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "Ви не ввели пароль."
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10428,25 +10802,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Теки \"%s\" не існує"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Ім'я теки \"%s\" не є коректним тому, що містить символ \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "Батьківська тека не дозволяє розміщувати підтеки"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10454,7 +10821,7 @@ msgstr "Батьківська тека не дозволяє розміщува
 msgid "Cannot create folder `%s': folder exists."
 msgstr "Не вдалося отримати теку: %s: %s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Невідома батьківська тека: %s"
@@ -10560,58 +10927,58 @@ msgstr ""
 "файлах mbox.Також може бути використано для читання дерева тек в стилі  Elm, "
 "Pine або Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Корінь сховища %s не є абсолютним шляхом"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Сховище %s не є каталог"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "локальне сховище не містить тека Вхідні"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Файл локальної пошти %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: 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"
@@ -10677,7 +11044,7 @@ msgstr "Не вдалось стерти теку \"%s\": %s"
 msgid "not a maildir directory"
 msgstr "каталог не Maildir"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -11014,7 +11381,7 @@ msgid "Server rejected username/password"
 msgstr ""
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -11023,8 +11390,8 @@ msgid "User cancelled"
 msgstr "Скасовано користувачем"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11033,48 +11400,48 @@ msgstr "Скасовано користувачем"
 msgid "Cannot get message %s: %s"
 msgstr "Неможливо отримати повідомлення %s: %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "Помилка автозбереження файлу: %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "Не вдалося закрити тимчасову теку: %s"
@@ -11199,7 +11566,7 @@ msgstr "Не вдалося отримати групу: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Не вдалося відіслати повідомлення: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11252,8 +11619,8 @@ msgstr "Немає повідомлення з UID %s"
 msgid "Retrieving POP message %d"
 msgstr "Отримання повідомлення POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Невідома причина"
 
@@ -11708,7 +12075,7 @@ msgstr "%.0fМб"
 msgid "%.0fG"
 msgstr "%.0fГб"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "долучення"
 
@@ -11753,6 +12120,103 @@ msgstr "Тип MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Показувати долучення автоматично"
 
+#: 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 "Неможливо відкрити повідомлення"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Неможливо отримати повідомлення від редактора"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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.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 ""
+"Не вдалося створити вікно редагування:\n"
+"Неможливо активувати керуючий елемент обрання адреси."
+
+#: 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 ""
+"Не вдалось створити вікно редактора:\n"
+"Неможливо активізувати компонент редактора HTML.\n"
+"Будь ласка, впевніться що у вас встановлено\n"
+"коректну версію gtkhtml та libgtkhtml.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Не вдалося створити вікно редактора:\n"
+"Неможливо активувати компонент HTML-редактора."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
+"відредагувати.)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Адреса призначення"
@@ -11835,211 +12299,135 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Attach file(s)"
 msgstr "Долучити файл(и)"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr ""
-"Завжди підписувати повідомлення при використанні цього облікового рахунку"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Неможливо відкрити повідомлення"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Неможливо отримати повідомлення від редактора"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "(Неназване повідомлення)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Відкрити файл"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Згенеровано автоматично"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Підпис:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Підготувати повідомлення"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Долучити файл до повідомлення"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Не вдалося створити вікно редагування:\n"
-"Неможливо активувати керуючий елемент обрання адреси."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Не вдалось створити вікно редактора:\n"
-"Неможливо активізувати компонент редактора HTML.\n"
-"Будь ласка, впевніться що у вас встановлено\n"
-"коректну версію gtkhtml та libgtkhtml.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Не вдалося створити вікно редактора:\n"
-"Неможливо активувати компонент HTML-редактора."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Редактор містить не текстове тіло повідомлення яке неможливо "
-"відредагувати.)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Наступне непрочитане повідомлення"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Ви хочете змінити зміни?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Не вдалося створити канал: %s"
+msgid "Don't Recover"
+msgstr "Не імпортувати"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Не вдалося зберегти файл підпису: %s"
+msgid "Recover"
+msgstr "Видалити"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Не вдалося зберегти файл підпису: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "Скасувати зміни"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Ви хочете змінити зміни?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Помилка збереження ярликів."
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Не імпортувати"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Увага: змінене повідомлення"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Помилка збереження ярликів."
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Ви впевнені, що хочете стерти цю неназвану зустріч?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Видалити"
+msgid "Discard Changes"
+msgstr "Скасувати зміни"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Зберегти повідомлення як..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Не вдалося створити канал: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Наступне непрочитане повідомлення"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Не вдалося зберегти файл підпису: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Увага: змінене повідомлення"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "Долучити файл до повідомлення"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12176,7 +12564,8 @@ msgstr ""
 "Файл з цією назвою вже існує.\n"
 "Переписати його?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Переписати файл?"
 
@@ -12353,81 +12742,97 @@ msgstr "Обрати час для порівняння"
 msgid "_Filter Rules"
 msgstr "Правила фільтрування"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Помилка у регулярному виразі \"%s\":\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Файл '%s' не існує або не є звичайним файлом."
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Оновлення засідання"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "Відокремлене _ім'я:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Необхідно вказати назву файлу."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Видалення теки %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Файл '%s' не існує або не є звичайним файлом."
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Призначення"
+msgid "Missing folder."
+msgstr "Видалення теки %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Необхідно вказати теку."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Не було вибрано сервера"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Помилка у регулярному виразі \"%s\":\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Необхідно вибрати дату."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Призначення"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Цьому фільтру необхідно дати назву."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Віртуальній теці необхідно дати назву."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Необхідно вказати назву файлу."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Необхідно вказати теку."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Не було вибрано сервера"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12440,66 +12845,11 @@ msgstr "Виберіть файл"
 msgid "<b>Then</b>"
 msgstr "<b>Обумовлена дата:</b> "
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Вибір теки"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Важливо"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Потрібно зробити"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Пізніше"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Тест"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Назва правила: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Без заголовку"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Обумовлена дата:</b> "
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Виконати дії"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "якщо відповідає всім критеріям"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "якщо відповідає будь-якому критерію"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "вхідні"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "вихідні"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12591,6 +12941,77 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Обумовлена дата:</b> "
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "якщо відповідає всім критеріям"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "якщо відповідає будь-якому критерію"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Виконати дії"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Доручено"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Адресати"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Відповісти"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Включити:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "вхідні"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "вихідні"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12721,7 +13142,7 @@ msgstr "не відмічено"
 msgid "Junk Test"
 msgstr "Червень"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Позначка"
@@ -12761,7 +13182,7 @@ msgstr "Вийти з програми"
 msgid "Play Sound"
 msgstr "Відтворити звук"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Прочитано"
 
@@ -12831,9 +13252,9 @@ msgstr "починається на"
 msgid "Stop Processing"
 msgstr "Зупинити обробку"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "Тема"
@@ -12896,110 +13317,62 @@ msgstr "Тема не містить"
 msgid "Virtual _Folders"
 msgstr "Віртуальні теки"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Додати"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Джерело вірт.папок"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Вподобання редактора"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Налаштовування вподобань, включаючи безпеку та відображення повідомлень"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Налаштовування перевірки правопису, підписів та редактора повідомлень"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Налаштовування поштових рахунків"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Редактор облікових рахунків Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Редактор пошти Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Компонент відображення поштової теки Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Компонент поштового виконавчого зведення Evolutuion."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Пошта"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "Вподобання пошти"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Типово]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Назва рахунку:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Протокол"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Без назви"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Мова(и)"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "_Додати підпис"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Підписи"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Переслане повідомлення"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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 "Створити віртуальну теку з пошуку..."
 
@@ -13037,279 +13410,459 @@ msgstr "<клацніть тут для вибору теки>"
 msgid "Create New Folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Назва теки:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "Вірт.теки"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Вхідні"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Завантаження..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, fuzzy
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "Неможливо скопіювати або перенести повідомлення до Віртуальної Теки"
 
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Перенести"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "Скасувати завдання"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Вибрати теку"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Скопіювати"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Створити нову теку"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Перейменувати теку \"%s\" на:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Перейменувати теку"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Вигляд"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Відкрити у новому вікні"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Перенести"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Нова тека"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Перейменувати"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "Вірт.теки"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "Пошта"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "Виправити як нове повідомлення..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "Друкувати"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Відповісти у список"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Відповісти всім"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "Переслати"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 #, fuzzy
 msgid "Fla_g Completed"
 msgstr "Завершено"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 #, fuzzy
 msgid "Cl_ear Flag"
 msgstr "Очистити"
 
-#: mail/em-folder-view.c:787 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 "Позначити прочитаним"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Позначити як неважливе"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Позначити як непрочитане"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Позначити як важливе"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "Відновити"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "Перенести в теку..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "Скопіювати в теку..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Застосувати фільтри"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Правила фільтрування"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Створити правило з повідомлення"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "Віртуальна теку по темі"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "Віртуальна тека відправника"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "Віртуальна тека отримувачів"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "Фільтр списку листування"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "Віртуальна тека відправника"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Фільтр теми"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Фільтр відправника"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Фільтр отримувачів"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Фільтр списку розсилки"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Фільтр відправника"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Типово"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "Надрукувати повідомлення"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Скопіювати посилання"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Клацніть щоб додати завдання"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Копія:"
+
+#: 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 "Прих.копія:"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+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 ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Схема не підтримується"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Неможливо перевірити підпис листа"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Неможливо перевірити підпис листа"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Клацніть щоб додати завдання"
+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 "Редагувати підпис"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Перервано"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "Шифрування PGP"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr "Частину external-body сформовано неправильно."
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Вказівник на сайт FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Вказівник на локальний файл (%s) на сайті \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Вказівник на локальний файл (%s)"
+
+#: 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\")"
+
+#: 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 ""
+
+#. 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
@@ -13317,12 +13870,7 @@ msgstr "Клацніть щоб додати завдання"
 msgid "Matches: %d"
 msgstr "Відповідності:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Прив'язано"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
@@ -13331,12 +13879,7 @@ msgstr ""
 "Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
 "складено."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Редагувати підпис"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
@@ -13345,22 +13888,17 @@ msgstr ""
 "Це повідомлення підписано цифровим підписом, але перевірку ідентичності не "
 "складено."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Редагувати підпис"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13369,237 +13907,96 @@ msgstr ""
 "Вхідний маркер input_token містить неправильний підпис або підпис який не "
 "може бути перевірено."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Перервано"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "Шифрування PGP"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "Ідентифікатор сертифіката:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Сертифікат ще не дійсний"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Запізнілі завдання:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Вбудований перегляд"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Прибрати"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Сторінка %d з %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Отримання повідомлення %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr "Частину external-body сформовано неправильно."
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Вказівник на сайт FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Вказівник на локальний файл (%s) на сайті \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Вказівник на локальний файл (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Вказівник на віддалені дані (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Вказівник на невідомі зовнішні дані (типу \"%s\")"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Перенесення повідомлень"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Від"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Відповідати на"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "До"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Копія:"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Прих.копія:"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr "Поштова програма"
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Дата"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "долучення %s"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Неможливо розібрати MIME повідомлення. Показується як є."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Схема не підтримується"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Неможливо перевірити підпис листа"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Неможливо перевірити підпис листа"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "Кожен рік"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "Один день"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Один тиждень"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "Один місяць"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13607,25 +14004,57 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Неможливо зберегти %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Не вдалося отримати теку: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Неможливо зберегти %s: %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"Неможливо скопіювати дескриптор файлу: %s\n"
+"%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"Неможливо створити файл виводу: %s\n"
+" %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "Не вдалось пройти реєстрацію на POP сервері %s: %s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
+msgstr "Неможливо створити канал до '%s': %s"
+
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
+#, fuzzy, c-format
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "Неможливо створити канал до '%s': %s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:2480
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "Не вдалось розв'язати назву машини \"%s\": %s"
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"Неможливо створити файл виводу: %s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13636,99 +14065,83 @@ msgstr "Зберегти як..."
 msgid "untitled_image.%s"
 msgstr "Неназване повідомлення"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "Відповісти відправнику"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Відкрити посилання у переглядачі веб"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Відіслати повідомлення у список..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Додати відправника в адресну книгу"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Відкрити в %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Цей сервер не підтримує схему інформації LDAPv3"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Підписатися"
 
-#: mail/em-subscribe-editor.c:637 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 "Тека"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Будь ласка, виберіть сервер."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Не було вибрано сервера"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Більше не показувати це повідомлення."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Фільтри"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Переслане повідомлення"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "%a, %Y-%m-%d у %H:%M, %%s написав:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Повідомлення"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Зберегти повідомлення як..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Адреса"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Пошта від %s"
@@ -13748,11 +14161,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13865,166 +14278,167 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Поштові Рахунки"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Поштові Рахунки"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Виконати дії"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Типовий пріоритет:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "Сповіщення про нову пошту"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "Попереджувати при надсиланні HTML повідомлень тим, хто їх не бажає"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 ""
 "Попереджувати при надсиланні повідомлень, де визначені тільки отримувачі "
 "прихованої копії"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14080,8 +14494,9 @@ msgid "Spell check inline"
 msgstr "Перевірка правопису"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Типовий пріоритет:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14224,37 +14639,69 @@ msgstr ""
 msgid "spamd port"
 msgstr "Імпорт"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: 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/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Налаштовування перевірки правопису, підписів та редактора повідомлень"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Налаштовування поштових рахунків"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Редактор пошти Evolutuion."
+msgid "Evolution Mail"
+msgstr "Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Редактор пошти Evolutuion."
+msgid "Evolution Mail accounts configuration control"
+msgstr "Редактор облікових рахунків Evolution"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
+msgstr "Редактор пошти Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail composer"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer configuration control"
 msgstr "Редактор пошти Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Компонент поштового виконавчого зведення Evolutuion."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: 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:96
+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"
@@ -14262,15 +14709,15 @@ msgstr "Evolution імпортує вашу пошту з Elm"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Будь ласка, зачекайте"
 
@@ -14302,19 +14749,51 @@ msgid "Select folder to import into"
 msgstr "Виберіть імпортер"
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Імпортування"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Імпортування файлів"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Редактор пошти Evolutuion."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Сканування %s"
@@ -14324,7 +14803,7 @@ msgstr "Сканування %s"
 msgid "Priority Filter \"%s\""
 msgstr "Фільтр пріоритетів \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14350,7 +14829,7 @@ msgstr ""
 "замість пріоритетів. Перевірте важливі фільтри та впевніться,\n"
 "що все працює як планувалося."
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14362,7 +14841,7 @@ msgstr ""
 "які не підтримуються Evolution.\n"
 "Ці функції буде проігноровано."
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14376,24 +14855,24 @@ msgstr ""
 "буде перетворено для перевірки присутності або відсутності\n"
 "рядка в тілі повідомлення."
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution імпортує ваші старі дані Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Параметри"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Поштові фільтри"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14427,128 +14906,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Редактор облікових рахунків Evolution"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "Сервер:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "Ім'я користувача:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "Шлях:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Пошта до %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Тема - %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Пошта від %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "Список розсилки %s"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Відповісти"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Додати правило фільтрування"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d вибрано"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d не відіслано"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Чернетки"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d відіслано"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d не відіслано"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d всього"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d не відіслано"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d вибрано"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Нове поштове повідомлення"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Поштове повідомлення"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Створити нове поштове повідомлення"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "Нова віртуальна тека"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Поштові фільтри"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Створити нову теку"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI, який відобразить календар"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: 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:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "Назва"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14558,12 +15048,12 @@ msgstr ""
 "інформація\" можна не заповнювати, якщо ви не бажаєте щоб ця інформація "
 "відсилалась разом з вашими повідомленнями."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14571,15 +15061,15 @@ msgstr ""
 "Будь ласка введіть інформацію про сервер вхідної пошти. Якщо ви не впевнені, "
 "спитайте вашого системного адміністратора або постачальника Інтернет."
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "Оберіть серед наступних параметрів"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "Відсилання пошти"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14588,11 +15078,11 @@ msgstr ""
 "впевнені, спитайте вашого системного адміністратора або постачальника "
 "Інтернет."
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Керування рахунками"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14605,14 +15095,6 @@ msgstr ""
 "Введіть назву цього рахунку у нижньому полі. Ця назва буде використовуватись "
 "тільки для показу."
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "Перевірка служби"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "З'єднання з сервером..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14934,7 +15416,8 @@ msgid "Execute Command..."
 msgstr "Виконати команду..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Фіксованої ширини:"
 
 #: mail/mail-config.glade.h:82
@@ -15265,350 +15748,455 @@ msgstr "колір"
 msgid "description"
 msgstr "опис"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "Автентифікація"
 
-#: mail/mail-errors.xml.in.h:2
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP сервер %s не підтримує автентифікацію %s типу"
+
+#. 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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Ви впевнені, що хочете стерти цей рахунок?"
+#. 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-errors.xml.in.h:4
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "Ви впевнені, що хочете відкрити всі %d повідомлень у окремих вікнах?"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
 
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Остаточно видалити всі стерті повідомлення з усіх тек"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"Ви надсилаєте повідомлення у HTML форматі. Будь ласка, впевніться, що\n"
+"наступні одержувачі бажають та мають змогу приймати пошту у форматі HTML:\n"
 
-#: mail/mail-errors.xml.in.h:6
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
+msgid "_Send"
+msgstr "Відправити"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
 
-#: mail/mail-errors.xml.in.h:8
+#. 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: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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Ви впевнені, що хочете відіслати повторно всі %d повідомлень?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Неможливо скопіювати теку: %s"
+msgid "Use default drafts folder?"
+msgstr "Відкриття типової теки завдань"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Не вдалося отримати теку: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Неможливо відкрити теку чернеток цього облікового рахунку.\n"
+"Бажаєте використати типову теку чернеток?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Неможливо створити тимчасовий каталог: %s"
+msgid "Use _Default"
+msgstr "Типово"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"Неможливо створити каталог\n"
-"%s\n"
-"Помилка: %s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "Ви впевнені, що хочете відкрити всі %d повідомлень у окремих вікнах?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Не вдалось стерти теку:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Неможливо стерти теку: %s: немає такої теки"
+msgid "_Expunge"
+msgstr "Викреслити"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Теки \"%s\" не існує."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Остаточно видалити всі стерті повідомлення з усіх тек"
 
-#: mail/mail-errors.xml.in.h:20
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Неможливо перейменувати теку: %s"
+msgid "_Empty Trash"
+msgstr "Спорожнити смітник"
 
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Не вдалося відкрити загальну теку: %s"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Ви скинули повідомлення, бажаєте вийти все одно?"
 
-#: mail/mail-errors.xml.in.h:22
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Не вдалося відкрити загальну теку: %s"
+msgid "Error while {0}."
+msgstr ""
+"Помилка під час \"%s\":\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Неможливо відкрити повідомлення"
+msgid "Error while performing operation."
+msgstr ""
+"Помилка під час здійснення операції:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
+#. 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:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Неможливо перейменувати теку: %s: немає такої теки"
+msgid "Enter password."
+msgstr "Ввід пароля"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"Помилка при завантаженні інформації фільтру:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 msgid "Cannot save to directory \"{0}\"."
 msgstr "Не вдалося створити каталог %s: %s"
 
-#: mail/mail-errors.xml.in.h:28
+#. 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
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "Неможливо записати в \"%s\"\n"
 " %s"
 
-#: mail/mail-errors.xml.in.h:29
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "_Додати підпис"
-
-#: mail/mail-errors.xml.in.h:30
-msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+msgid "Cannot create the save directory, because \"{1}\""
 msgstr ""
+"Неможливо створити каталог\n"
+"%s\n"
+"Помилка: %s"
 
-#: mail/mail-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Не вдалося зберегти файл підпису: %s"
-
-#: mail/mail-errors.xml.in.h:32
-#, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Стерти \"%s\""
-
-#: mail/mail-errors.xml.in.h:33
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "Delete account?"
-msgstr "Стерти вибрані контакти"
+msgid "Cannot create temporary save directory."
+msgstr "Неможливо створити тимчасовий каталог: %s"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-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/mail-errors.xml.in.h:35
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Ви хочете змінити зміни?"
-
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Не стирати"
+msgid "File exists but cannot overwrite it."
+msgstr "Файл існує, переписати?"
 
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
 #, fuzzy
-msgid "Enter password."
-msgstr "Ввід пароля"
+msgid "File exists but is not a regular file."
+msgstr "Файл '%s' не існує або не є звичайним файлом."
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
 #, fuzzy
-msgid "Error loading filter definitions."
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
-"Помилка при завантаженні інформації фільтру:\n"
+"Не вдалось стерти теку:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"Помилка під час здійснення операції:\n"
-"%s"
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Неможливо стерти теку: %s: немає такої теки"
 
-#: mail/mail-errors.xml.in.h:40
-#, fuzzy
-msgid "Error while {0}."
+#. mail:no-delete-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."
 msgstr ""
-"Помилка під час \"%s\":\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Файл існує, переписати?"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Неможливо перейменувати теку: %s: немає такої теки"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Файл '%s' не існує або не є звичайним файлом."
+msgid "Delete \"{0}\"?"
+msgstr "Стерти \"%s\""
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
-msgstr ""
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
+#, fuzzy
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "Дійсно видалити теку \"%s\"?"
 
-#: mail/mail-errors.xml.in.h:44
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-rename-folder-exists 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 ""
+
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "Автентифікація"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "Неможливо перейменувати теку: %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "Не вдалося відкрити загальну теку: %s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Ви надсилаєте повідомлення у HTML форматі. Будь ласка, впевніться, що\n"
-"наступні одержувачі бажають та мають змогу приймати пошту у форматі HTML:\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Не вдалося отримати теку: %s: %s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "Дійсно видалити теку \"%s\"?"
+msgid "Cannot open source \"{1}\""
+msgstr "Не вдалося відкрити загальну теку: %s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "Ви ще не ввели потрібну інформацію."
 
-#: mail/mail-errors.xml.in.h:55
+#. 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 ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"Наступна вірт.тека(и):\n"
-"%sвикористовувала видалену теку:\n"
-"    \"%s\"\n"
-"та її було оновлено."
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Не стирати"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"Наступна вірт.тека(и):\n"
-"%sвикористовувала видалену теку:\n"
-"    \"%s\"\n"
-"та її було оновлено."
+msgid "Could not save signature file."
+msgstr "Не вдалося зберегти файл підпису: %s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "_Додати підпис"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "Скасувати зміни"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP сервер %s не підтримує автентифікацію %s типу"
+msgid "Do you wish to save your changes?"
+msgstr "Ви хочете змінити зміни?"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15616,85 +16204,97 @@ msgstr ""
 "\n"
 "Бажаєте зберегти зміни?"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Неможливо відкрити теку чернеток цього облікового рахунку.\n"
-"Бажаєте використати типову теку чернеток?"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "Типово"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "Скасувати зміни"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Відкриття типової теки завдань"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "Ви ще не ввели потрібну інформацію."
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Ви скинули повідомлення, бажаєте вийти все одно?"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "Не можна створювати два облікових рахунки з спільним ім'ям."
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Теки \"%s\" не існує."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "Скасувати зміни"
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Спорожнити смітник"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"Наступна вірт.тека(и):\n"
+"%sвикористовувала видалену теку:\n"
+"    \"%s\"\n"
+"та її було оновлено."
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "Викреслити"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "Відправити"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"Наступна вірт.тека(и):\n"
+"%sвикористовувала видалену теку:\n"
+"    \"%s\"\n"
+"та її було оновлено."
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-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:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Зондування %s"
@@ -15703,135 +16303,135 @@ msgstr "Зондування %s"
 msgid "Working"
 msgstr "Робота"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Фільтрування теки"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Отримання пошти"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "Не вдалося зберегти пошту в тимчасовому файлі %s: %s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Відсилання повідомлення %d з %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "Збій декодування повідомлення."
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Виконано."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Збереження повідомлення у теці"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Перенесення повідомлень у %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Копіювання повідомлень у %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Сканування тек в \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Переслані повідомлення"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Відкриття сховища %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Видалення теки %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Збереження теки \"%s\""
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Оновлення теки"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Викреслення теки"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Імпортування %s як %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Локальні теки"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Отримання повідомлення %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "Отримання %d повідомлень"
 msgstr[1] "Отримання %d повідомлень"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "Збереження %d повідомлень"
 msgstr[1] "Збереження %d повідомлень"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15840,7 +16440,7 @@ msgstr ""
 "Неможливо створити файл виводу: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15849,11 +16449,11 @@ msgstr ""
 "Помилка при збереженні до: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Збереження долучення"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15862,17 +16462,17 @@ msgstr ""
 "Неможливо створити файл виводу: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Не вдалось записати дані: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Закриття з'єднання з %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Повторне встановлення з'єднання з %s"
@@ -15938,24 +16538,24 @@ msgstr "Оновлення..."
 msgid "Waiting..."
 msgstr "Очікування..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Користувач скасував операцію."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Введіть пароль для %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Ввід пароля"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "Запам'ятати цей пароль"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "Пам'ятати цей пароль до закінчення поточного сеансу"
 
@@ -15997,89 +16597,94 @@ msgstr "Переслане повідомлення"
 msgid "Invalid folder: `%s'"
 msgstr "Відкривання теки %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Встановлення вірт.теки: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
 msgstr "Оновлення вірт.тек для uri: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
+msgstr "Оновлення вірт.тек для uri: %s"
+
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "Вірт.теки"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Виправлення віртуальної теки"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "Нова віртуальна тека"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Не прочитано"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Прочитано"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Дано відповідь"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Декілька непереглянутих повідомлень"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Декілька повідомлень"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Найнижче"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Нижче"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Вище"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Найвище"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Сьогодні %I:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Вчора %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %I:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Створення списку повідомлень"
 
@@ -16112,43 +16717,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16195,21 +16800,6 @@ msgstr "Підписатися"
 msgid "_Unsubscribe"
 msgstr "Відписатися"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Оболонка Evolutuion."
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Перевірочний компонент Evolutuion."
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16217,111 +16807,55 @@ msgstr "80%"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Перейменувати цю групу ярликів"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Перемикнути стан показу панелі тек"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Прибрати панель ярликів"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Типовий пріоритет:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Типовий пріоритет:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Інтерфейс конфігурації пошти"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: shell/apps_evolution_shell.schemas.in.in.h:6
 #, fuzzy
 msgid "ID or alias of the component to be shown by default at start-up."
 msgstr "Показувати долучення в тілі без обумовлення."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Відкриття типової теки завдань"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Відкриття типової теки завдань"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Відкриття типової теки завдань"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Відкриття типової теки завдань"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Перемикнути стан показу панелі тек"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Перемикнути стан показу панелі ярликів"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Ел.пошта"
@@ -16330,6 +16864,32 @@ msgstr "Ел.пошта"
 msgid "Brought to you by"
 msgstr "Створено для вас"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Невідома помилка"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Неправильні аргументи"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Неможливо зареєструватись на OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "Не знайдено конфігураційної бази даних"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "Загальна помилка"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Без імені)"
@@ -16469,11 +17029,11 @@ msgstr "Неможливо виконати gpg."
 msgid "_Import"
 msgstr "Імпорт"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Закриття з'єднань..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Параметри Evolution"
 
@@ -16510,11 +17070,35 @@ msgstr "Назва теки не може містити символ \"#\"."
 msgid "'.' and '..' are reserved folder names."
 msgstr "\".\" і \"..\" є зарезервованими назвами тек."
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr ""
+"Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до "
+"автономної роботи."
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution у процесі переходу до автономної роботи."
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr ""
+"Ximian Evolution зараз у автономному режимі. Клацніть на цю кнопку для "
+"переходу до роботи у мережі."
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Пошта до %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "Здається, програму GNOME Pilot не встановлено у цій системі"
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Помилка виконання %s."
@@ -16528,14 +17112,15 @@ msgid "Bug buddy could not be run."
 msgstr "Не вдалося запустити Bug buddy"
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Про Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "Працювати у мережі"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "Працювати автономно"
 
@@ -16543,48 +17128,6 @@ msgstr "Працювати автономно"
 msgid "Work Offline"
 msgstr "Робота не на лінії"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr ""
-"Ximian Evolution у мережевому режимі. Клацніть на цю кнопку для переходу до "
-"автономної роботи."
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution у процесі переходу до автономної роботи."
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr ""
-"Ximian Evolution зараз у автономному режимі. Клацніть на цю кнопку для "
-"переходу до роботи у мережі."
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Неправильні аргументи"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Неможливо зареєструватись на OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "Не знайдено конфігураційної бази даних"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "Загальна помилка"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr ""
@@ -16660,6 +17203,44 @@ msgid "Click OK to close these connections and go offline"
 msgstr ""
 "Для закриття цих з'єднань та переходу до автономної роботи клацніть на OK"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "Календар"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Контакти:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "Пошта"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Завдання:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Тип теки:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Відкрити теки інших користувачів"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "Обліковий рахунок:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Назва _теки:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Користувач:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Помічник встановлення Evolution"
@@ -16704,6 +17285,21 @@ msgstr ""
 "\n"
 "Щоб зберегти налаштовування клацніть кнопку \"Завершити\"."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Оболонка Evolutuion."
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Перевірочний компонент Evolutuion."
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Клацніть \"Імпорт\" для початку імпортування файлу в Evolution. "
@@ -16767,13 +17363,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution може імпортувати дані з таких файлів:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16803,58 +17399,49 @@ msgstr ""
 "Сподіваємось вам сподобається результат нашої праці та\n"
 "ми із нетерпінням чекаємо на ваші внески!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Дякуємо\n"
 "Команда розробників Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Більше не казати"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Починати в режимі оффлайн"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Починати в режимі онлайн"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Примусити відновлення конфігураційних файлів з Evolution 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Записувати інформацію налагодження всіх компонентів у файл."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16863,14 +17450,80 @@ msgstr ""
 "%s: --online та --offline не можуть бути використані разом.\n"
 "  Use %s --help для більш докладної інформації.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "З'єднання"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Неможливо зв'язатись з оболонкою Ximian Evolutuion."
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Асистент з Облікових рахунків Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "Ідентифікатор сертифіката:"
@@ -17123,12 +17776,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "Ідентифікатор сертифіката:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Ідентифікатор картки вже існує"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17345,6 +17992,12 @@ msgstr "Тема - %s"
 msgid "Certificate Signature Value"
 msgstr "Помилка підпису сертифікату"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Ідентифікатор картки вже існує"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17386,12 +18039,12 @@ msgstr "Початкова тема повідомлення."
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Не вдалося перейменувати теку \"%s\": %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17455,7 +18108,8 @@ msgid "Select all contacts"
 msgstr "Вибрати всі контакти"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Надіслати повідомлення до обраних контактів."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17487,8 +18141,8 @@ msgstr "Переглянути поточний контакт."
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "Дії"
@@ -17506,7 +18160,8 @@ msgid "_Preview Pane"
 msgstr "Панель _перегляду"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Зберегти як VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17641,11 +18296,21 @@ msgstr "Переглянути поточний контакт."
 msgid "Week"
 msgstr "Тиждень"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Робочий тиждень"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 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 "Закрити"
+
 #: 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
@@ -17973,6 +18638,16 @@ msgstr "Інвертувати вибір"
 msgid "_Threaded Message List"
 msgstr "Розбитий на гілки список повідомлень"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "За_крити"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18221,7 +18896,8 @@ msgid "Open the selected message in a new window"
 msgstr "Відкрити вибране повідомлення у новому вікні"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr ""
 "Відкрити вибране повідомлення у редакторі для його повторного надсилання"
 
@@ -18340,58 +19016,46 @@ msgstr "Віртуальна тека за темою..."
 msgid "_Attached"
 msgstr "До_лучити"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "С_копіювати у теку"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "С_творити фільтр з повідомлення"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Перейти _до"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "В _тілі"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Більше"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Показати повідомлення"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "Пере_нести в теку"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "_Наступне повідомлення"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "_Звичайне відображення"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "Відкрити повідомлення"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "_Попереднє повідомлення"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "Про_цитовано"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Надіслати повтор_но..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Інструменти"
@@ -18400,16 +19064,6 @@ msgstr "_Інструменти"
 msgid "_Undelete"
 msgstr "Відновити"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "За_крити"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Долучити"
@@ -18807,6 +19461,11 @@ msgstr "Вподобання пошти"
 msgid "_Send / Receive"
 msgstr "Відіслати / отримати"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "З_найти зараз"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "За компанією"
@@ -18879,10 +19538,6 @@ msgstr "Дата ви_конання:"
 msgid "With _Status"
 msgstr "Встановити стан"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "_Завдання"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -19043,6 +19698,34 @@ msgstr "Інший..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+msgid "Evolution Error"
+msgstr "Помилка Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Інформація про засідання"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Компонент Зведення Evolutuion."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Надіслані повідомлення та чернетки"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19161,6 +19844,35 @@ msgstr "Тест"
 msgid "Find _Now"
 msgstr "Знайти зараз"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"Хочете переписати?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Неможливо записати в \"%s\"\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Неможливо записати в \"%s\"\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19172,8 +19884,135 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% виконано)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Адресна книга"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Переглядач мінікартки адресної книги Evolution"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Адреса _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Болонья"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Переглядач iTip/iMip з календарю Evolution"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Сигнал Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Не вдалось ініціалізувати gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Неможливо відкрити теку у '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI, який відобразить календар"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Спосіб перегляду для відображення"
+
+#~ msgid "Display a message"
+#~ msgstr "Показати повідомлення"
+
+#~ msgid "Alerts"
+#~ msgstr "Сповіщення"
+
+#~ msgid "Time"
+#~ msgstr "Час"
+
+#~ msgid "_General"
+#~ msgstr "Загальне"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Виберіть імпортер"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Календар"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Список завдань"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Неможливо оновити календарний файл!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI, що буде показано у теці завдань"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Не вдалося завантажити завдання в \"%s\""
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Компонент відображення поштової теки Evolutuion."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "Віртуальна тека відправника"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Фільтр відправника"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Неможливо зберегти %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Неможливо зберегти %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Не вдалось розв'язати назву машини \"%s\": %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI, який відобразить календар"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Перейменувати цю групу ярликів"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Прибрати панель ярликів"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Відкриття типової теки завдань"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Відкриття типової теки завдань"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Відкриття типової теки завдань"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Відкриття типової теки завдань"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Перемикнути стан показу панелі тек"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Перемикнути стан показу панелі ярликів"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Неможливо ініціалізувати оболонку Ximian Evolutuion: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Надіслати повтор_но..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19356,9 +20195,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Дружина:"
 
-#~ msgid "_Add"
-#~ msgstr "_Додати"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Робоча"
@@ -19483,18 +20319,6 @@ msgstr "%s (%d%% виконано)"
 #~ "потрібна допомога\n"
 #~ "для отримання цієї інформації."
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Дата по_чатку:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "Дата ви_конання:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "Пріоритет:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19526,13 +20350,6 @@ msgstr "%s (%d%% виконано)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Неможливо скопіювати дескриптор файлу: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19679,10 +20496,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Переглянути календар, що буде надруковано"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Введіть пароль для %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Список завдань"
 
@@ -19742,31 +20555,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Неможливо знайти зазначену загальну теку."
 
-#~ msgid "C_alendar:"
-#~ msgstr "Календар"
-
-#~ msgid "_Mail:"
-#~ msgstr "Пошта"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Завдання:"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Тип теки:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Відкрити теки інших користувачів"
-
-#~ msgid "_Account:"
-#~ msgstr "Обліковий рахунок:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Назва _теки:"
-
-#~ msgid "_User:"
-#~ msgstr "_Користувач:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Створити новий запит на засідання"
@@ -20082,9 +20870,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Помічник"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Зараз активні наступні з'єднання:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "Пошук контактів"
 
@@ -20322,9 +21107,6 @@ msgstr "%s (%d%% виконано)"
 #~ "Це повідомлення підписано цифровим підписом, але перевірку ідентичності "
 #~ "не складено."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Помилка Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20453,18 +21235,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Календарна інформація"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Нагадування"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Починається:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Календарна інформація"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Класифікація"
 
@@ -21507,10 +22277,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgstr "Налаштовування вигляду Зведення Evolution"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Компонент Зведення Evolutuion."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Компонент Зведення Evolutuion."
 
@@ -21731,9 +22497,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Asia"
 #~ msgstr "Азія"
 
-#~ msgid "Aspen"
-#~ msgstr "Аспен"
-
 #~ msgid "Asswan"
 #~ msgstr "Асуан"
 
@@ -22094,9 +22857,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Cork"
 #~ msgstr "Корк"
 
-#~ msgid "Cortez"
-#~ msgstr "Кортез"
-
 #~ msgid "Cuiaba"
 #~ msgstr "Куяба"
 
@@ -23713,9 +24473,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Shown"
 #~ msgstr "Показано"
 
-#~ msgid "No tasks"
-#~ msgstr "Немає завдань"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Без опису)"
 
@@ -24697,9 +25454,6 @@ msgstr "%s (%d%% виконано)"
 #~ msgid "Delete news feed"
 #~ msgstr "Всі новини:"
 
-#~ msgid "_Mail"
-#~ msgstr "Пошта"
-
 #~ msgid "_Weather"
 #~ msgstr "Погода"
 
diff --git a/po/vi.po b/po/vi.po
index f5dfac4ce6..b1c38c16c5 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -20,6 +20,16 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Sửa Sổ địa chỉ"
 
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "Liên lạc: "
+
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "_Cửa sổ Evolution"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -45,16 +55,6 @@ msgstr "card"
 msgid " card"
 msgstr "1 card"
 
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "Liên lạc: "
-
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "_Cửa sổ Evolution"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "Địa chỉ đồng bộ mặc định:"
@@ -70,74 +70,20 @@ msgstr "Không thể nạp %s: %s"
 msgid "Could not read pilot's Address application block"
 msgstr "Không thể đọc khối ứng dụng địa chỉ của pilot"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "Thư mục tự động hoàn chỉnh"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "_ID Chứng nhận:"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-msgstr "Cấu hình tài khoản thư ở đây"
-
-#. 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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "Liên lạc"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Sửa Sổ địa chỉ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Factory popup địa chỉ của Sổ địa chỉ"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Thành phần kiểm tra Evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Bộ xem Minicard sổ địa chỉ evolution"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Thành phần tóm tắt thư của Evolution."
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "Truy cập vô danh tới LDAP server"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-#, fuzzy
-msgid "Evolution folder settings configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "Lỗi xác thực.\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 #, fuzzy
@@ -180,42 +126,46 @@ 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-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: 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:518
+#: 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:822
+#: 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:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, fuzzy
 msgid "Migrating..."
 msgstr "Đang chờ..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Đang \"ping\" %s"
@@ -223,8 +173,8 @@ msgstr "Đang \"ping\" %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -232,7 +182,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "Cá nhân"
@@ -282,20 +232,42 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "Truy cập vô danh tới LDAP server"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "Lỗi xác thực.\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "Sổ địa chỉ"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%sNhập mật khẩu cho %s (người dùng %s)"
+#: 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
+#: 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
+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
+#: 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"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -315,6 +287,69 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "Thư mục tự động hoàn chỉnh"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "Liên lạc"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "_ID Chứng nhận:"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "Cấu hình tài khoản thư ở đây"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Sửa Sổ địa chỉ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Factory popup địa chỉ của Sổ địa chỉ"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Thành phần kiểm tra Evolution"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Thành phần tóm tắt thư của Evolution."
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+#, fuzzy
+msgid "Evolution folder settings configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: 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
 msgid "  S_how Supported Bases "
 msgstr "  _Hiện cơ sở được hỗ trợ "
@@ -336,6 +371,7 @@ msgstr "  _Hiện cơ sở được hỗ trợ "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -408,7 +444,7 @@ msgstr "_Liên lạc:"
 msgid "Address Book Properties"
 msgstr "Nguồn sổ địa chỉ"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "Luôn luôn"
@@ -423,107 +459,97 @@ msgid "Basic"
 msgstr "Cơ bản"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "_Màu sắc"
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "Đang kết nối"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: 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:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "Tên _phân biệt:"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "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:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, fuzzy
 msgid "Find Possible Search Bases"
 msgstr "Cơ sở tìm được hỗ trợ"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "Chung"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "Không bao giờ"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "Một"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "Chọn màu"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: 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:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, fuzzy
 msgid "Search scope:"
 msgstr "_Phạm vị tìm: "
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "Đang tìm"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -532,7 +558,7 @@ 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:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -547,7 +573,7 @@ msgstr ""
 "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:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -558,19 +584,19 @@ 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:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "Con"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "Cơ sở tìm được hỗ trợ"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -580,7 +606,7 @@ 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:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -595,13 +621,13 @@ msgstr ""
 "mục\n"
 "nằm trong cơ sở tìm.\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -609,7 +635,7 @@ msgid ""
 "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:63
+#: 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 "
@@ -618,7 +644,7 @@ 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:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -628,7 +654,7 @@ msgstr ""
 "Evolution.\n"
 "Chỉ được dùng với mục đích hiển thị thôi."
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -639,129 +665,136 @@ msgstr ""
 "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:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "Dạng thức thời gian:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: 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:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "Dùng tên phân biệt (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "Dùng địa chỉ email"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "Bất cứ khi nào có thể"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, fuzzy
 msgid "_Add Contacts Group"
 msgstr "_Liên lạc:"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "_Ngưỡng tải về:"
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "Cách đăng _nhập:"
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "_Tên:"
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "_Số hiệu cổng:"
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "Độ ư_u tiên:"
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "_Cơ sở tìm:"
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "Tên Ser_ver:"
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "_mỗi"
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: 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:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "Dùng kết nối _an toàn (SSL):"
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "card"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "connecting-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "general-tab"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "phút"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "Loại bỏ tất cả"
+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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: calendar/gui/dialogs/cal-prefs-dialog.c:724
 msgid "Remove"
 msgstr "Loại bỏ"
 
+#: 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 "Tên"
+
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "Loại bỏ tất cả"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
 msgid "View Contact List"
@@ -786,23 +819,16 @@ msgstr "Thêm vào liên lạc"
 msgid "Unnamed Contact"
 msgstr "Liên lạc vô danh"
 
-#: 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
-msgid "Name"
-msgstr "Tên"
-
 #: 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
 msgid "Source"
 msgstr "Nguồn"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "Chọn liên lạc từ sổ địa chỉ"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Giao diên chọn tên sổ địa chỉ của Evolution."
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -875,143 +901,143 @@ 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:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
-msgid "Address 2:"
-msgstr "Địa chỉ _2:"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
-#, fuzzy
 msgid "Address:"
 msgstr "Đị_a chỉ:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "_Kỷ niệm"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "Phụ tá"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "Ngày _sinh:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "Bologna"
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "_Lịch:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "Thành p_hố:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "Công ty"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "Bộ hiệu chỉnh liên lạc"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "_Quốc gia:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "Cơ _quan:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "URL rảnh/bận:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "Tên đầ_y đủ..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "Nhà"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "Địa chỉ _email:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "Quản lý"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "Tên _hiệu:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "_Ghi chú:"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr ""
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "Khác"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "Hộp thư _bưu điện:"
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
 msgid "Personal Information"
@@ -1039,9 +1065,9 @@ msgstr "Trang"
 
 #. 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "Công việc"
@@ -1076,23 +1102,35 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+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
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "Có thể sửa"
 
@@ -2071,100 +2109,118 @@ msgstr "Zambia"
 msgid "Zimbabwe"
 msgstr "Zimbabwe"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "_Gửi thông điệp"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "Danh sách vô danh"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "Dịch vụ sẵn sàng"
-
-#: 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 "Địa điểm:"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "_Tên người dùng:"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "Yoro"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "Nhóm"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "Nguồn"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "Liên lạc mới"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "Trường có thể ghi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "Đã thay đổi"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "Liên lạc này thuộc các phân loại này:"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "Nome"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are 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-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "_Gửi thông điệp"
+
+#: 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 "Dịch vụ sẵn sàng"
+
+#: 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 "Địa điểm:"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "_Tên người dùng:"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "Thêm nhanh liên lạc"
@@ -2187,18 +2243,6 @@ msgstr ""
 "\n"
 "E-mail:"
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-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
-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/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "Địa chỉ _2:"
@@ -2352,8 +2396,8 @@ msgstr "contact-list-editor"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "Sách"
 
@@ -2414,6 +2458,460 @@ 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
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+#, 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
+msgid "E-mail"
+msgstr "E-mail"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "Tổ chức"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, fuzzy
+msgid "Position"
+msgstr "Boston"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+#, fuzzy
+msgid "Groupwise"
+msgstr "Nhóm"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+#, fuzzy
+msgid "Phone"
+msgstr "Ponce"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "Công việc"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "Bologna"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: 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
+#, fuzzy
+msgid "personal"
+msgstr "Cá nhân"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "Ghi chú"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+#, fuzzy
+msgid "Job Title"
+msgstr "Tên n_ghề:"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "Email"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+#, fuzzy
+msgid "Home page"
+msgstr "Fax ở Nhà"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "Thành công"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr ""
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "Kho ngoại tuyến"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+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
+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
+#, 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
+#, 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
+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
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "Bị hủy bỏ"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, 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
+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
+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
+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
+#, 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
+msgid "Other error"
+msgstr "Lỗi khác"
+
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  Please check that the path exists "
+"and that you have permission to access it."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là \n"
+"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
+#, 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."
+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
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the server is unreachable."
+msgstr ""
+"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là \n"
+"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
+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 ""
+"Quá nhiều các khớp với truy vấn, nhiều hơn cấu hình của server\n"
+"hoặc cấu hình hiển thị của Evolution. Vui lòng tìm kiếm chính\n"
+"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
+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 ""
+"Thời gian thực hiện truy vấn này vượt quá giới hạn server hoặc giới hạn\n"
+"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
+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
+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
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "Lỗi khi thêm card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "Lỗi khi sửa đổi danh sách"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "Lỗi khi sửa đổi card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "Lỗi khi loại bỏ card"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"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
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s đã tồn tại.\n"
+"Bạn có muốn ghi đè lên nó?"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "danh sách"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "Chuyển Card tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "Chép Card tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+#, fuzzy
+msgid "Move contacts to"
+msgstr "Chuyển các Card tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "Chép các Card tới"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "Chọn liên lạc từ sổ địa chỉ"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "Nhiều VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "VCard cho %s"
+
+#.
+#. * 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 "(không)"
+
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "Email chính"
+
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "Email 2"
+
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "Email 3"
+
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "Chọn hành động"
+
+#: addressbook/gui/widgets/eab-popup-control.c:576
+#, c-format
+msgid "Create a new contact \"%s\""
+msgstr "Tạo liên lạc mới \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:592
+#, c-format
+msgid "Add address to existing contact \"%s\""
+msgstr "Thêm địa chỉ vào liên lạc đã có \"%s\""
+
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "Đang truy vấn sổ địa chỉ..."
+
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "Sửa thông tin liên lạc"
+
+#: addressbook/gui/widgets/eab-popup-control.c:1008
+msgid "Merge E-Mail Address"
+msgstr "Trộn địa chỉ email"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:139
+#, fuzzy, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "và một card khác."
+msgstr[1] "và một card khác."
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "Hiện toàn bộ _header"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "Lưu liên lạc bằng VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "Lưu vào sổ địa chỉ"
+
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
 msgid "No contacts"
@@ -2429,8 +2927,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "Truy vấn"
 
@@ -2485,9 +2983,10 @@ 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "Lưu là VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2555,7 +3054,7 @@ msgid "Cut"
 msgstr "Cắt"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2566,18 +3065,8 @@ msgstr "Sao chép"
 msgid "Paste"
 msgstr "Dán"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "Xoá"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "Khung xem hiện thời"
 
@@ -2593,7 +3082,7 @@ msgstr ""
 "đã 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:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "Bất kỳ phân loại nào"
@@ -2634,21 +3123,6 @@ msgstr "Phân loại"
 msgid "Company Phone"
 msgstr "Điện thoại công ty"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "Email"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "Email 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "Email 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "Tên gia đình"
@@ -2688,29 +3162,14 @@ msgstr "Jordan"
 msgid "Manager"
 msgstr "Quản lý"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "Điện thoại di động"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "Tên hiệu"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "Ghi chú"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "Văn phòng"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "Tổ chức"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "Fax khác"
@@ -2764,21 +3223,29 @@ msgstr "Unst"
 msgid "Web Site"
 msgstr "Web Site"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "Rộng"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "Cao"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "Nhận focus"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "Đã chọn"
+
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "Có con trỏ"
+
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
 msgstr "Trường"
@@ -2795,10 +3262,6 @@ msgstr "Kiểu chữ"
 msgid "Max field name length"
 msgstr "Độ dài tên trường tối đa"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "Độ rộng cột"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2827,434 +3290,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "Bộ tiếp hợp"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "Đã chọn"
-
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "Có con trỏ"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "Thành viên"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "E-mail"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "Boston"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "Nhóm"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "Ponce"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "Công việc"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "Bologna"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "Cá nhân"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "Tên n_ghề:"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "Fax ở Nhà"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "Thành công"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr ""
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "Kho ngoại tuyến"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-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:57
-msgid "Permission denied"
-msgstr "Không đủ quyền truy cập"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "Không có card"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, 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:60
-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:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "Bị hủy bỏ"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, 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:63
-msgid "Authentication Failed"
-msgstr "Xác thực thất bại"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-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:65
-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:67
-#, 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:68
-msgid "Other error"
-msgstr "Lỗi khác"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  Please check that the path exists "
-"and that you have permission to access it."
-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:109
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là \n"
-"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:114
-#, 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."
-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:123
-#, fuzzy
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"Không thể mở sổ địa chỉ này. Nguyên nhân hoặc là \n"
-"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:140
-msgid "Unable to open addressbook"
-msgstr "Không thể mở sổ địa chỉ"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"Quá nhiều các khớp với truy vấn, nhiều hơn cấu hình của server\n"
-"hoặc cấu hình hiển thị của Evolution. Vui lòng tìm kiếm chính\n"
-"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:167
-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 ""
-"Thời gian thực hiện truy vấn này vượt quá giới hạn server hoặc giới hạn\n"
-"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:173
-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:176
-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:179
-msgid "This query did not complete successfully."
-msgstr "Truy vấn không hoàn tất."
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-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:207
-msgid "_Discard"
-msgstr "_Hủy"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "Lỗi khi thêm danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "Lỗi khi thêm card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "Lỗi khi sửa đổi danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "Lỗi khi sửa đổi card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "Lỗi khi loại bỏ danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "Lỗi khi loại bỏ card"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"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:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s đã tồn tại.\n"
-"Bạn có muốn ghi đè lên nó?"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "Ghi đè"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, 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:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "danh sách"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "Chuyển Card tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "Chép Card tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "Chuyển các Card tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "Chép các Card tới"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "Chọn liên lạc từ sổ địa chỉ"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "Nhiều VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "VCard cho %s"
-
-#.
-#. * 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 "(không)"
-
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "Email chính"
-
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "Chọn hành động"
-
-#: addressbook/gui/widgets/eab-popup-control.c:576
-#, c-format
-msgid "Create a new contact \"%s\""
-msgstr "Tạo liên lạc mới \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:592
-#, c-format
-msgid "Add address to existing contact \"%s\""
-msgstr "Thêm địa chỉ vào liên lạc đã có \"%s\""
-
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "Đang truy vấn sổ địa chỉ..."
-
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "Sửa thông tin liên lạc"
-
-#: addressbook/gui/widgets/eab-popup-control.c:1008
-msgid "Merge E-Mail Address"
-msgstr "Trộn địa chỉ email"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:139
-#, fuzzy, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "và một card khác."
-msgstr[1] "và một card khác."
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "Hiện toàn bộ _header"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "Lưu liên lạc bằng VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "Lưu vào sổ địa chỉ"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "Độ rộng cột"
 
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
 msgid "Card View"
@@ -3302,11 +3340,6 @@ msgstr "Bộ soạn thư của Evolution."
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "In phong bì"
-
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
 msgid "Print contacts"
@@ -3318,6 +3351,11 @@ msgstr "In liên lạc được chọn"
 msgid "Print contact"
 msgstr "In liên lạc được chọn"
 
+#: addressbook/printing/e-contact-print-envelope.c:212
+#: addressbook/printing/e-contact-print-envelope.c:233
+msgid "Print envelope"
+msgstr "In phong bì"
+
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
 msgstr "10 pt. Tahoma"
@@ -3504,18 +3542,6 @@ msgstr "_Danh sách liên lạc"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "Không thể mở thông điệp"
-
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "Không có card"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -3573,6 +3599,18 @@ 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "Không thể mở thông điệp"
+
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "Không có card"
+
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
 msgstr "Lỗi nạp sổ địa chỉ mặc định."
@@ -3585,11 +3623,12 @@ msgstr "Tập tin input"
 msgid "No filename provided."
 msgstr "Chưa có tên tập tin."
 
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "Danh sách vô danh"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "Nhập mật khẩu"
@@ -3622,127 +3661,55 @@ msgstr "Độ ưu tiên mặc định:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "Không thể đọc khối ứng dụng ToDo của pilot"
 
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "Công việc và Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "Công việc và Lịch"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Bộ xem lịch iTip/iMip Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Bộ xem lịch iTip/iMip Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Bộ soạn tin Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Bộ soạn tin Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Thành phần hiển thị thư mục của Evolution."
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Thành phần kiểm tra Evolution"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "Công việc"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "Factory Dịch vụ báo động"
-
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:212
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "Bắt đầu:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:214
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:215
 msgid "Ending:"
 msgstr "Kết thúc:"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Báo động Evolution"
 
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "Báo động khi %s"
 
 #: calendar/gui/alarm-notify/alarm-notify.glade.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 "Đón_g"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "Ngủ"
-
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "Thời gian ngủ (phút)"
 
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "_Sửa cuộc hẹn"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "Ngủ"
+
+#: calendar/gui/alarm-notify/alarm-queue.c:881
 #: ui/evolution-message-composer.xml.h:10
 msgid "Open"
 msgstr "Mở"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "Không có mô tả."
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3751,12 +3718,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: calendar/gui/alarm-notify/alarm-queue.c:1069
+#: calendar/gui/alarm-notify/alarm-queue.c:1093
 msgid "Warning"
 msgstr "Cảnh báo"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1064
+#: 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"
@@ -3768,7 +3735,7 @@ msgstr ""
 "gửi thư. Thay vào đó, Evolution sẽ hiển thị một\n"
 "hộp thoại nhắc nhở thông thường:"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3785,19 +3752,20 @@ msgstr ""
 "\n"
 "Bạn có chắc muốn chạy chương trình này không?"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "Đừng hỏi tôi về chương trình này lần nữa."
 
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "Factory Dịch vụ báo động"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "Không thể khởi động Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "Không thể khởi động gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "Không thể tạo factory Dịch vụ thông báo"
 
@@ -3911,61 +3879,46 @@ 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 "Hỏi xác thực khi _xóa mục"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "Hỏi xác thực khi _xóa mục"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
 #, fuzzy
 msgid "Whether to hide completed tasks"
 msgstr "Xoá công việc được chọn"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "Tóm tắt chứa"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "Mô tả chứa"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "Ghi chú chứa"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "Mô tả chứa"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "Không khớp"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "Lịch"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3977,126 +3930,137 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "trả về nhỏ hơn"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "ngày"
 
-#: calendar/gui/calendar-commands.c:431
+#: 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "Thuộc tính..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "Đang nạp lịch..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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:1095
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "Lịch"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "Cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "_Cuộc hẹn"
 
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "Cuộc họp"
 
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "Tạo yêu cầu cuộc họp mới"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "Cuộc hẹn nguyên ngày mới"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "Cuộc hẹn n_guyên ngày"
 
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "Tạo cuộc hẹn mới"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "New Caledonia"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "_Lịch:"
 
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "Tạo thư mục mới"
@@ -4127,15 +4091,36 @@ msgstr "Khung tuần"
 msgid "Month View"
 msgstr "Khung tháng"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "Tóm tắt chứa"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "Mô tả chứa"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "Ghi chú chứa"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "Mô tả chứa"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "Không khớp"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "Lỗi mở server lịch"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "Phương thức mở lịch không được hỗ trợ"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "Không đủ quyền truy cập để mở lịch"
 
@@ -4144,19 +4129,6 @@ msgstr "Không đủ quyền truy cập để mở lịch"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "Không thể mở thư mục trong '%s'"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "URI mà lịch sẽ hiển thị"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "Loại khung xem cần hiển thị"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "Tùy chọn báo động âm thanh"
@@ -4227,7 +4199,7 @@ msgstr ""
 msgid "hours"
 msgstr "giờ"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4246,14 +4218,14 @@ msgstr "Cơ bản"
 msgid "Date/Time:"
 msgstr "Ngày/Giờ:"
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "Hiện thông điệp"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "Phát âm thanh"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4269,6 +4241,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
 msgid "Summary:"
 msgstr "Tóm tắt:"
@@ -4307,10 +4280,110 @@ msgstr "phút"
 msgid "start of appointment"
 msgstr "bắt đầu cuộc hẹn"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, 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
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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 "New Caledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "Danh sách công việc"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "New Caledonia"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "Kiểu:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "URL:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "tuần"
+
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "Bật"
 
@@ -4326,19 +4399,19 @@ msgstr "Không loại bỏ"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Tắt"
 
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "Bật"
 
@@ -4363,164 +4436,177 @@ msgid "60 minutes"
 msgstr "60 phút"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "Báo động"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>Bắt đầu:</b> "
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "Bộ nhắc nhở"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "Thông tin lịch"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>Tới hạn:</b>"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "Tuần làm việc"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 msgid "Calendar and Tasks Settings"
 msgstr "Thiết lập Công việc và Lịch"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
 msgid "Color for overdue tasks"
 msgstr "Màu công việc quá hạn"
 
-#: 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 "Màu công việc trong ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
 msgid "Day _ends:"
 msgstr "Ngày _kết thúc:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "Ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "_Hiển thị"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "_Bật"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+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
 msgid "Friday"
 msgstr "Thứ Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "Giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "Phút"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "Thứ Hai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "_CN"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "Thứ Bảy"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "_Hiện bộ nhắc nhở"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "Hiện số tuần trong bộ duyệt ngày"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "Chủ nhật"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "_Công việc trong ngày:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "_Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "Danh sách công việc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "Thứ Năm"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "Thời gian"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "Múi _giờ:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "Dạng thức thời gian:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "Thứ Ba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "Tuần _bắt đầu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "Thứ Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "Tuần làm việc"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "Ngày làm việc:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 msgid "_12 hour (AM/PM)"
 msgstr "_12 giờ (AM/PM)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 giờ"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "_Thêm ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "Hỏi xác thực khi _xóa mục"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "_Nén ngày nghỉ trong khung tháng"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "_Ngày bắt đầu:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "_Hiển thị"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -4530,146 +4616,46 @@ msgstr "_Hiển thị"
 msgid "_Edit"
 msgstr "_Sửa"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "Yêu cầu thông tin bận/rảnh"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "_Sáu"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "_Chung"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "Ẩ_n công việc hoàn thành sau"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "_Hai"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "Công việc _quá hạn:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "Bả_y"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "_Hiện thời điểm kết thúc cuộc hẹn trong tuần và trong tháng"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "_Chia thời gian:"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "_Ba"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "_Tư"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "trước khi mỗi cuộc hẹn"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, 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:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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 "New Caledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "Danh sách công việc"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-#, fuzzy
-msgid "Calendar Properties"
-msgstr "Lỗi iCalendar"
-
-#: 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "New Caledonia"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "Kiểu:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "URL:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "tuần"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4752,82 +4738,82 @@ msgstr ""
 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?"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr ""
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " tới "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (Đã hoàn thành "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "Đã hoàn thành "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (Đến hạn "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "Đến hạn "
-
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "Không thể cập nhật đối tượng"
 
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "Sửa cuộc hẹn"
 
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "Cuộc hẹn - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: calendar/gui/dialogs/comp-editor.c:911
+#: calendar/gui/dialogs/comp-editor.c:948
 #, c-format
 msgid "Task - %s"
 msgstr "Công việc - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "Mục nhật ký - %s"
 
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "Không có tóm tắt"
 
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "Lưu là..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr ""
 "Thay đổi trên mục này có thể bị hủy nếu bản cập nhật đến qua đường email"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "Không thể lấy phiên bản hiện thời!"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr ""
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " tới "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (Đã hoàn thành "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "Đã hoàn thành "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (Đến hạn "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "Đến hạn "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
 msgid "Could not open source"
@@ -4958,27 +4944,27 @@ msgstr "Ủy nhiệm cho:"
 msgid "Enter Delegate"
 msgstr "Nhập người đại diện"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "Cuộc hẹn"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "Bộ nhắc nhở"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "Đệ quy"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "Lập lịch biểu"
 
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "Cuộc họp"
 
@@ -4990,7 +4976,7 @@ msgstr ""
 msgid "Event with no end date"
 msgstr ""
 
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "Ngày bắt đầu sai"
 
@@ -5080,10 +5066,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -5102,15 +5088,15 @@ msgstr "Cần một tổ chức."
 msgid "At least one attendee is required."
 msgstr "Cần ít nhất một người tham dự."
 
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "Ủ_y nhiệm cho..."
 
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5400,26 +5386,19 @@ msgstr "_Hủy thay đổi"
 msgid "Save Event"
 msgstr "Sự kiện lịch"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
+#: calendar/gui/dialogs/select-source-dialog.c:65
 #, fuzzy
-msgid "Select source"
-msgstr "Chọn bộ nhập"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+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:71
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "Lịch"
+msgid "_Destination"
+msgstr "Xoá thư mục này"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "Danh sách công việc"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -5448,38 +5427,44 @@ msgid "% _Complete"
 msgstr "% hoàn tất"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "Hoàn thành"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "Cao"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "Đang làm"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "Thấp"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "Bình thường"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "Chưa bắt đầu"
 
@@ -5517,11 +5502,11 @@ msgstr "Địa chỉ _Web:"
 msgid "Assignment"
 msgstr "Phân công"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "Ngày đến hạn sai"
 
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "Không thể mở sổ địa chỉ"
@@ -5530,8 +5515,9 @@ msgstr "Không thể mở sổ địa chỉ"
 msgid "Con_fidential"
 msgstr "Tin tưởn_g"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "Mô tả"
@@ -5686,101 +5672,56 @@ msgstr "%s tại %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s cho loại trigger lạ"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "Công cộng"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "Riêng tư"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "Tin tưởng"
-
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "Ngày kết thúc"
-
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "Ngày bắt đầu"
-
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "Tóm tắt"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "Rảnh"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "Bận"
-
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "B"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, fuzzy, c-format
+msgid "Click to open %s"
+msgstr "Nhấn để thêm công việc"
 
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "N"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "Vô danh"
 
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "Đ"
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "Ngày _bắt đầu:"
 
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "T"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "N_gày đến hạn:"
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"Vị trí địa lý phải được nhập theo dạng thức:\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "Trạng thái:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "Độ ư_u tiên:"
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "Không"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Địa chỉ _Web:"
 
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "Lạ"
+#: 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 "Công cộng"
 
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "Đệ quy"
+#: 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 "Riêng tư"
 
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "Đã gán"
+#: 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 "Tin tưởng"
 
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -5826,17 +5767,26 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "Rảnh"
+
+#: 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 "Bận"
+
+#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:646
 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:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "_Mở"
 
@@ -5846,41 +5796,42 @@ 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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "_In..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: 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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "_Dán"
 
@@ -5938,78 +5889,157 @@ msgstr "Độ ưu tiên"
 msgid "Start date"
 msgstr "Ngày bắt đầu"
 
+#: 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 "Tóm tắt"
+
 #: calendar/gui/e-calendar-table.etspec.h:11
 msgid "Task sort"
 msgstr "Loại công việc"
 
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "Cuộc hẹn mớ_i..."
 
-#: calendar/gui/e-calendar-view.c:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "Sự _kiện mọi ngày mới"
 
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "Cuộc họp mới"
 
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "Công việc mới"
 
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 #, fuzzy
 msgid "Select _Today"
 msgstr "Chọn nhánh"
 
-#: calendar/gui/e-calendar-view.c:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "Xóa..."
 
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 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:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "Chép vào thư mục..."
 
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "_Chuyển tới thư mục..."
 
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "Lập lịch _cuộc họp..."
 
-#: calendar/gui/e-calendar-view.c:1291
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "_Chuyển như iCalendar..."
 
-#: calendar/gui/e-calendar-view.c:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "_Xóa lần này"
 
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "Xóa _mọi lần"
 
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "Đi tới ngày _hôm nay"
 
-#: calendar/gui/e-calendar-view.c:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "Đi tới _ngày..."
 
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "T_hiết lập..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "Ngày kết thúc"
+
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+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-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 "Lạ"
+
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "Đệ quy"
+
+#: calendar/gui/e-cal-model.c:913
+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-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
+msgid "No"
+msgstr "Không"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "B"
+
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "N"
+
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "Đ"
+
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "T"
+
+#: 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 ""
+"Vị trí địa lý phải được nhập theo dạng thức:\n"
+"\n"
+"45.436845,125.862501"
+
 #. 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
@@ -6033,36 +6063,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "lệch %02i phút"
+#. 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 "am"
+
+#. 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 "pm"
 
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "am"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "pm"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "lệch %02i phút"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -6170,10 +6200,6 @@ msgstr ""
 msgid "<i>None</i>"
 msgstr "<i>Không</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "Trạng thái:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -6203,7 +6229,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "Đồng ý"
 
@@ -6416,63 +6442,59 @@ msgstr "Đồ đính kèm không chứa thông điệp lịch hợp lệ"
 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:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "Không thể cập nhật tập tin lịch!\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "Hoàn tất cập nhật\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 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:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 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:1824
+#: calendar/gui/e-itip-control.c:1825
 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:1836
+#: calendar/gui/e-itip-control.c:1837
 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:1855
+#: calendar/gui/e-itip-control.c:1856
 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:1858
+#: calendar/gui/e-itip-control.c:1859
 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:1861
+#: calendar/gui/e-itip-control.c:1862
 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:1864
+#: calendar/gui/e-itip-control.c:1865
 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:1867
+#: calendar/gui/e-itip-control.c:1868
 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:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "Hoàn tất loại bỏ"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "Đã gửi!\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "Không thể gửi!\n"
 
@@ -6589,28 +6611,6 @@ msgstr "Ủy nhiệm"
 msgid "In Process"
 msgstr "Trong tiến trình"
 
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-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.
-#: calendar/gui/e-meeting-time-sel-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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.
-#: 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"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "Không chính thức"
@@ -6671,7 +6671,34 @@ msgstr "Lúc _bắt đầu cuộc họp:"
 msgid "Meeting _end time:"
 msgstr "Lúc _kết thúc cuộc họp:"
 
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#. 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, %d %B, %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.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 %d/%m/%Y"
+
+#. 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 "%d/%m/%Y"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+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
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6680,21 +6707,19 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "Đang mở công việc tại %s"
 
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6703,53 +6728,113 @@ msgstr ""
 "Lỗi tại %s:\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "Đang nạp ảnh"
 
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "Đang hoàn tất công việc..."
 
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "Đang xóa đối tượng được chọn..."
 
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "Đang xóa"
 
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "Công việc"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "Không có cuộc hẹn"
 
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "Đang nạp ảnh"
 
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "Mở bằng %s..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task backend for '%s' has crashed."
-msgstr ""
-
-#: calendar/gui/gnome-cal.c:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "Turin"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
+msgid "Calendar and Tasks"
+msgstr "Công việc và Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
+msgid "Configure your timezone, Calendar and Task List here "
+msgstr "Cấu hình múi giờ, lịch và danh sách công việc ở đây "
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "Công việc và Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Bộ xem lịch iTip/iMip Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Bộ soạn tin Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Thành phần hiển thị thư mục của Evolution."
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Thành phần kiểm tra Evolution"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "Lịch"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "Nhiệm _vụ"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "Tháng Tư"
@@ -6887,6 +6972,23 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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 "Không đủ quyền truy cập để mở lịch"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "Không thể mở sổ địa chỉ"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1"
@@ -7106,7 +7208,7 @@ msgid "Contacts: "
 msgstr "Liên lạc: "
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "Xem thử bản in"
 
@@ -7118,68 +7220,78 @@ msgstr "In một mục"
 msgid "Print Setup"
 msgstr "Thiết lập in"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:464
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, 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
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "Đang nạp ảnh"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "Nhiệm _vụ"
 
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "Công việc mới"
 
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "Danh sách công việc"
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "Tạo công việc mới"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "URI của thư mục công việc cần hiển thị"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "Không thể nập những công việc trong `%s'"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -7191,11 +7303,11 @@ msgstr ""
 "\n"
 "Bạn có thật sự muốn xóa những công việc này không?"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "Đừng hỏi tôi lần nữa"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "In công việc"
 
@@ -8848,7 +8960,7 @@ msgstr ""
 msgid "Downloading new messages for offline mode"
 msgstr ""
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "Đang chuẩn bị thư mục '%s' để dùng ngoại tuyến"
@@ -8941,33 +9053,6 @@ msgstr "Đối số không hợp lệ (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "Lỗi thực hiện tìm kiếm bộ lọc: %s: %s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"Không thể phân tích biểu thức tìm kiếm: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"Lỗi thực hiện tìm kiếm theo biểu thức: %s:\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "Đang thực hiện truy vấn trên header lạ: %s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -9000,7 +9085,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "Đang nhận %d thông điệp"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"Không thể phân tích biểu thức tìm kiếm: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"Lỗi thực hiện tìm kiếm theo biểu thức: %s:\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(khớp tất cả) yêu cầu một kết quả đơn"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, 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
+#, 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
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "Đang thực hiện truy vấn trên header lạ: %s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -9011,15 +9141,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "Lỗi phân tích chỉ dẫn GPG UserID."
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "Lỗi phân tích yêu cầu passphrase của GPG."
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -9028,27 +9158,27 @@ msgstr ""
 "Bạn cần passphrase để mở khóa cho người \n"
 "dùng: \"%s\""
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "Đã hủy"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "Lỗi mở khóa khóa mật: 3 passphrase sai."
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "Tín hiệu trả lời không mong đợi từ GnuPG: %s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "Lỗi mã hóa: Chưa xác định người nhận."
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -9059,85 +9189,65 @@ msgstr ""
 "\n"
 "%.*s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG gặp lỗi %s: %s\n"
 
-#: camel/camel-gpg-context.c:1246 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 "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 "Lỗi thực hiện GPG: %s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 "Lỗi thực hiện GPG."
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "Không thể xác minh chữ ký thông điệp: không thể tạo tập tin tạm: %s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "Đây là phần thông điệp có chữ ký số"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "Nội dung phần thân index"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "Không thể nhận thông điệp từ trình biên soạn"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "Không thể tạo ống dẫn hỗ trợ khoá: %s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "Không thể tạo tiến trình hỗ trợ khóa: %s"
-
-#: 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 "Không thể khóa '%s': lỗi giao thức với bộ hỗ trợ khóa (lock-helper)"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "Không thể khóa '%s'"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -9158,6 +9268,26 @@ msgstr "Lỗi lấy khóa bằng fcntl(2): %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "Lỗi lấy khóa bằng flock(2): %s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "Không thể tạo ống dẫn hỗ trợ khoá: %s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "Không thể tạo tiến trình hỗ trợ khóa: %s"
+
+#: 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 "Không thể khóa '%s': lỗi giao thức với bộ hỗ trợ khóa (lock-helper)"
+
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "Không thể khóa '%s'"
+
 #: camel/camel-movemail.c:107
 #, c-format
 msgid "Could not check mail file %s: %s"
@@ -9408,7 +9538,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "Trả lời xác thực từ server sai."
 
@@ -9606,7 +9736,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "_ID Chứng nhận:"
 
 #: camel/camel-smime-context.c:360
@@ -9623,7 +9753,7 @@ msgstr "Không thể tạo ngữ cảnh giải mã S/MIME"
 msgid "Failed to add data to CMS encoder"
 msgstr "Lỗi lưu mail vào tập tin tạm %s: %s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "Lỗi xác thực.\n"
@@ -9694,98 +9824,98 @@ msgstr "Không thể lấy thư mục: %s: %s"
 msgid "Cannot set message digests"
 msgstr "Không thể lấy thông điệp %s: %s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "Lỗi chữ ký chứng nhận"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "Sửa chữ ký"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "Server: %s, Kiểu: %s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "Lỗi lệnh IMAP: %s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "Lỗi tìm chứng nhận cho \"%s\"."
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "Không thể tạo ngữ cảnh giải mã S/MIME"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "Lỗi gửi tên người dùng cho server"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "Lệnh chưa được thi công"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9802,16 +9932,26 @@ msgstr "Không thể lấy thư mục: %s: %s"
 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, 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
 #, 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:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, 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
 msgid "Trash"
 msgstr "Rác"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -9933,7 +10073,7 @@ msgstr ""
 msgid "Error in application verification"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9942,11 +10082,11 @@ msgid ""
 "Signature:         %s"
 msgstr ""
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "TỐT"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "XẤU"
 
@@ -9970,7 +10110,7 @@ msgstr ""
 "Bạn có muốn chấp nhận dù bất cứ giá nào?"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9985,7 +10125,7 @@ msgstr ""
 "\n"
 "Bạn có muốn chấp nhận không?"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9994,7 +10134,7 @@ msgstr ""
 "Vấn đề chứng nhận: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -10003,7 +10143,7 @@ msgstr ""
 "Vùng chứng nhận sai: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -10012,7 +10152,7 @@ msgstr ""
 "Chứng nhận quá hạn: %s\n"
 "Đối tượng: %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -10024,17 +10164,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "Không thể phân tích URL `%s'"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "Lỗi lưu `%s': %s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "Không có thông điệp %s trong %s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 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"
 
@@ -10043,11 +10183,6 @@ msgstr "Không thể sao chép hoặc di chuyển thông điệp vào Thư mục
 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:390
-#, 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-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -10064,10 +10199,12 @@ msgid "Cannot copy messages to the Junk 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/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "Kiểm tra tìm thư mới"
 
 #: 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 "Kiểm tra tìm thư mới trên mọi thư mục"
@@ -10103,6 +10240,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr ""
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -10123,26 +10261,324 @@ msgstr ""
 msgid "Checklist"
 msgstr "Sương mù dày đặc"
 
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %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 "Server đã ngắt kết nối bất ngờ: %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 "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"Không thể lấy thông điệp: %s từ thư mục%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 ""
+"Không thể lấy thông điệp: %s từ thư mục%s\n"
+"  %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:746
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Unknown error"
+msgstr "Không thể nối thêm thông điệp vào thư mục dạng MH: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:775
+#, fuzzy, c-format
+msgid "Cannot append message to folder `%s': Bad command"
+msgstr "Không thể nối thêm thông điệp vào thư mục dạng 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 ""
+"Không thể lấy thông điệp: %s từ thư mục%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 ""
+"Không thể lấy thông điệp: %s từ thư mục%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 ""
+"Không thể lấy thông điệp: %s từ thư mục%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 ""
+"Không thể lấy thông điệp: %s từ thư mục%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 "Thư mục"
+
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "Chỉ hiện những thư mục đăng ký"
+
+#: 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 "Vùng tên"
+
+#: 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 "Để đọc và lưu thư trên IMAP server."
+
+#: camel/providers/imap4/camel-imap4-provider.c:72
+#, fuzzy
+msgid ""
+"This option will connect to the IMAPv4rev1 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/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "dịch vụ IMAP cho %s trên %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:140
+#: 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 "Không thể kết nối tới %s (cổng %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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "Kết nối bị hủy bỏ"
+
+#: 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"
+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
+#, 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"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "Lỗi lại"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr ""
+"Không thể kết nối tới POP server %s: Không hỗ trợ cơ chế xác thực yêu cầu."
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%sVui lòng nhập mật khẩu SMTP cho %s@%s"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "Không thể xác thực tại POP server: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:723
+#, fuzzy, c-format
+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
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "Tên thư mục \"%s\" không hợp lệ vì chứa ký tự \"%c\""
+
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
+
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:896
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Bad command"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:1037
+#, c-format
+msgid "Cannot get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr ""
+"\n"
+"Ghi chú: "
+
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "Không thể xoá thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "Không thể đổi tên thư mục: %s: Thao tác không hợp lệ"
+
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "Không thể lấy thư mục: %s: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "Tính hiệu trả lời không mong đợi từ IMAP server: %s"
+
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "Không có công việc"
+
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 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:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "Server đã ngắt kết nối bất ngờ: %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:1089
-msgid "Unknown error"
-msgstr "Lỗi lại"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -10187,21 +10623,21 @@ msgstr "Không thể tạo thư mục %s: %s"
 msgid "Could not load summary for %s"
 msgstr "Không thể nạp tóm tắt cho %s"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "Thư mục đã bị hủy và tạo lại trên server."
 
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "Đang quét tìm các thông điệp thay đổi"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "Không thể nhận thông điệp: %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -10217,25 +10653,25 @@ msgstr ""
 "Không thể lấy thông điệp: %s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "Không có thông điệp như vậy"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "Thông điệp này hiện thời chưa sẵn sàng"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: camel/providers/imap/camel-imap-folder.c:2285
+#: camel/providers/imap/camel-imap-folder.c:2355
 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 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"
 
@@ -10279,23 +10715,6 @@ msgstr ""
 "\n"
 "Ghi chú: "
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "Thư mục"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "Chỉ hiện những thư mục đăng ký"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr ""
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "Vùng tên"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr ""
@@ -10320,86 +10739,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:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP server %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "dịch vụ IMAP cho %s trên %s"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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 "Không thể kết nối tới %s (cổng %d): %s"
-
-#: camel/providers/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "Không có TLS"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "Kết nối bị hủy bỏ"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, 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"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 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:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10410,25 +10786,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "Không có thư mục %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "Tên thư mục \"%s\" không hợp lệ vì chứa ký tự \"%c\""
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10436,7 +10805,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "Thư mục cha lạ: %s"
@@ -10541,58 +10910,58 @@ msgstr ""
 "Để đọc và lưu thư cục bộ trong tập tin spool ngoại theo chuẩn mbox.\n"
 "Ngoài ra còn có thể được dùng để đọc các thư mục kiểu Elm, Pine, hoặc Mutt."
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "Gốc lưu %s không phải là đường dẫn tuyệt đối"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "Gốc lưu %s không phải là thư mục bình thường"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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 "Không thể lấy thư mục: %s: %s"
 
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "Bộ lưu trữ cục bộ chưa có thư mục inbox"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "Tập tin mail cục bộ %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: camel/providers/local/camel-local-store.c:333
 #, c-format
 msgid "Could not rename folder %s to %s: %s"
 msgstr "Không thể đổi tên thư mục %s thành %s: %s"
 
-#: camel/providers/local/camel-local-store.c:360
+#: camel/providers/local/camel-local-store.c:398
 #, c-format
 msgid "Could not rename '%s': %s"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: camel/providers/local/camel-local-store.c:385
+#: 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 "Không thể xóa tập tin tóm tắt thư mục `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:395
+#: 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 "Không thể xóa tập tin chỉ mục thư mục `%s': %s"
 
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -10658,7 +11027,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10994,7 +11363,7 @@ 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:258
+#: 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
@@ -11003,8 +11372,8 @@ 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:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -11013,49 +11382,49 @@ 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:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, 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"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 #, 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, 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."
@@ -11174,7 +11543,7 @@ msgstr "Không thể lấy nhóm: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "Không thể lấy thông điệp: %s"
 
 #: camel/providers/nntp/camel-nntp-summary.c:378
@@ -11227,8 +11596,8 @@ msgstr "Không có thông điệp nào vời UID %s"
 msgid "Retrieving POP message %d"
 msgstr "Đang nhận thông điệp POP %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "Nguyên nhân lạ"
 
@@ -11679,7 +12048,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "đồ đính kèm"
 
@@ -11724,6 +12093,101 @@ msgstr "Kiểu MIME:"
 msgid "Suggest automatic display of attachment"
 msgstr "Đề nghị tự động hiển thị đồ đính kèm"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for 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"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "Không thể mã hóa thông điệp: không có văn bản thô nào để mã hóa"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "Không thể mở thông điệp"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "Không thể nhận thông điệp từ trình biên soạn"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(Thông điệp không tựa)"
+
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "Mở tập tin"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "Tự phát sinh"
+
+#: composer/e-msg-composer.c:2097
+msgid "Signature:"
+msgstr "Chữ ký:"
+
+#: 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.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 "Biên soạn thông điệp"
+
+#: composer/e-msg-composer.c:3147
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate address selector control."
+msgstr ""
+"Không thể tạo cửa sổ biên soạn:\n"
+"Không thể kích hoạt bộ chọn địa chỉ."
+
+#: 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 ""
+"Không thể tạo cửa sổ biên soạn:\n"
+"Không thể kích hoạt bộ biên soạn HTML.\n"
+"Vui lòng kiểm tra xem GtkHTML và libGtkHTML\n"
+"có được cài đặt đúng phiên bản chưa.\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"Không thể tạo cửa sổ biên soạn:\n"
+"Không thể kích hoạt bộ biên soạn HTML."
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr ""
+"<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu "
+"chỉnh)</b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "Đích gửi đến"
@@ -11806,211 +12270,135 @@ msgstr "<nhấn đây để chọn thư mục>"
 msgid "Attach file(s)"
 msgstr "Đính kèm tập tin"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from 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"
-
-#: composer/e-msg-composer.c:701
-#, fuzzy
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr "Không thể mã hóa thông điệp: không có văn bản thô nào để mã hóa"
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "Không thể mở thông điệp"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "Không thể nhận thông điệp từ trình biên soạn"
-
-#: composer/e-msg-composer.c:1551
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "(Thông điệp không tựa)"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "Mở tập tin"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "Tự phát sinh"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "Chữ ký:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "Biên soạn thông điệp"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "Đính kèm tập tin vào thông điệp"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"Không thể tạo cửa sổ biên soạn:\n"
-"Không thể kích hoạt bộ chọn địa chỉ."
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"Không thể tạo cửa sổ biên soạn:\n"
-"Không thể kích hoạt bộ biên soạn HTML.\n"
-"Vui lòng kiểm tra xem GtkHTML và libGtkHTML\n"
-"có được cài đặt đúng phiên bản chưa.\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"Không thể tạo cửa sổ biên soạn:\n"
-"Không thể kích hoạt bộ biên soạn HTML."
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr ""
-"<b>(Bộ soạn thảo chứa phần thân thông điệp phi văn bản, không thể được hiệu "
-"chỉnh)</b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "Bạn có chắc muốn xóa cuộc hẹn vô danh này?"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "Thông điệp chưa đọc _kế"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "Bạn có muốn lưu các thay đổi không?"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "Không thể tạo ống dẫn: %s"
+msgid "Don't Recover"
+msgstr "Không loại bỏ"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "Không thể lưu tập tin chữ ký: %s"
+msgid "Recover"
+msgstr "Loại bỏ"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "Không thể lưu tập tin chữ ký: %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "_Hủy thay đổi"
-
-#: composer/mail-composer-errors.xml.in.h:12
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "Bạn có muốn lưu các thay đổi không?"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "Lỗi lưu lối tắt"
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "Không loại bỏ"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "Cảnh báo: Thông điệp đã thay đổi"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "Lỗi lưu lối tắt"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "Bạn có chắc muốn xóa cuộc hẹn vô danh này?"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "Loại bỏ"
+msgid "Discard Changes"
+msgstr "_Hủy thay đổi"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "Lưu thông điệp là..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "Không thể tạo ống dẫn: %s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "Thông điệp chưa đọc _kế"
+msgid "Could not read signature file \"{0}\"."
+msgstr "Không thể lưu tập tin chữ ký: %s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "Cảnh báo: Thông điệp đã thay đổi"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-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:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -12140,7 +12528,8 @@ msgstr ""
 "Tập tin với tên này đã có rồi.\n"
 "Ghi đè tập tin này?"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "Ghi đè tập tin?"
 
@@ -12317,81 +12706,97 @@ msgstr "Chọn thời điểm đối chiếu"
 msgid "_Filter Rules"
 msgstr "Quy tắc bộ lọc"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"Lỗi trong biểu thức chính quy '%s':\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "Cập nhật cuộc họp"
 
-#: filter/filter-errors.xml.in.h:5
+#. filter:no-date secondary
+#: filter/filter-errors.xml.h:4
+msgid "You must choose a date."
+msgstr "Bạn phải chọn ngày."
+
+#. filter:no-file primary
+#: filter/filter-errors.xml.h:6
 #, fuzzy
 msgid "Missing file name."
 msgstr "Tên _phân biệt:"
 
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "Bạn phải xác định tên tập tin."
+
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
 #, fuzzy
-msgid "Missing folder."
-msgstr "Đang gở bỏ thư mục %s"
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
 
-#: filter/filter-errors.xml.in.h:7
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
-msgid "Missing name."
-msgstr "Phân công"
+msgid "Missing folder."
+msgstr "Đang gở bỏ thư mục %s"
 
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "Bạn phải xác định thư mục."
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "Chưa chọn server"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"Lỗi trong biểu thức chính quy '%s':\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "Bạn phải chọn ngày."
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "Phân công"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "Bạn phải đặt tên cho bộ lọc này."
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "Bạn phải đặt tên cho vfolder này."
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "Bạn phải xác định tên tập tin."
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "Bạn phải xác định thư mục."
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "Chưa chọn server"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12404,66 +12809,11 @@ msgstr "Chọn tập tin"
 msgid "<b>Then</b>"
 msgstr "<b>Tới hạn:</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "Chọn thư mục"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "Quan trọng"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "Cần làm"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "Sau đó"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "Kiểm tra"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "Tên quy tắt: "
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "Vô danh"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>Tới hạn:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "Thực hiện hành động"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "nếu mọi tiêu chuẩn đều thỏa"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "nếu một trong các tiêu chuẩn thỏa"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "vào"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "ra"
-
 #: filter/filter.glade.h:1
 #, fuzzy
 msgid "    "
@@ -12555,6 +12905,77 @@ 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
+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
+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
+msgid "Later"
+msgstr "Sau đó"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "Kiểm tra"
+
+#: filter/filter-rule.c:790
+#, fuzzy
+msgid "Rule name:"
+msgstr "Tên quy tắt: "
+
+#: filter/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>Tới hạn:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "nếu mọi tiêu chuẩn đều thỏa"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "nếu một trong các tiêu chuẩn thỏa"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "Thực hiện hành động"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "Ủy nhiệm"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "Người nhận"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "Trả lời cho"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "Bao gồm:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "vào"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "ra"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12685,7 +13106,7 @@ msgstr "không được đặt cờ"
 msgid "Junk Test"
 msgstr "Tháng Sáu"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "Nhãn"
@@ -12725,7 +13146,7 @@ msgstr "Thoát chương trình"
 msgid "Play Sound"
 msgstr "Phát âm thanh"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "Đọc"
 
@@ -12795,9 +13216,9 @@ msgstr "bắt đầu bằng"
 msgid "Stop Processing"
 msgstr "Dừng tiến trình"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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ủ đề"
@@ -12860,111 +13281,62 @@ msgstr "Chủ đề không chứa"
 msgid "Virtual _Folders"
 msgstr "Thư mục ảo"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "_Thêm"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "Nguồn VFolder"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "Thông số bộ soạn thảo"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr ""
-"Cấu hình thông số thư tín, bao gồm tính bảo mật và hiển thị thông điệp, ở "
-"đây."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "Cấu hình kiểm tra chính tả, chữ ký, và bộ soạn thảo thông điệp ở đây"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "Cấu hình tài khoản thư ở đây"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Bộ soạn thư của Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Thành phần hiển thị thư mục của Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Thành phần tóm tắt thư của Evolution."
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "Thư"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:13
-msgid "Mail Accounts"
-msgstr "Tài khoản thư"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
-msgid "Mail Preferences"
-msgstr "Thông số thư"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[Mặc định]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "Tên tài _khoản:"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "Giao thức"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "Vô danh"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "Ngôn ngữ"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "Thêm chữ ký"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "Chữ ký"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "Thông điệp chuyển tiếp"
+
+#: mail/em-composer-utils.c:1499
+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
+#, 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:"
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "Tạo thư mục ả_o từ kết quả tìm kiếm..."
 
@@ -13002,277 +13374,457 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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:"
 
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "Crestview"
+
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "Tên thư mục:"
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "VFolders"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "Thư mục nhận"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "Đang nạp..."
-
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, 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:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, 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:951
+#: mail/em-folder-tree.c:866
 #, 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:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "Di chuyển"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, 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-view.c:798 mail/em-folder-view.c:812
 #: mail/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "Chọn thư mục"
 
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "Sao chép"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "Đổi tên thư mục \"%s\" thành:"
 
-#: mail/em-folder-tree.c:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "Đổi tên thư mục"
 
-#: mail/em-folder-tree.c:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "_Xem"
 
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "Mở trong cửa sổ mới"
 
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "Di chuyển"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "Thư mục mớ_i"
 
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "Đổi tên"
 
-#: mail/em-folder-tree.c:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+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 ""
+
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+msgstr "Thư mục nhận"
+
+#: mail/em-folder-tree-model.c:469 mail/em-folder-tree-model.c:778
+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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "_Hiệu chỉnh như thông điệp mới..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "_In"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "Trả lời _danh sách"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "Trả lời _mọi người"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "_Chuyển tiếp"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr ""
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr ""
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "Xó_a cờ"
 
-#: mail/em-folder-view.c:787 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 "Đánh dấu đã đọ_c"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "Đánh dấu _Không quan trọng"
 
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "Đánh dấu c_hưa đọc"
 
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "Đánh dấu _quan trọng"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr ""
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "_Chuyển tới thư mục..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "C_hép vào thư mục..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "Thêm người _gửi vào sổ địa chỉ"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "Áp dụng _bộ lọc"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "Quy tắc bộ lọc"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "Tạo _quy tắc từ thông điệp"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "VFolder trên _chủ đề"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "VFolder trên _người gửi"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "VFolder trên n_gười nhận"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "VFolder trên Mailing _List"
 
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "VFolder trên _người gửi"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "Lọc theo _chủ đề"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "Lọc theo _người gửi"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "Lọc theo n_gười nhận"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "Lọc _Mailing list"
 
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "Lọc theo _người gửi"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "Mặc định"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "In thông điệp"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "Sao chép vị trí liên kết"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "Nhấn để thêm công việc"
 
-#: mail/em-folder-view.c:2214
+#: 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 "Từ"
+
+#: 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 "Trả lời cho"
+
+#: 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 "Tới"
+
+#: 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: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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s đồ đính kèm"
+
+#: mail/em-format.c:1024 mail/em-format.c:1143
+#, fuzzy
+msgid "Could not parse S/MIME message: Unknown error"
+msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
+
+#: mail/em-format.c:1133
+msgid "Unsupported encryption type for multipart/encrypted"
+msgstr ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "Lược đồ không hỗ trợ"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "Không thể giải mã chữ ký chứng nhận"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "Không thể giải mã chữ ký chứng nhận"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "Nhấn để thêm công việc"
+msgid "Retrieving `%s'"
+msgstr "Đang nhận thông điệp %s"
+
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
+#, fuzzy
+msgid "Unsigned"
+msgstr "Đã gán"
+
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
+#, fuzzy
+msgid "Valid signature"
+msgstr "Sửa chữ ký"
+
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
+#, fuzzy
+msgid "Invalid signature"
+msgstr "Sửa chữ ký"
+
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
+msgstr ""
+
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
+#, fuzzy
+msgid "Unencrypted"
+msgstr "Đã ngắt"
+
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
+msgid "Encrypted, weak"
+msgstr ""
+
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
+#, fuzzy
+msgid "Encrypted"
+msgstr "Mã hóa PGP"
+
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
+msgid "Encrypted, strong"
+msgstr ""
+
+#: mail/em-format-html.c:820
+msgid "Malformed external-body part."
+msgstr ""
+
+#: mail/em-format-html.c:850
+#, c-format
+msgid "Pointer to FTP site (%s)"
+msgstr "Trỏ tới địa chỉ FTP (%s)"
+
+#: mail/em-format-html.c:861
+#, c-format
+msgid "Pointer to local file (%s) valid at site \"%s\""
+msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
+
+#: mail/em-format-html.c:863
+#, c-format
+msgid "Pointer to local file (%s)"
+msgstr "Trỏ tới tập tin cục bộ (%s)"
+
+#: mail/em-format-html.c:884
+#, c-format
+msgid "Pointer to remote data (%s)"
+msgstr "Trỏ tới tập tin từ xa (%s)"
+
+#: mail/em-format-html.c:895
+#, c-format
+msgid "Pointer to unknown external data (\"%s\" type)"
+msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
+
+#: mail/em-format-html.c:1137
+#, fuzzy
+msgid "Formatting message"
+msgstr "Đang di chuyển thông điệp"
+
+#. 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 ""
+
+#. 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
@@ -13280,46 +13832,31 @@ msgstr "Nhấn để thêm công việc"
 msgid "Matches: %d"
 msgstr "Khớp:"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
-#, fuzzy
-msgid "Unsigned"
-msgstr "Đã gán"
-
-#: mail/em-format-html-display.c:646
+#: mail/em-format-html-display.c:644
 #, fuzzy
 msgid ""
 "This message is not signed. There is no guarantee that this message is "
 "authentic."
 msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
 
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
-#, fuzzy
-msgid "Valid signature"
-msgstr "Sửa chữ ký"
-
-#: mail/em-format-html-display.c:647
+#: mail/em-format-html-display.c:645
 #, fuzzy
 msgid ""
 "This message is signed and is valid meaning that it is very likely that this "
 "message is authentic."
 msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
 
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
-#, fuzzy
-msgid "Invalid signature"
-msgstr "Sửa chữ ký"
-
-#: mail/em-format-html-display.c:648
+#: mail/em-format-html-display.c:646
 msgid ""
 "The signature of this message cannot be verified, it may have been altered "
 "in transit."
 msgstr ""
 
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
+#: mail/em-format-html-display.c:647
 msgid "Valid signature, cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
+#: mail/em-format-html-display.c:647
 #, fuzzy
 msgid ""
 "This message is signed with a valid signature, but the sender of the message "
@@ -13328,237 +13865,96 @@ msgstr ""
 "Tham số input_token chứa chữ ký không hợp lệ, hoặc chữ ký không được xác "
 "nhận."
 
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
-#, fuzzy
-msgid "Unencrypted"
-msgstr "Đã ngắt"
-
-#: mail/em-format-html-display.c:655
+#: mail/em-format-html-display.c:653
 msgid ""
 "This message is not encrypted.  Its content may be viewed in transit across "
 "The Internet."
 msgstr ""
 
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
-msgid "Encrypted, weak"
-msgstr ""
-
-#: mail/em-format-html-display.c:656
+#: 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."
 msgstr ""
 
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
-#, fuzzy
-msgid "Encrypted"
-msgstr "Mã hóa PGP"
-
-#: mail/em-format-html-display.c:657
+#: 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 ""
 
-#: mail/em-format-html-display.c:658 mail/em-format-html.c:581
-msgid "Encrypted, strong"
-msgstr ""
-
-#: mail/em-format-html-display.c:658
+#: 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 ""
 
-#: mail/em-format-html-display.c:755
+#: mail/em-format-html-display.c:757
 #, fuzzy
 msgid "_View Certificate"
 msgstr "_ID Chứng nhận:"
 
-#: mail/em-format-html-display.c:770
+#: mail/em-format-html-display.c:772
 #, fuzzy
 msgid "This certificate is not viewable"
 msgstr "Chứng nhận chưa hợp lệ"
 
-#: mail/em-format-html-display.c:1002
+#: mail/em-format-html-display.c:1007
 #, fuzzy
 msgid "Completed on %B %d, %Y, %l:%M %p"
 msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1010
+#: mail/em-format-html-display.c:1015
 msgid "Overdue:"
 msgstr "Quá hạn:"
 
-#: mail/em-format-html-display.c:1013
+#: mail/em-format-html-display.c:1018
 #, fuzzy
 msgid "by %B %d, %Y, %l:%M %p"
 msgstr "bởi %d %B, %Y, %l:%M %P"
 
-#: mail/em-format-html-display.c:1083
+#: mail/em-format-html-display.c:1088
 #, fuzzy
 msgid "_View Inline"
 msgstr "Xem Inline"
 
-#: mail/em-format-html-display.c:1084
+#: mail/em-format-html-display.c:1089
 #, fuzzy
 msgid "_Hide"
 msgstr "Ẩn"
 
-#: mail/em-format-html-print.c:125
+#: mail/em-format-html-print.c:126
 #, c-format
 msgid "Page %d of %d"
 msgstr "Trang %d trên %d"
 
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "Đang nhận thông điệp %s"
-
-#: mail/em-format-html.c:843
-msgid "Malformed external-body part."
-msgstr ""
-
-#: mail/em-format-html.c:873
-#, c-format
-msgid "Pointer to FTP site (%s)"
-msgstr "Trỏ tới địa chỉ FTP (%s)"
-
-#: mail/em-format-html.c:884
-#, c-format
-msgid "Pointer to local file (%s) valid at site \"%s\""
-msgstr "Trỏ tới tập tin cục bộ hợp lệ (%s) tại địa chỉ \"%s\""
-
-#: mail/em-format-html.c:886
-#, c-format
-msgid "Pointer to local file (%s)"
-msgstr "Trỏ tới tập tin cục bộ (%s)"
-
-#: mail/em-format-html.c:907
-#, c-format
-msgid "Pointer to remote data (%s)"
-msgstr "Trỏ tới tập tin từ xa (%s)"
-
-#: mail/em-format-html.c:918
-#, c-format
-msgid "Pointer to unknown external data (\"%s\" type)"
-msgstr "Trỏ tới dữ liệu lạ bên ngoài (kiểu \"%s\")"
-
-#: mail/em-format-html.c:1160
-#, fuzzy
-msgid "Formatting message"
-msgstr "Đang di chuyển thông điệp"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "Từ"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "Trả lời cho"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "Tới"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "Cc"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "Bcc"
-
-#. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
-msgid "Mailer"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, with day
-#: mail/em-format-html.c:1573
-msgid "<I> (%a, %R %Z)</I>"
-msgstr ""
-
-#. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
-msgid "<I> (%R %Z)</I>"
-msgstr ""
-
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "Ngày"
-
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
-msgstr ""
-
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s đồ đính kèm"
-
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
-
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
-msgstr ""
-
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "Không thể phân tích thông điệp MIME. Đang hiện thị mã thô."
-
-#: mail/em-format.c:1339
-#, fuzzy
-msgid "Unsupported signature format"
-msgstr "Lược đồ không hỗ trợ"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Error verifying signature"
-msgstr "Không thể giải mã chữ ký chứng nhận"
-
-#: mail/em-format.c:1347
-#, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "Không thể giải mã chữ ký chứng nhận"
-
-#: mail/em-junk-filter.c:82
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "mỗi năm"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "_Một ngày"
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "Một _tuần"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "_Một tháng"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13566,26 +13962,56 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "Lỗi cache %s: %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "Không thể lấy thư mục: %s: %s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "Lỗi cache %s: %s"
+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
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1919
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+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
+#, 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:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+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
+#, 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
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 #: mail/em-popup.c:699
 msgid "Save As..."
 msgstr "Lưu là..."
@@ -13595,99 +14021,83 @@ msgstr "Lưu là..."
 msgid "untitled_image.%s"
 msgstr "Thông điệp không tựa"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "T_rả lời người gửi"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "Mở liên kết bằng trình duyệt"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "Gửi _thông điệp cho danh sách..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "Têm sổ địa chỉ"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "Mở bằng %s..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "Server này không hỗ trợ thông tin schema LDAPv3"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "Đăng ký"
 
-#: mail/em-subscribe-editor.c:637 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 "Thư mục"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "Vui lòng chọn một server."
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "Chưa chọn server"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "Đừng hiện thông báo này lần nữa."
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "Bộ lọc"
 
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "Thông điệp chuyển tiếp"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, 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:"
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "Thông báo"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "Lưu thông điệp là..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "Địa chỉ"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "Thừ từ %s"
@@ -13707,11 +14117,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -13825,162 +14235,163 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "Tài khoản thư"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "Tài khoản thư"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "Thực hiện hành động"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "Độ ưu tiên mặc định:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 msgid "New Mail Notify sound file"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 msgid "New Mail Notify type"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "_Nhắc khi gửi thư HTML cho các liên lạc không muốn nhận HTML"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "_Nhắc khi gửi thư mà chỉ có người nhận _Bcc"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -14036,8 +14447,9 @@ msgid "Spell check inline"
 msgstr "_Kiểm tra chính tả"
 
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "Độ ưu tiên mặc định:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -14180,37 +14592,70 @@ msgstr ""
 msgid "spamd port"
 msgstr "Nhập"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Bộ soạn thư của Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Netscape Mail importer"
-msgstr "Bộ soạn thư của Evolution."
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "Thông số bộ soạn thảo"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
 msgstr ""
+"Cấu hình thông số thư tín, bao gồm tính bảo mật và hiển thị thông điệp, ở "
+"đây."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "Cấu hình kiểm tra chính tả, chữ ký, và bộ soạn thảo thông điệp ở đây"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "Cấu hình tài khoản thư ở đây"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Mail component"
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer"
 msgstr "Bộ soạn thư của Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Mail composer configuration control"
+msgstr "Factory Điều khiển cấu hình Tóm tắt Evolution."
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Thành phần tóm tắt thư của Evolution."
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:13
+msgid "Mail Accounts"
+msgstr "Tài khoản thư"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:14 mail/mail-config.glade.h:96
+msgid "Mail Preferences"
+msgstr "Thông số thư"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "_Thư"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -14218,15 +14663,15 @@ 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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "Vui lòng chờ"
 
@@ -14258,19 +14703,51 @@ 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:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "Đang nhập"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "Đang nhập tập tin"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Bộ soạn thư của Evolution."
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "Đang quét %s"
@@ -14280,7 +14757,7 @@ msgstr "Đang quét %s"
 msgid "Priority Filter \"%s\""
 msgstr "Bộ lọc ưu tiên \"%s\""
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -14295,7 +14772,7 @@ msgid ""
 "everything still works as intended."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -14303,7 +14780,7 @@ msgid ""
 "These filters will be dropped."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -14312,24 +14789,24 @@ msgid ""
 "contained in the message body."
 msgstr ""
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution đang nhập các dữ liệu cũ từ Netscape"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution đang nhập các dữ liệu cũ từ Netscape"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "Thiết lập"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "Bộ lọc thư"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -14363,128 +14840,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Bộ hiệu chỉnh tài khoản"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "_Máy chủ:"
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "_Tên người dùng:"
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "Đường _dẫn:"
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "Gửi thư tới %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "Chủ để là %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "Thừ từ %s"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s mailing list"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "Trả lời cho"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "Thêm quy tắc lọc"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "được chọn %d"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "chưa gửi %d"
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "Nháp"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "đã gửi %d"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "chưa gửi %d"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "tổng cộng %d"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "chưa gửi %d"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "được chọn %d"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "Thông điệp thư mới"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "Thông điệp thư"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "Biên soạn thông điệp mới"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "VFolder mới"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "Bộ lọc thư"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "Tạo thư mục mới"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "URI mà lịch sẽ hiển thị"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "Đang kiểm tra dịch vụ"
+
+#: mail/mail-config.c:973 mail/mail-config.c:977
+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
 msgid "Identity"
 msgstr "Thực thể"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14494,13 +14982,13 @@ msgstr ""
 "dưới không cần phải được chọn, trừ khi bạn muốn gộp thông tin vào email bạn "
 "cần gửi."
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "_Nhận thư"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14508,16 +14996,16 @@ msgstr ""
 "Vui lòng nhập thông tin về server nhận thư (incoming mail server) bên dưới. "
 "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:381
+#: mail/mail-config-druid.c:379
 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:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "Đan_g gửi thư"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14525,11 +15013,11 @@ 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:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "Bộ quản lý tài khoản"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14542,14 +15030,6 @@ 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.c:888
-msgid "Checking Service"
-msgstr "Đang kiểm tra dịch vụ"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "Đang kết nối tới server..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14866,7 +15346,8 @@ msgid "Execute Command..."
 msgstr "Thực hiện lệnh..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "Độ rộng _cứng:"
 
 #: mail/mail-config.glade.h:82
@@ -15193,427 +15674,544 @@ msgstr "màu"
 msgid "description"
 msgstr "mô tả"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "xác thực"
+
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
+msgid ""
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP server %s không hỗ trợ loại xác thực yêu cầu loại %s."
+
+#. 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-errors.xml.in.h:2
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"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-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "Bạn có muốn xóa tài khoản này?"
+#. 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 "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
 msgstr ""
-"Bạn có chắc muốn mở tất cả %d thông điệp trong những cửa sổ riêng biệt không?"
+"Bạn đang gửi một lá thư dùng dạng thức HTML. Vui lòng đảm bảo rằng những\n"
+"người nhận sau có thể nhận thư HTML:\n"
 
-#: mail/mail-errors.xml.in.h:5
+#: 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 ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "Loại bỏ vĩnh viễn những thông điệp đã xóa của mọi thư mục"
+msgid "_Send"
+msgstr "Gửi"
 
-#: mail/mail-errors.xml.in.h:6
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message in HTML format?"
+msgid "Are you sure you want to send a message without a subject?"
 msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-errors.xml.in.h:7
-#, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
+#. 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-errors.xml.in.h:8
+#. 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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "Bạn có chắc muốn gửi lại %d thông điệp?"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "Không thể sao chép thư mục: %s"
+msgid "Use default drafts folder?"
+msgstr "Đang mở thư mục công việc mặc định"
 
-#: mail/mail-errors.xml.in.h:14
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "Không thể lấy thư mục: %s: %s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"Không thể mở thư mục Nháp cho tài khoản này.\n"
+"Bạn có muốn dùng thư mục Nháp mặc định?"
 
-#: mail/mail-errors.xml.in.h:15
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "Không thể tạo thư mục tạm: %s"
+msgid "Use _Default"
+msgstr "Mặc định"
 
-#: mail/mail-errors.xml.in.h:16
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
 msgstr ""
-"Không thể tạo thư mục\n"
-"%s\n"
-"Lỗi: %s"
+"Bạn có chắc muốn mở tất cả %d thông điệp trong những cửa sổ riêng biệt không?"
 
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"Không thể xóa thư mục:\n"
-"%s"
-
-#: mail/mail-errors.xml.in.h:18
-#, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
-
-#: mail/mail-errors.xml.in.h:19
-#, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "Thư mục `%s' không tồn tại."
-
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "Không thể di chuyển thư mục: %s"
 
-#: mail/mail-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "Không thể mở thư mục chia sẽ: %s."
+msgid "_Expunge"
+msgstr "_Bỏ"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "Không thể mở thư mục chia sẽ: %s."
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "Loại bỏ vĩnh viễn những thông điệp đã xóa của mọi thư mục"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "Không thể mở thông điệp"
-
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
-msgstr ""
+msgid "_Empty Trash"
+msgstr "Đổ rác"
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "Bạn có vài thông điệp chưa gửi, bạn vẫn muốn thoát chứ?"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "Không thể tạo thư mục %s: %s"
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"Không thể lưu vào `%s'\n"
-"  %s"
 
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "Thêm chữ ký"
-
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "Không thể lưu tập tin chữ ký: %s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "Xoá \"%s\""
+msgid "Error while {0}."
+msgstr ""
+"Lỗi khi '%s':\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "Thật sự muốn xóa tài khoản này chứ?"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "_Hủy thay đổi"
+msgid "Error while performing operation."
+msgstr ""
+"Lỗi khi đang thực hiện thao tác:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "Bạn có muốn lưu các thay đổi không?"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "Không xóa"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "Lỗi khi nạp thông tin bộ lọc:\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+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 ""
-"Lỗi khi đang thực hiện thao tác:\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
 msgstr ""
-"Lỗi khi '%s':\n"
-"%s"
+"Không thể lưu vào `%s'\n"
+"  %s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "Tập tin đã tồn tại, ghi đè chứ?"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"Không thể tạo thư mục\n"
+"%s\n"
+"Lỗi: %s"
 
-#: mail/mail-errors.xml.in.h:42
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
+msgid "Cannot create temporary save directory."
+msgstr "Không thể tạo thư mục tạm: %s"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. 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/mail-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
+#, fuzzy
+msgid "File exists but cannot overwrite it."
+msgstr "Tập tin đã tồn tại, ghi đè chứ?"
 
-#: mail/mail-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
-msgstr ""
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "Tập tin '%s' không tồn tại hoặc không phải là một tập tin bình thường"
 
-#: mail/mail-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
+"Không thể xóa thư mục:\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:47
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "xác thực"
-
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "Không thể xóa thư mục: %s: Không có thư mục như vậy"
 
-#: mail/mail-errors.xml.in.h:49
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 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."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:50
-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:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
+#, fuzzy
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "Không thể đổi tên thư mục: %s: Không có thư mục này"
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr ""
-"Bạn đang gửi một lá thư dùng dạng thức HTML. Vui lòng đảm bảo rằng những\n"
-"người nhận sau có thể nhận thư HTML:\n"
+msgid "Delete \"{0}\"?"
+msgstr "Xoá \"%s\""
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
 msgid "Really delete folder \"{0}\" and all of its subfolders?"
 msgstr "Bạn thật sự muốn xóa thư mục \"%s\" chứ?"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:54
+#. mail:ask-delete-folder secondary
+#: mail/mail-errors.xml.h:126
 msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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-errors.xml.in.h:55
-msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:56
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"If you delete the folder, all of its contents and its subfolders contents "
+"will be deleted permanently."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. 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-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
+#. mail:no-rename-folder-exists 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 ""
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. 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 "Không thể di chuyển thư mục: %s"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP server %s không hỗ trợ loại xác thực yêu cầu loại %s."
+msgid "Cannot open source \"{2}\"."
+msgstr "Không thể mở thư mục chia sẽ: %s."
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid "This signature has been changed, but has not been saved."
-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 "Cannot open target \"{2}\"."
+msgstr "Không thể mở thông điệp"
 
-#: mail/mail-errors.xml.in.h:63
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"Không thể mở thư mục Nháp cho tài khoản này.\n"
-"Bạn có muốn dùng thư mục Nháp mặc định?"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "Không thể sao chép thư mục: %s"
 
-#: mail/mail-errors.xml.in.h:64
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "Use _Default"
-msgstr "Mặc định"
+msgid "Cannot create folder \"{0}\"."
+msgstr "Không thể lấy thư mục: %s: %s"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "Đang mở thư mục công việc mặc định"
+msgid "Cannot open source \"{1}\""
+msgstr "Không thể mở thư mục chia sẽ: %s."
+
+#. 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-errors.xml.in.h:66
+#. mail:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
 msgid "You have not filled in all of the required information."
 msgstr "Bạn chưa điền đủ các thông tin yêu cầu."
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "Bạn có vài thông điệp chưa gửi, bạn vẫn muốn thoát chứ?"
-
-#: mail/mail-errors.xml.in.h:68
+#. mail:account-notunique secondary
+#: mail/mail-errors.xml.h:162
 msgid "You may not create two accounts with the same name."
 msgstr "Bạn không thể tạo hai tài khoản trùng tên."
 
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "Thật sự muốn xóa tài khoản này chứ?"
+
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "Bạn có muốn xóa tài khoản này?"
+
+#. 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-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "Không xóa"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
+#, fuzzy
+msgid "Could not save signature file."
+msgstr "Không thể lưu tập tin chữ ký: %s"
+
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "Thêm chữ ký"
+
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
+msgstr ""
+
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
 msgstr "_Hủy thay đổi"
 
-#: mail/mail-errors.xml.in.h:72
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "Đổ rác"
+msgid "Do you wish to save your changes?"
+msgstr "Bạn có muốn lưu các thay đổi không?"
 
-#: mail/mail-errors.xml.in.h:73
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
-msgid "_Expunge"
-msgstr "_Bỏ"
+msgid "This signature has been changed, but has not been saved."
+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?"
 
-#: mail/mail-errors.xml.in.h:74
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "_Hủy thay đổi"
+
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "_Send"
-msgstr "Gửi"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "Thư mục `%s' không tồn tại."
 
-#: mail/mail-errors.xml.in.h:75
+#. 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."
+msgstr ""
+
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
 msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
+#. 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-folder-cache.c:786
+#: 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 "Ghi đè"
+
+#: mail/mail-errors.xml.h:218
+#, fuzzy
+msgid "_Append"
+msgstr "Aspen"
+
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Đang \"ping\" %s"
@@ -15622,135 +16220,135 @@ msgstr "Đang \"ping\" %s"
 msgid "Working"
 msgstr "Đang làm việc"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "Đang lọc thư mục"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "Đang lấy thư"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, 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:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
 "Appending to local `Sent' folder instead."
 msgstr ""
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, 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:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "Đang gửi thông điệp %d trên %d"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, 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:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "Hoàn tất."
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "Đang lưu thông điệp vào thư mục"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "Đang chuyển thông điệp tới %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "Đang chép thông điệp vào %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "Đang quét thư mục trong \"%s\""
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "Thông điệp chuyển tiếp"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "Đang mở kho %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "Đang gở bỏ thư mục %s"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "Đang lưu thư mục %s"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "Đang cập nhật thư mục"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "Đang bỏ thư mục"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "Đang nhập %s như là %s"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "Thư mục cục bộ"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "Đang nhận thông điệp %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, 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:1839
+#: mail/mail-ops.c:1850
 #, 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:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15759,7 +16357,7 @@ msgstr ""
 "Không thể tạo tập tin output: %s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15768,11 +16366,11 @@ msgstr ""
 "Lỗi khi lưu thông điệp vào: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "Đang lưu đồ đính kèm"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15781,17 +16379,17 @@ msgstr ""
 "Không thể tạo tập tin output: %s:\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "Không thể ghi dữ liệu: %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "Đang ngắt kết nối từ %s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "Đang tái kết nối tới %s"
@@ -15857,24 +16455,24 @@ msgstr "Đang cập nhập..."
 msgid "Waiting..."
 msgstr "Đang chờ..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "Người dùng đã hủy bỏ tác vụ."
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "Nhập mật khẩu cho %s"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "Nhập mật khẩu"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "_Nhớ mật khẩu này"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 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"
 
@@ -15916,89 +16514,94 @@ msgstr "Thông điệp chuyển tiếp"
 msgid "Invalid folder: `%s'"
 msgstr "Đang mở thư mục %s"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "Thiết lập vfolder: %s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "Đang cập nhật vfolder cho URI: %s"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "Đang cập nhật vfolder cho URI: %s"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "vFolders"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "Sửa VFolder"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "VFolder mới"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "Chưa xem"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "Đã xem"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "Đã trả lời"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "Nhiều thông điệp chưa xem"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "Nhiều thông điệp"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "Thấp nhất"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "Thấp"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "Cao hơn"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "Cao nhất"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "Hôm nay %l:%M %p"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "Hôm qua %l:%M %p"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%d %b %l:%M %p"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%d %b %Y"
 
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "Đang tạo danh sách thông điệp"
 
@@ -16030,43 +16633,43 @@ msgstr "Đã nhận"
 msgid "Size"
 msgstr "Kích thước"
 
-#: 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 "Không chuyển tiếp"
 
-#: 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 "Về thông tin của bạn"
 
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: mail/message-tag-followup.c:77 ui/evolution-mail-message.xml.h:42
 msgid "Forward"
 msgstr "Chuyển tiếp"
 
-#: mail/message-tag-followup.c:67
+#: mail/message-tag-followup.c:78
 msgid "No Response Necessary"
 msgstr "Không cần thiết trả lời"
 
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "Trả lời"
 
-#: mail/message-tag-followup.c:70 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 "Trả lời tất cả"
 
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "Xem lại"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr ""
 
@@ -16112,21 +16715,6 @@ msgstr "Đăng _ký"
 msgid "_Unsubscribe"
 msgstr "_Bỏ đăng ký"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Vỏ bọc Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Thành phần kiểm tra Evolution"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
@@ -16134,110 +16722,54 @@ msgstr "380"
 
 #: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
-msgid "Default shortcut group"
-msgstr "Đổi tên nhóm lối tắt này"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:3
-#, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "Bật tắt hiện thanh thư mục"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "Ẩn Thanh lối tắt"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "Độ ưu tiên mặc định:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "Độ ưu tiên mặc định:"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "Giao diện cấu hình mail."
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "Đang mở thư mục công việc mặc định"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "Đang mở thư mục công việc mặc định"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "Đang mở thư mục công việc mặc định"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "Đang mở thư mục công việc mặc định"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "Bật tắt hiện thanh thư mục"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "Bật tắt hiện thanh lối tắt"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 msgid "Whether to skip the development warning dialog"
 msgstr ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "Email"
@@ -16246,6 +16778,32 @@ msgstr "Email"
 msgid "Brought to you by"
 msgstr "Được mang lại bởi"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%d %B"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "Lỗi lại"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "Đối số không hợp lệ"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "Không thể đăng ký với OAF"
+
+#: shell/e-shell.c:1105
+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
+msgid "Generic error"
+msgstr "Lỗi chung chung"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(Không tựa)"
@@ -16386,11 +16944,11 @@ msgstr "Lỗi thực hiện GPG."
 msgid "_Import"
 msgstr "Nhập"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "Đang đóng kết nối..."
 
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Thiết lập Evolution"
 
@@ -16429,11 +16987,34 @@ 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-commands.c:63
+#: shell/e-shell-window.c:336
+#, 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
+#, 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
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "Gửi thư tới %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "Lỗi thực hiện %s."
@@ -16447,14 +17028,15 @@ msgid "Bug buddy could not be run."
 msgstr "Không thể chạy Bug buddy"
 
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "Về Ximian Evolution"
 
 #: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "_Trực tuyến"
 
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "_Ngoại tuyến"
 
@@ -16462,47 +17044,6 @@ msgstr "_Ngoại tuyến"
 msgid "Work Offline"
 msgstr "Ngoại tuyến"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian 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:345
-msgid "Ximian 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:351
-msgid ""
-"Ximian 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.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "Đối số không hợp lệ"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "Không thể đăng ký với OAF"
-
-#: shell/e-shell.c:1085
-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:1087
-msgid "Generic error"
-msgstr "Lỗi chung chung"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "Ô kiểm"
@@ -16577,6 +17118,44 @@ msgstr "Kết nối hoạt động"
 msgid "Click OK to close these connections and go offline"
 msgstr "Nhấn Đồng ý để đóng những kết nối này và chuyển sang ngoại tuyến"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "_Lịch:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "Liên lạc: "
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "_Thư:"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "_Công việc:"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "Kiểu thư mục:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "Mở thư mục của người dùng khác"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "_Tài khoản:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "Tên thư _mục:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "_Tên người dùng:"
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Trợ tá thiết lập Evolution"
@@ -16620,6 +17199,21 @@ msgstr ""
 "\n"
 "Hãy nhấn nút \"Kết thúc\" để lưu các thiết lập của bạn."
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Vỏ bọc Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Thành phần kiểm tra Evolution"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "Nhấn \"Nhập\" để bắt đầu nhập các tập tin vào Evolution."
@@ -16684,13 +17278,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution có thể nhập dữ liệu từ các tập tin sau:"
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16716,58 +17310,49 @@ msgstr ""
 "Chúng tôi hy vọng bạn thích kết quả của quá trình làm việc của chúng tôi,\n"
 "và chúng tôi háo hức chờ đời sự đóng góp của bạn!\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "Xin cám ơn\n"
 "Nhóm Ximian Evolution\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "Đừng nói điều này lần nữa"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "Không thể truy cập Vỏ bọc Ximian Evolution"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "Không thể khởi động Vỏ bọc Ximian Evolution: %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "Khởi động trong chế độ ngoại tuyến"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "Khởi động trong chế độ trực tuyến"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "Buộc nâng cấp tập tin cấu hình từ Evolution 1.0.x"
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "Gửi thông tin debug của mọi thành phần vào tập tin."
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16776,14 +17361,80 @@ msgstr ""
 "%s: --online và --offline không thể được dùng chung.\n"
 "  Hãy dùng %s --help để biết thêm thông tin.\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "Constantine"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "Không thể truy cập Vỏ bọc Ximian Evolution"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Phụ tá tài khoản Evolution"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "_ID Chứng nhận:"
@@ -17035,12 +17686,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "_ID Chứng nhận:"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "Card ID đã tồn tại"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 #, fuzzy
 msgid "%d/%m/%Y"
@@ -17263,6 +17908,12 @@ msgstr "Chủ để là %s"
 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
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "Card ID đã tồn tại"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -17307,12 +17958,12 @@ msgstr "Cắt thông điệp đã chọn"
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "Không thể đổi tên '%s': %s"
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -17376,7 +18027,8 @@ msgid "Select all contacts"
 msgstr "Chọn mọi liên lạc"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "Gửi một thông điệp tới liên lạc được chọn."
 
 #: ui/evolution-addressbook.xml.h:24
@@ -17408,8 +18060,8 @@ msgstr "Xem liên lạc hiện thời"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "_Hành động"
@@ -17427,7 +18079,8 @@ msgid "_Preview Pane"
 msgstr "Khung xem thử"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "Lư_u là VCard"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17561,11 +18214,21 @@ msgstr "Xem liên lạc hiện thời"
 msgid "Week"
 msgstr "Tuần"
 
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "Tuần làm việc"
+
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
 msgid "_Open Appointment"
 msgstr "_Cuộc hẹn"
 
+#: 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 "Đón_g"
+
 #: 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
@@ -17893,6 +18556,16 @@ 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
+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
+msgid "_Close"
+msgstr "Đón_g"
+
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
 msgid "A_dd Sender to Address Book"
@@ -18139,7 +18812,8 @@ msgid "Open the selected message in a new window"
 msgstr "Mở thông điệp được chọn trong cửa sổ mới"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "Mở thông điệp được chọn trong bộ soạn thảo và gửi lại"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -18257,58 +18931,46 @@ msgstr "VFolder trên _Chủ đề..."
 msgid "_Attached"
 msgstr "Đính _kèm"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "_Sao chép vào thư mục"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "_Tạo bộ lọc từ thông điệp"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "Đ_i tới"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "_Inline"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "_Lớn hơn"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "_Hiển thị thông điệp"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "_Chuyển vào thư mục"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "Thông điệp _kế"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "Hiển thị _bình thường"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "_Mở thông điệp"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "Thông điệp t_rước"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "_Quoted"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "Gửi _lại..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "_Công cụ"
@@ -18317,16 +18979,6 @@ msgstr "_Công cụ"
 msgid "_Undelete"
 msgstr ""
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "Đón_g"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "Đính kèm"
@@ -18724,6 +19376,11 @@ msgstr "Thông số thư"
 msgid "_Send / Receive"
 msgstr "_Gửi / Nhận"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "Tìm n_gay"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "Theo Công t_y"
@@ -18796,10 +19453,6 @@ msgstr "N_gày đến hạn:"
 msgid "With _Status"
 msgstr "Đặt trạng thái"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "Nhiệm _vụ"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18960,6 +19613,34 @@ msgstr "Khác..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "Thông tin cuộc họp"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Thành phần tóm tắt Evolution."
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "Thông điệp đã gửi và thông điệp nháp"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -19079,6 +19760,35 @@ msgstr "Văn bản"
 msgid "Find _Now"
 msgstr "Tìm ngay"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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 đã tồn tại.\n"
+"Bạn có muốn ghi đè lên nó?"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"Không thể lưu vào `%s'\n"
+"  %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"Không thể lưu vào `%s'\n"
+"  %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -19090,8 +19800,135 @@ msgid "%s (%d%% complete)"
 msgstr "%s (%d%% hoàn tất)"
 
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "Sổ địa chỉ"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Bộ xem Minicard sổ địa chỉ evolution"
+
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "Địa chỉ _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "Bologna"
+
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Bộ xem lịch iTip/iMip Evolution"
+
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Bộ soạn tin Evolution"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "Không thể khởi động gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "Không thể mở thư mục trong '%s'"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "URI mà lịch sẽ hiển thị"
+
+#~ msgid "The type of view to show"
+#~ msgstr "Loại khung xem cần hiển thị"
+
+#~ msgid "Display a message"
+#~ msgstr "Hiện thông điệp"
+
+#~ msgid "Alerts"
+#~ msgstr "Báo động"
+
+#~ msgid "Time"
+#~ msgstr "Thời gian"
+
+#~ msgid "_General"
+#~ msgstr "_Chung"
+
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "Chọn bộ nhập"
+
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "Lịch"
+
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "Danh sách công việc"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "Không thể cập nhật tập tin lịch!\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "URI của thư mục công việc cần hiển thị"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "Không thể nập những công việc trong `%s'"
+
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Thành phần hiển thị thư mục của Evolution."
+
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "VFolder trên _người gửi"
+
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "Lọc theo _người gửi"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "Lỗi cache %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "Lỗi cache %s: %s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "Lỗi tạo ống dẫn tới '%s': %s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "URI mà lịch sẽ hiển thị"
+
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "Đổi tên nhóm lối tắt này"
+
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "Ẩn Thanh lối tắt"
+
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "Đang mở thư mục công việc mặc định"
+
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "Đang mở thư mục công việc mặc định"
+
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "Đang mở thư mục công việc mặc định"
+
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "Đang mở thư mục công việc mặc định"
+
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "Bật tắt hiện thanh thư mục"
+
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "Bật tắt hiện thanh lối tắt"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "Không thể khởi động Vỏ bọc Ximian Evolution: %s"
+
+#~ msgid "_Resend..."
+#~ msgstr "Gửi _lại..."
 
 #, fuzzy
 #~ msgid "UID of the contacts source that the view will display"
@@ -19275,9 +20112,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "S_pouse:"
 #~ msgstr "_Vợ/Chồng:"
 
-#~ msgid "_Add"
-#~ msgstr "_Thêm"
-
 #, fuzzy
 #~ msgid "_Business:"
 #~ msgstr "Kinh doanh"
@@ -19396,18 +20230,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ "đó. Vui lòng liên hệ quản trị hệ thống nếu bạn cần tìm những\n"
 #~ "thông tin này."
 
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "Ngày _bắt đầu:"
-
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "N_gày đến hạn:"
-
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "Độ ư_u tiên:"
-
 #~ msgid ""
 #~ "Error while reading file %s:\n"
 #~ "%s"
@@ -19439,13 +20261,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ "%s"
 
 #~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "Không thể chép bộ mô tả tập tin: %s\n"
-#~ "%s"
-
-#~ msgid ""
 #~ "Error autosaving message: %s\n"
 #~ " %s"
 #~ msgstr ""
@@ -19582,10 +20397,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Xem trước lịch cần in"
 
 #, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "Nhập mật khẩu cho %s"
-
-#, fuzzy
 #~ msgid "New task list"
 #~ msgstr "Danh sách công việc"
 
@@ -19645,31 +20456,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "Không tìm thấy thư mục chia sẽ xác định."
 
-#~ msgid "C_alendar:"
-#~ msgstr "_Lịch:"
-
-#~ msgid "_Mail:"
-#~ msgstr "_Thư:"
-
-#~ msgid "_Tasks:"
-#~ msgstr "_Công việc:"
-
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "Kiểu thư mục:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "Mở thư mục của người dùng khác"
-
-#~ msgid "_Account:"
-#~ msgstr "_Tài khoản:"
-
-#~ msgid "_Folder Name:"
-#~ msgstr "Tên thư _mục:"
-
-#~ msgid "_User:"
-#~ msgstr "_Tên người dùng:"
-
 #, fuzzy
 #~ msgid "Create a new window"
 #~ msgstr "Tạo yêu cầu cuộc họp mới"
@@ -19997,9 +20783,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Quit Assistant"
 #~ msgstr "Phụ tá"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "Những kết nối sau đang hoạt động:"
-
 #~ msgid "_Search for Contacts"
 #~ msgstr "_Tìm liên lạc"
 
@@ -20234,9 +21017,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "Thông điệp này dùng chữ ký số nhưng không thể được xác thực."
 
-#~ msgid "Evolution Error"
-#~ msgstr "Lỗi Evolution"
-
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
 #~ "%s"
@@ -20366,18 +21146,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Thông tin lịch"
 
 #, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "Bộ nhắc nhở"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>Bắt đầu:</b> "
-
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "Thông tin lịch"
-
-#, fuzzy
 #~ msgid "<b>Classification</b>"
 #~ msgstr "Phân loại"
 
@@ -21408,10 +22176,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgstr "Cấu hình diện mạo Tóm tắt Evolution ở đây"
 
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Thành phần tóm tắt Evolution."
-
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Thành phần tóm tắt Evolution."
 
@@ -21815,9 +22579,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Asia"
 #~ msgstr "Châu Á"
 
-#~ msgid "Aspen"
-#~ msgstr "Aspen"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -22868,9 +23629,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Conroe"
 #~ msgstr "Conroe"
 
-#~ msgid "Constantine"
-#~ msgstr "Constantine"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "Copper Harbor"
 
@@ -22934,9 +23692,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Creston"
 #~ msgstr "Creston"
 
-#~ msgid "Crestview"
-#~ msgstr "Crestview"
-
 #~ msgid "Cross City"
 #~ msgstr "Thành phố Cross"
 
@@ -25919,9 +26674,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Nogales"
 #~ msgstr "Nogales"
 
-#~ msgid "Nome"
-#~ msgstr "Nome"
-
 #~ msgid "Norfolk"
 #~ msgstr "Norfolk"
 
@@ -28723,9 +29475,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Shown"
 #~ msgstr "Đã hiển thị"
 
-#~ msgid "No tasks"
-#~ msgstr "Không có công việc"
-
 #~ msgid "(No Description)"
 #~ msgstr "(Không có mô tả)"
 
@@ -29787,9 +30536,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "XEmacs"
 #~ msgstr "XEmacs"
 
-#~ msgid "_Mail"
-#~ msgstr "_Thư"
-
 #~ msgid "_Weather"
 #~ msgstr "_Thời tiết"
 
@@ -30849,9 +31595,6 @@ msgstr "%s (%d%% hoàn tất)"
 #~ msgid "Could not open directory for news server: %s"
 #~ msgstr "Không thể mở thư mục cho news server: %s"
 
-#~ msgid "Unable to open or create .newsrc file for %s: %s"
-#~ msgstr "Không thể mở hoặc tạo tập tin .newsrc cho %s: %s"
-
 #~ msgid "Could not open folder: message listing was incomplete."
 #~ msgstr "Không thể mở thư mục: danh sách thông điệp chưa hoàn chỉnh."
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index c2b5b98c48..ad75736263 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-01 03:18+0200\n"
+"POT-Creation-Date: 2004-05-19 14:00-0400\n"
 "PO-Revision-Date: 2004-05-01 16:00+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
@@ -24,6 +24,14 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "evolution 地址簿"
 
+#: a11y/addressbook/ea-minicard.c:105
+msgid "contact's header: "
+msgstr "联系人头衔："
+
+#: a11y/addressbook/ea-minicard.c:166
+msgid "evolution minicard"
+msgstr "evolution 袖珍卡"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 msgid "current addressbook folder "
 msgstr "当前地址簿文件夹 "
@@ -44,14 +52,6 @@ msgstr " 张卡片"
 msgid " card"
 msgstr " 张卡片"
 
-#: a11y/addressbook/ea-minicard.c:105
-msgid "contact's header: "
-msgstr "联系人头衔："
-
-#: a11y/addressbook/ea-minicard.c:166
-msgid "evolution minicard"
-msgstr "evolution 袖珍卡"
-
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
 msgstr "默认的同步地址："
@@ -66,64 +66,20 @@ msgstr "无法装入地址簿"
 msgid "Could not read pilot's Address application block"
 msgstr "无法读入 Pilot 的地址应用程序块"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-msgid "Autocompletion"
-msgstr "自动完成"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-msgid "Certificates"
-msgstr "证书"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-msgid "Configure autocomplete here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "联系人"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-msgid "Evolution Addressbook"
-msgstr "Evolution 地址簿"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 地址簿地址弹出框"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 地址簿地址查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 地址簿卡片查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-msgid "Evolution Addressbook component"
-msgstr "Evolution 地址簿组件"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 地址簿文件夹查看器"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution S/Mime 证书管理控件"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "匿名访问 LDAP 服务器"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr "Evolution 文件夹配置控件"
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "认证失败。\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr "在此管理您的 S/Mime 证书"
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s为 %s 输入口令 (用户 %s)"
 
 #: addressbook/gui/component/addressbook-component.c:93
 msgid "New Contact"
@@ -161,62 +117,62 @@ msgstr "联系人组(_C)："
 msgid "Create a new contacts group"
 msgstr "创建新联系人组"
 
-#: addressbook/gui/component/addressbook-config.c:466
+#: addressbook/gui/component/addressbook-component.c:182
+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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "LDAP 服务器认证失败"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "无法在根 DSE 上执行查询"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "服务器响应为没有支持的搜索起点"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: 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:1237
+#: addressbook/gui/component/addressbook-config.c:1266
 msgid "Error retrieving schema information"
 msgstr "检索 schema 信息错误"
 
-#: addressbook/gui/component/addressbook-config.c:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 msgid "Migrating..."
 msgstr "正在升迁..."
 
 #: addressbook/gui/component/addressbook-migrate.c:120
-#: calendar/gui/migration.c:184 mail/em-migrate.c:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, c-format
 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:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 "在此计算机中"
 
 #. Create the default Person addressbook
-#. Create the default Person calendar
-#. Create the default Person task list
-#. orange
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "个人"
@@ -275,20 +231,42 @@ msgstr ""
 "\n"
 "请稍候，Evolution 正在升迁您的 Pilot 同步数据..."
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "匿名访问 LDAP 服务器"
+#: addressbook/gui/component/addressbook-view.c:674
+#, fuzzy, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr "即将删除日历“%s”。您确定想要继续吗？"
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "认证失败。\n"
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "地址簿"
 
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s为 %s 输入口令 (用户 %s)"
+#: 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
+#: 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
+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
+#: 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 "联系人"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -308,6 +286,60 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+msgid "Autocompletion"
+msgstr "自动完成"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "联系人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+msgid "Certificates"
+msgstr "证书"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+msgid "Configure autocomplete here"
+msgstr "在此配置自动完成"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+msgid "Evolution Addressbook"
+msgstr "Evolution 地址簿"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 地址簿地址弹出框"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 地址簿地址查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 地址簿卡片查看器"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+msgid "Evolution Addressbook component"
+msgstr "Evolution 地址簿组件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution S/Mime 证书管理控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr "Evolution 文件夹配置控件"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+#, fuzzy
+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) "
@@ -329,6 +361,7 @@ msgstr " 显示支持的基础(_H) "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -393,7 +426,7 @@ msgstr "添加联系人组"
 msgid "Address Book Properties"
 msgstr "地址簿属性"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "总是"
@@ -408,99 +441,89 @@ msgid "Basic"
 msgstr "基本"
 
 #: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-msgid "C_olor:"
-msgstr "颜色(_O)："
-
-#: addressbook/gui/component/ldap-config.glade.h:22
 msgid "Connecting"
 msgstr "连接"
 
-#: addressbook/gui/component/ldap-config.glade.h:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "识别性名称(_N)："
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 msgid "Distinguished name"
 msgstr "识别性名称"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 msgid "Download limit:"
 msgstr "下载上限："
 
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 msgid "Email address"
 msgstr "电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 msgid "Email address:"
 msgstr "电子邮件地址："
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 将使用此电子邮件地址在服务器上对您进行认证"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 msgid "Find Possible Search Bases"
 msgstr "查找可能的搜索基础"
 
-#: addressbook/gui/component/ldap-config.glade.h:32
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: mail/mail-config.glade.h:84 smime/gui/smime-ui.glade.h:27
 msgid "General"
 msgstr "常规"
 
-#: addressbook/gui/component/ldap-config.glade.h:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "从不"
 
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "一级"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "选取一种颜色"
-
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "搜索范围(_E)："
 
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 msgid "Search base only"
 msgstr "只搜索基础"
 
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 msgid "Search base:"
 msgstr "搜索基础："
 
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 msgid "Search scope:"
 msgstr "搜索范围："
 
-#: addressbook/gui/component/ldap-config.glade.h:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "搜索"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -509,7 +532,7 @@ msgstr ""
 "选中此选项意味着 Evolution 只在您的 LDAP 服务器支持\n"
 "SSL 或 TLS 时才连接到您的 LDAP 服务器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -523,7 +546,7 @@ msgstr ""
 "例如，如果您和您的 LDAP 服务器工作时位于防火墙后，Evolution 就没有必\n"
 "要使用 SSL/TLS，因为您的连接已经相当安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -534,19 +557,19 @@ msgstr ""
 "选择此选项意味着您的服务器既不支持 SSL 也不支持 TLS。可能导致的结果将是\n"
 "您的连接不太安全，您也易于受到安全漏洞的攻击。"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "子级"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "支持的搜索起点"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -556,7 +579,7 @@ msgstr ""
 "搜索基础是您搜索开始项的可识别名称(DN)。如果您将此处留空，搜索将从目\n"
 "录树的根开始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -569,13 +592,13 @@ msgstr ""
 "指定的搜索基础下所属的全部项。搜索范围若为“一级”，则只会包含您指定的搜\n"
 "索基础之下一级的项目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -585,7 +608,7 @@ msgstr ""
 "这是可下载条目的最大数量。将此数值设定\n"
 "得太大将导致地址簿变慢。"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -594,7 +617,7 @@ msgstr ""
 "这是 evolution 用来认证您的方法。请注意若在此设定为“电子邮件地址”则需要您具有"
 "对 ldap 服务器的匿名访问权限。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -603,7 +626,7 @@ msgstr ""
 "这是此服务器在 Evolution 文件夹列表中显示的名称。\n"
 "它只用于显示。"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -613,122 +636,129 @@ msgstr ""
 "这是 LDAP 服务器上的端口，Evolution 将试图连接到您所给出的标准端口列表。\n"
 "如果您不清楚要指定端口，请询问您的系统管理员。"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 msgid "Timeout:"
 msgstr "超时："
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "使用 _SSL/TLS："
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "使用已识别的姓名 (DN)"
 
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "使用电子邮件地址"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "可能时"
 
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 msgid "_Add Contacts Group"
 msgstr "添加联系人组(_A)"
 
-#: addressbook/gui/component/ldap-config.glade.h:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "下载上限(_D)："
 
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 msgid "_Email address:"
 msgstr "电子邮件地址(_E)："
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "登录方式(_L)："
 
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "名称(_N)："
 
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: addressbook/gui/component/ldap-config.glade.h:79
 msgid "_Port number:"
 msgstr "端口号(_P)："
 
-#: addressbook/gui/component/ldap-config.glade.h:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 msgid "_Port:"
 msgstr "端口(_P)："
 
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: addressbook/gui/component/ldap-config.glade.h:81
 msgid "_Search base:"
 msgstr "搜索起点(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "服务器名(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 msgid "_Server:"
 msgstr "服务器(_S)："
 
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "超时(分钟)(_T)："
 
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 msgid "_Use secure connection:"
 msgstr "使用安全连接(_U)："
 
-#: addressbook/gui/component/ldap-config.glade.h:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "卡片"
 
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: addressbook/gui/component/ldap-config.glade.h:87
 msgid "connecting-tab"
 msgstr "连接页"
 
-#: addressbook/gui/component/ldap-config.glade.h:90
+#: addressbook/gui/component/ldap-config.glade.h:88
 msgid "general-tab"
 msgstr "常规页"
 
-#: addressbook/gui/component/ldap-config.glade.h:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
 msgid "minutes"
 msgstr "分钟"
 
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "搜索页"
 
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 的地址簿名称选择界面"
-
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全部删除"
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: 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-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/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:208
+msgid "Remove All"
+msgstr "全部删除"
+
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 msgid "View Contact List"
 msgstr "查看联系人列表"
@@ -751,22 +781,15 @@ msgstr "添加到联系人"
 msgid "Unnamed Contact"
 msgstr "未命名的联系人"
 
-#: 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
-msgid "Name"
-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
 msgid "Source"
 msgstr "来源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
-msgid "Select Contacts from Address Book"
-msgstr "从地址簿中选择联系人"
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 的地址簿名称选择界面"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 msgid "<b>Contacts</b>"
@@ -825,125 +848,127 @@ msgid "<b>Work</b>"
 msgstr "<b>工作</b>"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr "AIM"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:12
-msgid "Address 2:"
-msgstr "地址 2："
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Address:"
 msgstr "地址："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 msgid "Anniversary:"
 msgstr "周年："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 msgid "Assistant:"
 msgstr "助手："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 msgid "Birthday:"
 msgstr "生日："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-msgid "Blog:"
-msgstr "Blog："
-
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 msgid "Calendar:"
 msgstr "日历："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 msgid "City:"
 msgstr "城市："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 msgid "Company:"
 msgstr "公司："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-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:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "联系人编辑器"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 msgid "Country:"
 msgstr "国家："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 msgid "Department:"
 msgstr "部门："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 msgid "Free/Busy:"
 msgstr "忙/闲："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 msgid "Full _Name..."
 msgstr "全名(_N)..."
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 msgid "Home"
 msgstr "家庭"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:66
 msgid "MSN Messenger"
 msgstr "MSN Messenger"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 msgid "Mailing Address"
 msgstr "邮政地址"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 msgid "Manager:"
 msgstr "经理："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 msgid "Ni_ckname:"
 msgstr "昵称(_C)："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 msgid "Notes:"
 msgstr "注释："
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:63
 msgid "Novell Groupwise"
 msgstr "Novell Groupwise"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "其它"
 
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "邮政邮箱(_P)："
+
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 msgid "Personal Information"
 msgstr "个人信息"
@@ -966,9 +991,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "工作"
@@ -997,23 +1022,35 @@ msgstr "项目 7"
 msgid "item8"
 msgstr "项目 8"
 
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr "您确定要删除这些联系人吗？"
+
+#: addressbook/gui/contact-editor/eab-editor.c:319
+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:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "可编辑"
 
@@ -1985,91 +2022,108 @@ msgstr "赞比亚"
 msgid "Zimbabwe"
 msgstr "津巴布韦"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-msgid "AOL Instant Messenger"
-msgstr "AOL 即时通讯程序"
-
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 msgid "Jabber"
 msgstr "Jabber"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr "雅虎通"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr "ICQ"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-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
-msgid "Location"
-msgstr "位置"
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-msgid "Username"
-msgstr "用户名"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 msgid "Yahoo"
 msgstr "雅虎"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr "MSN"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr "ICQ"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 msgid "GroupWise"
 msgstr "GroupWise"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 msgid "Source Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 msgid "Is New Contact"
 msgstr "为新联系人"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "可写域"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "已更改"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: addressbook/gui/contact-editor/e-contact-editor.c:1741
 msgid "Category editor not available."
 msgstr "类别编辑器不可用。"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "此联系人属于这些类别："
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, fuzzy
+msgid "Please select an image for this contact"
+msgstr "请从以下选项中选择"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:1836
+#, fuzzy
+msgid "No image"
+msgstr "尼日尔"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+msgid ""
+"The following entries are 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 "无法为域找到构件：“%s”"
 
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+msgid "AOL Instant Messenger"
+msgstr "AOL 即时通讯程序"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr "雅虎通"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+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
+msgid "Location"
+msgstr "位置"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+msgid "Username"
+msgstr "用户名"
+
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
 msgstr "快速添加联系人"
@@ -2087,18 +2141,6 @@ msgstr "全名(_F)："
 msgid "E-_mail:"
 msgstr "电子邮件(_M)："
 
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr "您确定要删除这些联系人吗？"
-
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr "您确定要删除此联系人吗？"
-
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
 msgstr "地址 _2："
@@ -2244,8 +2286,8 @@ msgstr "联系人列表编辑器"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "名簿"
 
@@ -2306,6 +2348,422 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "高级搜索"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr "(地图)"
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+msgid "map"
+msgstr "地图"
+
+#: addressbook/gui/widgets/eab-contact-display.c:257
+#: addressbook/gui/widgets/eab-contact-display.c:533
+msgid "List Members"
+msgstr "列出成员"
+
+#: addressbook/gui/widgets/eab-contact-display.c:329
+#: addressbook/gui/widgets/eab-contact-display.c:331
+msgid "E-mail"
+msgstr "电子邮件"
+
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "组织"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+msgid "Position"
+msgstr "位置"
+
+#: addressbook/gui/widgets/eab-contact-display.c:343
+#: addressbook/gui/widgets/eab-contact-display.c:362
+msgid "Groupwise"
+msgstr "Groupwise"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+msgid "Video Conferencing"
+msgstr "视频会议"
+
+#: addressbook/gui/widgets/eab-contact-display.c:349
+#: addressbook/gui/widgets/eab-contact-display.c:370
+msgid "Phone"
+msgstr "电话"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr "传真"
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+msgid "work"
+msgstr "工作"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr "WWW"
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+msgid "Blog"
+msgstr "Blog"
+
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "移动电话"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+msgid "personal"
+msgstr "个人"
+
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
+msgid "Note"
+msgstr "注释"
+
+#: addressbook/gui/widgets/eab-contact-display.c:548
+msgid "Job Title"
+msgstr "职称"
+
+#: addressbook/gui/widgets/eab-contact-display.c:552
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+msgid "Email"
+msgstr "电子邮件"
+
+#: addressbook/gui/widgets/eab-contact-display.c:579
+msgid "Home page"
+msgstr "主页"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "成功"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+msgid "Backend busy"
+msgstr "后台忙"
+
+#. E_BOOK_ERROR_REPOSITORY_OFFLINE
+#: addressbook/gui/widgets/eab-gui-util.c:53
+msgid "Repository offline"
+msgstr "仓库离线"
+
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+msgid "Address Book does not exist"
+msgstr "地址簿不存在"
+
+#. E_BOOK_ERROR_NO_SELF_CONTACT
+#: addressbook/gui/widgets/eab-gui-util.c:55
+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
+msgid "Permission denied"
+msgstr "没有权限"
+
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+msgid "Contact not found"
+msgstr "找不到联系人"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+msgid "Contact ID already exists"
+msgstr "联系人 ID 已经存在"
+
+#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
+#: addressbook/gui/widgets/eab-gui-util.c:61
+msgid "Protocol not supported"
+msgstr "不支持的协议"
+
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "已经取消"
+
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+msgid "Could not cancel"
+msgstr "无法取消"
+
+#. E_BOOK_ERROR_AUTHENTICATION_FAILED
+#: addressbook/gui/widgets/eab-gui-util.c:64
+msgid "Authentication Failed"
+msgstr "认证失败"
+
+#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
+#: addressbook/gui/widgets/eab-gui-util.c:65
+msgid "Authentication Required"
+msgstr "必须认证"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+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
+msgid "No such source"
+msgstr "没有来源"
+
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "其它错误"
+
+#: 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 "我们无法打开此地址簿。请检查路径是否存在以及您是否有足够的权限访问它。"
+
+#: 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 ""
+"我们无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为LDAP 服务器"
+"已经关闭。"
+
+#: 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 ""
+"本版本的 Evolution 并没有把 LDAP 支持编译进去。如果您希望在 Evolution 中使用 "
+"LDAP，就必须先从以下链接获取 OpenLDAP，然后从程序的 CVS 源代码重新编译程序。"
+
+#: 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 ""
+"我们无法打开此地址簿。这可能是由于您输入了错误的 URI，也可能是因为服务器已经"
+"关闭。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:141
+msgid "Unable to open addressbook"
+msgstr "无法打开地址簿"
+
+#: addressbook/gui/widgets/eab-gui-util.c:162
+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 ""
+"匹配此查询的卡片数既超过了服务器配置的返回数目，也超过了\n"
+"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
+"搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"执行此查询的时间既超过了服务器限制，也超过了您为此地址簿配置的限制。\n"
+"请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
+"中将时间限制调高。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "此地址簿的后端无法解析此查询。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "此地址簿的后端拒绝执行此查询。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+msgid "Error adding list"
+msgstr "添加列表出错"
+
+#: addressbook/gui/widgets/eab-gui-util.c:229
+#: addressbook/gui/widgets/eab-gui-util.c:652
+msgid "Error adding contact"
+msgstr "添加联系人出错"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "修改列表出错"
+
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying contact"
+msgstr "修改联系人出错"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+msgid "Error removing list"
+msgstr "删除列表出错"
+
+#: addressbook/gui/widgets/eab-gui-util.c:252
+#: addressbook/gui/widgets/eab-gui-util.c:610
+msgid "Error removing contact"
+msgstr "删除联系人出错"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, 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 ""
+"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
+"您真的想要显示所有联系人吗？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s 已经存在\n"
+"您打算覆盖它吗？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "列表"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+msgid "Move contact to"
+msgstr "将联系人移动到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:708
+msgid "Copy contact to"
+msgstr "将联系人复制到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:711
+msgid "Move contacts to"
+msgstr "将联系人移动到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:713
+msgid "Copy contacts to"
+msgstr "将联系人复制到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+msgid "Select target addressbook."
+msgstr "从地址簿中选择目标联系人。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "多个 VCard"
+
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "%s 的 VCard"
+
+#.
+#. * 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
+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
+#, c-format
+msgid "and one other contact."
+msgid_plural "and %d other contacts."
+msgstr[0] "以及另外 %d 个联系人。"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+msgid "Show Full VCard"
+msgstr "显示完整 VCard"
+
+#: addressbook/gui/widgets/eab-vcard-control.c:227
+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
 msgid "No contacts"
 msgstr "无联系人"
@@ -2319,8 +2777,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "查询"
 
@@ -2374,9 +2832,10 @@ msgstr "地址簿"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:850
 #: addressbook/gui/widgets/e-addressbook-view.c:1070
-#: addressbook/gui/widgets/e-addressbook-view.c:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "保存为 VCard"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1057
@@ -2441,7 +2900,7 @@ msgid "Cut"
 msgstr "剪切"
 
 #: addressbook/gui/widgets/e-addressbook-view.c:1084
-#: calendar/gui/calendar-component.c:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2452,18 +2911,8 @@ msgstr "复制"
 msgid "Paste"
 msgstr "粘贴"
 
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "删除"
-
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1279
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "当前视图"
 
@@ -2478,7 +2927,7 @@ msgstr ""
 "的地址簿后端已经崩溃。您需要重新启动 Evolution 才能再次使用该后端"
 
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "任何类别"
@@ -2519,21 +2968,6 @@ msgstr "类别"
 msgid "Company Phone"
 msgstr "公司电话"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "电子邮件"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "电子邮件 2"
-
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "电子邮件 3"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
 msgid "Family Name"
 msgstr "姓"
@@ -2570,29 +3004,14 @@ msgstr "日记"
 msgid "Manager"
 msgstr "经理"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "移动电话"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "昵称"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "注释"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "办公室"
 
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "组织"
-
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
 msgid "Other Fax"
 msgstr "其它传真"
@@ -2644,21 +3063,29 @@ msgstr "单位"
 msgid "Web Site"
 msgstr "网站"
 
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "宽度"
 
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "高度"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 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 "域"
@@ -2675,10 +3102,6 @@ msgstr "文字模型"
 msgid "Max field name length"
 msgstr "最大域名长度"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "列宽"
-
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
 "\n"
@@ -2707,402 +3130,9 @@ msgstr ""
 msgid "Adapter"
 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/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr "(地图)"
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr "地图"
-
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-msgid "List Members"
-msgstr "列出成员"
-
-#: addressbook/gui/widgets/eab-contact-display.c:293
-msgid "E-mail"
-msgstr "电子邮件"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-msgid "Position"
-msgstr "位置"
-
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-msgid "Groupwise"
-msgstr "Groupwise"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr "视频会议"
-
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-msgid "Phone"
-msgstr "电话"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr "传真"
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-msgid "work"
-msgstr "工作"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr "WWW"
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-msgid "Blog"
-msgstr "Blog"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-msgid "personal"
-msgstr "个人"
-
-#: addressbook/gui/widgets/eab-contact-display.c:508
-msgid "Job Title"
-msgstr "职称"
-
-#: addressbook/gui/widgets/eab-contact-display.c:539
-msgid "Home page"
-msgstr "主页"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "成功"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-msgid "Backend busy"
-msgstr "后台忙"
-
-#. E_BOOK_ERROR_REPOSITORY_OFFLINE
-#: addressbook/gui/widgets/eab-gui-util.c:52
-msgid "Repository offline"
-msgstr "仓库离线"
-
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-msgid "Address Book does not exist"
-msgstr "地址簿不存在"
-
-#. E_BOOK_ERROR_NO_SELF_CONTACT
-#: addressbook/gui/widgets/eab-gui-util.c:54
-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:57
-msgid "Permission denied"
-msgstr "没有权限"
-
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-msgid "Contact not found"
-msgstr "找不到联系人"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-msgid "Contact ID already exists"
-msgstr "联系人 ID 已经存在"
-
-#. E_BOOK_ERROR_PROTOCOL_NOT_SUPPORTED
-#: addressbook/gui/widgets/eab-gui-util.c:60
-msgid "Protocol not supported"
-msgstr "不支持的协议"
-
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "已经取消"
-
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-msgid "Could not cancel"
-msgstr "无法取消"
-
-#. E_BOOK_ERROR_AUTHENTICATION_FAILED
-#: addressbook/gui/widgets/eab-gui-util.c:63
-msgid "Authentication Failed"
-msgstr "认证失败"
-
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "必须认证"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS 不可用"
-
-#. E_BOOK_ERROR_CORBA_EXCEPTION
-#. E_BOOK_ERROR_NO_SUCH_SOURCE
-#: addressbook/gui/widgets/eab-gui-util.c:67
-msgid "No such source"
-msgstr "没有来源"
-
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "其它错误"
-
-#: addressbook/gui/widgets/eab-gui-util.c:102
-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:109
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the LDAP server is unreachable."
-msgstr ""
-"我们无法打开此地址簿。这可能是由于"
-"您输入了错误的 URI，也可能是因为"
-"LDAP 服务器已经关闭。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:114
-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 ""
-"本版本的 Evolution 并没有把 LDAP 支持编译进去。"
-"如果您希望在 Evolution 中使用 LDAP，就必须先从"
-"以下链接获取 OpenLDAP，然后从程序的 CVS 源代码"
-"重新编译程序。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:123
-msgid ""
-"We were unable to open this addressbook.  This either means you have entered "
-"an incorrect URI, or the server is unreachable."
-msgstr ""
-"我们无法打开此地址簿。这可能是由于"
-"您输入了错误的 URI，也可能是因为"
-"服务器已经关闭。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "无法打开地址簿"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"匹配此查询的卡片数既超过了服务器配置的返回数目，也超过了\n"
-"Evolution 配置要显示的数目。请在搜索的时候指定更加严格的\n"
-"搜索条件，或者在此地址簿的目录服务器参数中将结果限制调高。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"执行此查询的时间既超过了服务器限制，也超过了您为此地址簿配置的限制。\n"
-"请在搜索的时候指定更加严格的搜索条件，或者在此地址簿的目录服务器参数\n"
-"中将时间限制调高。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "此地址簿的后端无法解析此查询。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "此地址簿的后端拒绝执行此查询。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "此查询未成功完成。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "您希望保存修改吗？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "丢弃(_D)"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "添加列表出错"
-
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-msgid "Error adding contact"
-msgstr "添加联系人出错"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "修改列表出错"
-
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying contact"
-msgstr "修改联系人出错"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "删除列表出错"
-
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-msgid "Error removing contact"
-msgstr "删除联系人出错"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, 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 ""
-"打开 %d 个联系人将同时打开 %d 个新窗口。\n"
-"您真的想要显示所有联系人吗？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已经存在\n"
-"您打算覆盖它吗？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "覆盖"
-
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "保存 %s 出错：%s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "列表"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-msgid "Move contact to"
-msgstr "将联系人移动到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:706
-msgid "Copy contact to"
-msgstr "将联系人复制到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:709
-msgid "Move contacts to"
-msgstr "将联系人移动到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:711
-msgid "Copy contacts to"
-msgstr "将联系人复制到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-msgid "Select target addressbook."
-msgstr "从地址簿中选择目标联系人。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "多个 VCard"
-
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "%s 的 VCard"
-
-#.
-#. * 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: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
-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
-#, c-format
-msgid "and one other contact."
-msgid_plural "and %d other contacts."
-msgstr[0] "以及另外 %d 个联系人。"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-msgid "Show Full VCard"
-msgstr "显示完整 VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:227
-msgid "Show Compact VCard"
-msgstr "显示紧凑 VCard"
-
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-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"
@@ -3112,17 +3142,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 ""
 
@@ -3146,11 +3176,6 @@ msgstr "Evolution vCard 导入器"
 msgid "VCard (.vcf, .gcrd)"
 msgstr "VCard (.vfg, .gcrd)"
 
-#: 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.c:998
 msgid "Print contacts"
 msgstr "打印联系人"
@@ -3160,6 +3185,11 @@ msgstr "打印联系人"
 msgid "Print contact"
 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"
 msgstr "10 pt. Tahoma"
@@ -3344,16 +3374,6 @@ msgstr "联系人打印测试"
 msgid "This should test the contact print code"
 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
-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.c:56
 msgid "Specify the output file instead of standard output"
 msgstr "指定用来取代标准输出的输出文件"
@@ -3408,6 +3428,16 @@ 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
+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-import.c:46
 msgid "Error loading default addressbook."
 msgstr "装入默认地址簿错误。"
@@ -3424,7 +3454,8 @@ msgstr "没有提供文件名。"
 msgid "Unnamed List"
 msgstr "未命名的列表"
 
-#: calendar/common/authentication.c:37 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 msgid "Enter password"
 msgstr "输入密码"
 
@@ -3456,63 +3487,6 @@ msgstr "默认优先级："
 msgid "Could not read pilot's ToDo application block"
 msgstr "无法读入 Pilot ToDo 应用程序块"
 
-#: 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
-#: calendar/gui/calendar-component.c:954
-msgid "Calendars"
-msgstr "日历"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在此配置您的时区、日历和任务列表 "
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-msgid "Evolution Calendar and Tasks"
-msgstr "Evolution 日历和任务"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 日历配置控件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 日历调度邮件查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 日历查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 日历/任务新闻编辑器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 任务查看器"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-msgid "Evolution's Calendar component"
-msgstr "Evolution 日历组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-msgid "Evolution's Tasks component"
-msgstr "Evolution 任务组件"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:991 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:591 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "任务"
-
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-msgid "Evolution Calendar alarm notification service"
-msgstr "Evolution 日历提醒通知服务"
-
 #: calendar/gui/alarm-notify/alarm-notify-dialog.c:213
 msgid "Starting:"
 msgstr "开始："
@@ -3542,24 +3516,24 @@ msgstr "编辑约会(_E)"
 msgid "_Snooze"
 msgstr "午睡(_S)"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr "丢弃"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr "全部丢弃"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "没有描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -3568,12 +3542,12 @@ msgid ""
 "Ending at %s"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -3585,7 +3559,7 @@ msgstr ""
 "发送电子邮件。Evolution 将以\n"
 "显示普通提示会话框代替。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -3601,19 +3575,19 @@ msgstr ""
 "\n"
 "您确信您要运行该程序吗？"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: 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:164
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+msgid "Evolution Calendar alarm notification service"
+msgstr "Evolution 日历提醒通知服务"
+
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "无法初始化 Bonobo"
 
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "无法创始化 gnome-vfs"
-
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "无法创建提醒服务车间"
 
@@ -3722,61 +3696,46 @@ 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 "删除项时要求确认(_A)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "删除项时要求确认(_A)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: 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:29
+#: 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:30
+#: 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:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "在日期浏览器中显示周数(_N)"
 
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "概要含有"
-
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "描述含有"
-
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "注释含有"
-
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "描述含有"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "无匹配"
-
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1706
+#: 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
 msgid "Calendar"
 msgstr "日历"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -3787,123 +3746,129 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "返回小于"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
 msgstr "天数"
 
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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 "%m月%d日%A"
 
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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 "%Y年%m月%d日%A"
 
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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 "%Y年%m月%d日"
 
 #. 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:464
+#: 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 "%m月%d日"
 
-#: calendar/gui/calendar-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除日历“%s”。您确定想要继续吗？"
 
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 msgid "New Calendar"
 msgstr "新建日历"
 
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "属性..."
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "正在装入日历..."
 
-#: calendar/gui/calendar-component.c:800
+#: 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:812
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:846
+#: 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:1110
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+msgid "Calendars"
+msgstr "日历"
+
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "新建约会"
 
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "约会(_A)"
 
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "创建新约会"
 
-#: calendar/gui/calendar-component.c:1118
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "新闻会议"
 
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1243
 msgid "M_eeting"
 msgstr "会议(_E)"
 
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1244
 msgid "Create a new meeting request"
 msgstr "创建一条新会议请求"
 
-#: calendar/gui/calendar-component.c:1126
+#: calendar/gui/calendar-component.c:1250
 msgid "New all day appointment"
 msgstr "新建全天约会"
 
-#: calendar/gui/calendar-component.c:1127
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "全天约会(_D)"
 
-#: calendar/gui/calendar-component.c:1128
+#: calendar/gui/calendar-component.c:1252
 msgid "Create a new all-day appointment"
 msgstr "创建新全天约会"
 
-#: calendar/gui/calendar-component.c:1134
+#: calendar/gui/calendar-component.c:1258
 msgid "New calendar"
 msgstr "新建日历"
 
-#: calendar/gui/calendar-component.c:1135
+#: calendar/gui/calendar-component.c:1259
 msgid "C_alendar"
 msgstr "日历(_A)"
 
-#: calendar/gui/calendar-component.c:1136
+#: calendar/gui/calendar-component.c:1260
 msgid "Create a new calendar"
 msgstr "创建新日历"
 
@@ -3933,15 +3898,36 @@ msgstr "周视图"
 msgid "Month View"
 msgstr "月视图"
 
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "概要含有"
+
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "描述含有"
+
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "注释含有"
+
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "描述含有"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "无匹配"
+
+#: calendar/gui/comp-editor-factory.c:409
 msgid "Error while opening the calendar"
 msgstr "打开日历时出错"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr "打开日历的方法不支持"
 
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 msgid "Permission denied to open the calendar"
 msgstr "没有权限打开日历"
 
@@ -3950,19 +3936,6 @@ msgstr "没有权限打开日历"
 msgid "open_client(): %s"
 msgstr ""
 
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "无法在“%s”中打开文件夹"
-
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "日历将显示的 URI"
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "要显示的视图"
-
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
 msgstr "音频提醒选项"
@@ -4028,7 +4001,7 @@ msgstr "每个额外时间"
 msgid "hours"
 msgstr "小时"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4047,14 +4020,14 @@ msgstr "基本"
 msgid "Date/Time:"
 msgstr "日期/时间："
 
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "显示消息"
-
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "播放声音"
 
+#: 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
 #, fuzzy
 msgid "Reminders"
@@ -4070,6 +4043,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
 msgid "Summary:"
 msgstr "概要："
@@ -4108,10 +4082,97 @@ msgstr "分钟"
 msgid "start of appointment"
 msgstr "约会开始"
 
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, fuzzy
+msgid "You must specify a location to get the calendar from."
+msgstr "您必须指定文件名。"
+
+#: calendar/gui/dialogs/calendar-setup.c:178
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "不支持装入“%s”必需的方法"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, 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
+msgid "Add Calendar"
+msgstr "添加日历"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:3
+msgid "Add Tasks Group"
+msgstr "添加任务组"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+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
+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
+msgid "_Add Calendar"
+msgstr "添加日历(_A)"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+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
+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
+msgid "_Type:"
+msgstr "类型(_T)："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+msgid "_URL:"
+msgstr "_URL："
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "已启用"
 
@@ -4125,19 +4186,19 @@ 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "启用"
 
@@ -4374,85 +4435,6 @@ msgstr "周三(_W)"
 msgid "before every appointment"
 msgstr "在每次约会前"
 
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, fuzzy
-msgid "You must specify a location to get the calendar from."
-msgstr "您必须指定文件名。"
-
-#: calendar/gui/dialogs/calendar-setup.c:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "不支持装入“%s”必需的方法"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, 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
-msgid "Add Calendar"
-msgstr "添加日历"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:3
-msgid "Add Tasks Group"
-msgstr "添加任务组"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:5
-msgid "Calendar Properties"
-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
-msgid "_Add Calendar"
-msgstr "添加日历(_A)"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-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
-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
-msgid "_Type:"
-msgstr "类型(_T)："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-msgid "_URL:"
-msgstr "_URL："
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "周"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -4527,31 +4509,6 @@ msgstr "%s  您已经做出了修改。放弃这些修改并更新编辑器吗�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您还没有进行修改，更新编辑器吗？"
 
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "校验错误：%s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " 到 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr " (预定 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "预定 "
-
 #: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "无法更新对象"
@@ -4585,8 +4542,8 @@ msgid "No summary"
 msgstr "没有概要"
 
 #: calendar/gui/dialogs/comp-editor.c:1376
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1037
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "另存为..."
 
@@ -4600,6 +4557,31 @@ msgstr "如果更新到达的话，对此项目的更改将被丢弃"
 msgid "Unable to use current version!"
 msgstr "无法使用当前版本！"
 
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "校验错误：%s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " 到 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr " (预定 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "预定 "
+
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 msgid "Could not open source"
 msgstr "无法打开源"
@@ -4717,27 +4699,27 @@ msgstr "授权给："
 msgid "Enter Delegate"
 msgstr "输入代表"
 
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "约会"
 
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "提醒"
 
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "再现"
 
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: 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:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "会议"
 
@@ -4833,17 +4815,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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -4869,8 +4846,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:1312 calendar/gui/e-calendar-view.c:1344
-#: mail/em-folder-tree.c:2609 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -5141,24 +5118,20 @@ msgstr "丢弃修改(_D)"
 msgid "Save Event"
 msgstr "保存事件"
 
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-msgid "Select source"
-msgstr "选择源"
-
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "投递目的"
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "calendar"
-msgstr "日历"
+#: calendar/gui/dialogs/select-source-dialog.c:86
+#, fuzzy
+msgid "_Destination"
+msgstr "草稿文件夹(_F)："
 
-#: calendar/gui/dialogs/select-source-dialog.c:71
-msgid "task list"
-msgstr "任务列表"
+#: calendar/gui/dialogs/select-source-dialog.c:88
+#, fuzzy
+msgid "Task List"
+msgstr "新建任务列表"
 
 #: calendar/gui/dialogs/send-comp.c:57
 msgid "The meeting information has been created. Send it?"
@@ -5186,38 +5159,44 @@ msgid "% _Complete"
 msgstr "完成百分比(_C)"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "高"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "低"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:875 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "中"
 
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "尚未开始"
 
@@ -5265,8 +5244,9 @@ msgstr "无法打开“%s”中的任务。"
 msgid "Con_fidential"
 msgstr "机密(_F)"
 
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "描述："
@@ -5405,101 +5385,56 @@ msgstr "在 %2$s 时 %1$s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 为未知触发类型"
 
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:321
-#: calendar/gui/e-cal-model.c:328 calendar/gui/e-calendar-table.c:352
-msgid "Public"
-msgstr "公开"
-
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:330
-#: calendar/gui/e-calendar-table.c:353
-msgid "Private"
-msgstr "保密"
-
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:332
-#: calendar/gui/e-calendar-table.c:354
-msgid "Confidential"
-msgstr "机密"
+#: calendar/gui/e-cal-component-preview.c:71 mail/em-folder-view.c:2346
+#, c-format
+msgid "Click to open %s"
+msgstr "点击以打开 %s"
 
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "结束日期"
+#: calendar/gui/e-cal-component-preview.c:156 filter/filter-rule.c:794
+msgid "Untitled"
+msgstr "无标题"
 
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
+#: 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-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "概要"
-
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "空闲"
-
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-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:629
-msgid "E"
-msgstr "东"
-
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "西"
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+msgstr "到期日期(_D)："
 
-#: calendar/gui/e-cal-model-tasks.c:573
-msgid ""
-"The geographical position must be entered in the format: \n"
-"\n"
-"45.436845,125.862501"
-msgstr ""
-"地理位置必须以此格式输入：\n"
-"\n"
-"45.436845,125.862501"
+#. write status
+#: calendar/gui/e-cal-component-preview.c:223
+#: calendar/gui/e-itip-control.c:950
+msgid "Status:"
+msgstr "状态："
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:168 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-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "优先级(_P)："
 
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:881
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "否"
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "网页(_W)："
 
-#. 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:170 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-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-cal-model.c:877
-msgid "Recurring"
-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-cal-model.c:879
-msgid "Assigned"
-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%"
@@ -5545,6 +5480,15 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+#: 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 "删除选中的对象"
@@ -5554,8 +5498,8 @@ msgid "Updating objects"
 msgstr "更新对象"
 
 #: calendar/gui/e-calendar-table.c:1022 calendar/gui/e-calendar-table.c:1063
-#: calendar/gui/e-calendar-view.c:1292 calendar/gui/e-calendar-view.c:1372
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "打开(_O)"
 
@@ -5564,41 +5508,42 @@ 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:1293 calendar/gui/e-calendar-view.c:1378
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: 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:1271 calendar/gui/e-calendar-view.c:1294
-#: calendar/gui/e-calendar-view.c:1376 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "打印(_P)..."
 
 #: calendar/gui/e-calendar-table.c:1029 calendar/gui/e-calendar-table.c:1058
-#: calendar/gui/e-calendar-view.c:1299 calendar/gui/e-calendar-view.c:1342
+#: 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
 #: 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:1300 calendar/gui/e-calendar-view.c:1340
-#: mail/em-folder-tree.c:2602 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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:1275 calendar/gui/e-calendar-view.c:1301
-#: calendar/gui/e-calendar-view.c:1374 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "粘贴(_P)"
 
@@ -5653,89 +5598,160 @@ msgstr "优先级"
 msgid "Start date"
 msgstr "开始日期"
 
+#: 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:11
 msgid "Task sort"
 msgstr "任务排序"
 
-#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1352
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 msgid "New _Appointment..."
 msgstr "新建约会(_A)..."
 
-#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1357
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "新建全天事件(_E)"
 
-#: calendar/gui/e-calendar-view.c:1266 calendar/gui/e-calendar-view.c:1362
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "新会议"
 
-#: calendar/gui/e-calendar-view.c:1267 calendar/gui/e-calendar-view.c:1367
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "新建任务"
 
-#: calendar/gui/e-calendar-view.c:1281 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 ui/evolution-calendar.xml.h:26
 msgid "Select _Today"
 msgstr "选择今天(_T)"
 
-#: calendar/gui/e-calendar-view.c:1282
+#: calendar/gui/e-calendar-view.c:1280
 msgid "_Select Date..."
 msgstr "选择日期(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1286 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "发布忙闲信息(_P)"
 
-#: calendar/gui/e-calendar-view.c:1305
+#: calendar/gui/e-calendar-view.c:1303
 msgid "Cop_y to Calendar..."
 msgstr "复制到日历(_Y)..."
 
-#: calendar/gui/e-calendar-view.c:1306
+#: calendar/gui/e-calendar-view.c:1304
 msgid "Mo_ve to Calendar..."
 msgstr "移动到日历(_V)..."
 
-#: calendar/gui/e-calendar-view.c:1307
+#: calendar/gui/e-calendar-view.c:1305
 msgid "_Schedule Meeting..."
 msgstr "调度会议(_S)..."
 
-#: calendar/gui/e-calendar-view.c:1308
+#: calendar/gui/e-calendar-view.c:1306
 msgid "_Forward as iCalendar..."
 msgstr "作为 iCalendar 转发(_F)..."
 
-#: calendar/gui/e-calendar-view.c:1313 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "删除此次出现(_O)"
 
-#: calendar/gui/e-calendar-view.c:1314 calendar/gui/e-calendar-view.c:1346
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "删除所有出现(_A)"
 
-#: calendar/gui/e-calendar-view.c:1348
+#: calendar/gui/e-calendar-view.c:1346
 msgid "Go to _Today"
 msgstr "转到今天(_T)"
 
-#: calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "转到日期(_G)..."
 
-#: calendar/gui/e-calendar-view.c:1380 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "设置(_S)..."
 
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "结束日期"
+
+#: 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: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-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:168 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
+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:629
+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"
+
 #. 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"
@@ -5752,43 +5768,36 @@ msgstr ""
 "\n"
 "%s"
 
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "%02i 分钟分割"
+#. 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 "上午"
+
+#. 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 "下午"
 
 #. 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-top-item.c:690 calendar/gui/e-day-view.c:1572
+#: 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 "%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-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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 "%B%d日"
 
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "上午"
-
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "下午"
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "%02i 分钟分割"
 
 #: calendar/gui/e-itip-control.c:592
 msgid "Yes. (Complex Recurrence)"
@@ -5889,10 +5898,6 @@ msgstr "<br> 请查看下列信息，并从下面的菜单中选择一个动作�
 msgid "<i>None</i>"
 msgstr "<i>无</i>"
 
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "状态："
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -5922,7 +5927,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "确定"
 
@@ -6135,59 +6140,55 @@ msgstr "附件中没有有效的日历信息"
 msgid "The attachment has no viewable calendar items"
 msgstr "附件中没有可查看的日历项目"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "无法更新日历文件！\n"
-
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "由于条目不再存在而无法更新参与者状态"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "对象无效，无法更新\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "此响应并非来自当前参与者。将响应者加为参与者吗？"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "因为无效状态而无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系统出错\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "找不到对象\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您没有适当的权限打开日历\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "更新参与者状态\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 msgid "Attendee status could not be updated!\n"
 msgstr "无法更新参与者状态！\n"
 
-#: calendar/gui/e-itip-control.c:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "删除完成"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "项目已发送！\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "无法发送项目！\n"
 
@@ -6304,36 +6305,6 @@ msgstr "被委任的"
 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-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-item.c:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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 "%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"
-msgstr "%Y-%m-%d"
-
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
 msgstr "办公室以外"
@@ -6394,7 +6365,34 @@ msgstr "会议开始时间(_S)："
 msgid "Meeting _end time:"
 msgstr "会议结束时间(_E)："
 
-#: calendar/gui/e-tasks.c:615 calendar/gui/gnome-cal.c:2021
+#. 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 "%Y年%m月%d日%A"
+
+#. 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 "%Y年%m月%d日%A"
+
+#. 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 "%Y-%m-%d"
+
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "为 %s 输入密码"
+
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -6403,19 +6401,19 @@ msgstr ""
 "%s 错误：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:643 calendar/gui/gnome-cal.c:2060
+#: 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:717
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "在 %s 打开任务"
 
-#: calendar/gui/e-tasks.c:740
+#: calendar/gui/e-tasks.c:709
 #, c-format
 msgid ""
 "Error opening %s:\n"
@@ -6424,47 +6422,106 @@ msgstr ""
 "打开 %s 出错：\n"
 " %s"
 
-#: calendar/gui/e-tasks.c:761
+#: calendar/gui/e-tasks.c:730
 msgid "Loading tasks"
 msgstr "装入任务"
 
-#: calendar/gui/e-tasks.c:865
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "正在完成的日期..."
 
-#: calendar/gui/e-tasks.c:888
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "正在删除选中的对象..."
 
-#: calendar/gui/e-tasks.c:915
+#: calendar/gui/e-tasks.c:884
 msgid "Expunging"
 msgstr "销毁"
 
-#: calendar/gui/gnome-cal.c:1879
+#: calendar/gui/e-tasks.c:960
+#: 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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "任务"
+
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "约会 - %s"
 
-#: calendar/gui/gnome-cal.c:1898
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "装入任务"
 
-#: calendar/gui/gnome-cal.c:1921
+#: calendar/gui/gnome-cal.c:1918
 #, c-format
 msgid "Opening %s"
 msgstr "打开 %s"
 
-#: calendar/gui/gnome-cal.c:2051
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:2895
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "都灵"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+#: 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 "Evolution 日历和任务"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 日历配置控件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 日历调度邮件查看器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 日历/任务新闻编辑器"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+msgid "Evolution's Calendar component"
+msgstr "Evolution 日历组件"
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+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 "任务(_T)"
+
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
 msgstr "四月"
@@ -6608,6 +6665,23 @@ msgstr ""
 msgid "On The Web"
 msgstr "网上"
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+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”。"
+
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "无法打开“%s”中的任务。"
+
 #: calendar/gui/print.c:489
 msgid "1st"
 msgstr "1日"
@@ -6827,7 +6901,7 @@ msgid "Contacts: "
 msgstr "联系人："
 
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "打印预览"
 
@@ -6839,67 +6913,75 @@ msgstr "打印项"
 msgid "Print Setup"
 msgstr "打印设置"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr "即将删除任务列表“%s”。您确定想要继续吗？"
 
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 msgid "New Task List"
 msgstr "新建任务列表"
 
-#: calendar/gui/tasks-component.c:469
+#: calendar/gui/tasks-component.c:398
+#, fuzzy, c-format
+msgid "%d task"
+msgid_plural "%d tasks"
+msgstr[0] "%d 个联系人"
+
+#: calendar/gui/tasks-component.c:400 mail/mail-component.c:500
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "已删除"
+
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "装入任务"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:481
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:519
+#: calendar/gui/tasks-component.c:576
 msgid ""
 "Selected task list is read-only, events cannot be created. Please select a "
 "read-write calendar."
 msgstr ""
 
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "新建任务"
 
-#: calendar/gui/tasks-component.c:733
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "任务(_T)"
 
-#: calendar/gui/tasks-component.c:734
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "创建新任务"
 
-#: calendar/gui/tasks-component.c:740
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "新建任务"
 
-#: calendar/gui/tasks-component.c:741
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "任务列表组"
 
-#: calendar/gui/tasks-component.c:742
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "创建新任务"
 
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "要显示的任务文件夹的 URI"
-
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "无法从“%s”中装入任务"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -6910,11 +6992,11 @@ msgstr ""
 "\n"
 "确实删除这些任务吗？"
 
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "不要再次询问。"
 
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "打印任务"
 
@@ -8562,7 +8644,7 @@ msgstr "将文件夹内容复制到本地以进行脱机操作"
 msgid "Downloading new messages for offline mode"
 msgstr "下载新邮件以进行脱机操作"
 
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "正在准备脱机文件夹“%s”"
@@ -8655,33 +8737,6 @@ msgstr "(user-tag)参数无效"
 msgid "Error executing filter search: %s: %s"
 msgstr "执行过滤规则搜索错误：%s：%s"
 
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"无法解析搜索表达式：%s：\n"
-"%s"
-
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"执行搜索表达式错误：%s：\n"
-"%s"
-
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(match-all) 需要一个布尔结果"
-
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "正在对未知的头进行查询：%s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -8713,7 +8768,52 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "过滤新邮件"
 
-#: camel/camel-gpg-context.c:712
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"无法解析搜索表达式：%s：\n"
+"%s"
+
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"执行搜索表达式错误：%s：\n"
+"%s"
+
+#: camel/camel-folder-search.c:672 camel/camel-folder-search.c:705
+msgid "(match-all) requires a single bool result"
+msgstr "(match-all) 需要一个布尔结果"
+
+#: camel/camel-folder-search.c:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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
+#, fuzzy
+msgid "(match-threads) expects an array result"
+msgstr "(match-all) 需要一个布尔结果"
+
+#: camel/camel-folder-search.c:791
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(match-all) 需要一个布尔结果"
+
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "正在对未知的头进行查询：%s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -8724,15 +8824,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示失败。"
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg 密码句请求失败。"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -8741,27 +8841,27 @@ msgstr ""
 "您需要一个密码句用来解锁以下用户：\n"
 "“%s”"
 
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解锁密钥失败：给出了 3 个错误的密码句。"
 
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "来自 GnuPG 的意外应答：%s"
 
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "加密失败：没有指定有效的收件人。"
 
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -8772,82 +8872,62 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "GPG %s 失败：%s\n"
 
-#: camel/camel-gpg-context.c:1246 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"
 
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 失败：%s"
 
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 失败。"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "这是消息的数字签名部分"
 
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "无法校验邮件签名：无法创建临时文件：%s"
 
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "无法校验邮件签名：无法创建临时文件：%s"
 
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "无法生成加密数据：%s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 msgid "This is a digitally encrypted message part"
 msgstr "这是邮件的数字加密部分"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 msgid "Encrypted content"
 msgstr "加密内容"
 
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 msgid "Unable to parse message content"
 msgstr "无法分析邮件内容"
 
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "无法创建锁定助手管道：%s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "无法创建锁定助手进程：%s"
-
-#: 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 "无法锁定 “%s”：lock-helper 协议错误"
-
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "无法锁定“%s”"
-
 #: camel/camel-lock.c:92 camel/camel-lock.c:113
 #, c-format
 msgid "Could not create lock file for %s: %s"
@@ -8868,6 +8948,26 @@ msgstr "用 fcntl(2) 获取锁失败：%s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "用 flock(2) 获取锁失败：%s"
 
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "无法创建锁定助手管道：%s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "无法创建锁定助手进程：%s"
+
+#: 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 "无法锁定 “%s”：lock-helper 协议错误"
+
+#: 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"
@@ -9107,7 +9207,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "来自服务器的无效认证应答。"
 
@@ -9305,7 +9405,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "加密证书(_P)："
 
 #: camel/camel-smime-context.c:360
@@ -9322,7 +9422,7 @@ msgstr "无法在 %s 创建文件夹锁：%s"
 msgid "Failed to add data to CMS encoder"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "认证失败。\n"
@@ -9393,98 +9493,98 @@ msgstr "无法创建文件夹：%s：%s"
 msgid "Cannot set message digests"
 msgstr "无法获取消息 %s：%s"
 
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "证书签名失败"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "编辑签名"
 
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "服务器：%s，类型：%s"
 
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP 命令失败：%s"
 
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 msgid "Can't find common bulk encryption algorithm"
 msgstr ""
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "从邮件创建规则(_T)"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "无法在 %s 创建文件夹锁：%s"
 
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "向服务器发送用户名失败"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "命令尚未实现"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -9501,16 +9601,26 @@ msgstr "无法创建文件夹：%s：%s"
 msgid "Cannot create folder: Invalid operation on this store"
 msgstr "无法创建文件夹：对该存储的无效操作"
 
-#: camel/camel-store.c:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:323
+#, fuzzy, c-format
+msgid "Cannot create folder: %s: folder exists"
+msgstr "无法创建文件夹：%s：%s"
+
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, c-format
 msgid "Cannot delete folder: %s: Invalid operation"
 msgstr "无法删除文件夹：%s：无效操作"
 
-#: camel/camel-store.c:793
+#: camel/camel-store.c:437 camel/camel-vee-store.c:390
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "无法重命名文件夹：%s：无效操作"
+
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "回收站"
 
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 msgid "Junk"
 msgstr "垃圾"
@@ -9631,7 +9741,7 @@ msgstr "密钥不支持证书签名"
 msgid "Error in application verification"
 msgstr "应用程序验证错误"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -9644,11 +9754,11 @@ msgstr ""
 "指纹：          %s\n"
 "签名：          %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "好"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "坏"
 
@@ -9672,7 +9782,7 @@ msgstr ""
 "您仍然希望接受吗？"
 
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -9687,7 +9797,7 @@ msgstr ""
 "\n"
 "您希望接受吗？"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -9696,7 +9806,7 @@ msgstr ""
 "证书问题：%s\n"
 "发行者：%s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -9705,7 +9815,7 @@ msgstr ""
 "无效的证书域名：%s\n"
 "发行者：%s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -9714,7 +9824,7 @@ msgstr ""
 "证书过期：%s\n"
 "发行者：%s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -9728,17 +9838,17 @@ msgstr ""
 msgid "Could not parse URL `%s'"
 msgstr "无法解析 URL “%s”"
 
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "存储“%s”错误：%s"
 
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "在 %2$s 中没有消息 %1$s"
 
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "无法将消息移动或复制到虚拟文件夹中"
 
@@ -9747,11 +9857,6 @@ msgstr "无法将消息移动或复制到虚拟文件夹中"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "无法删除文件夹：%s：没有该文件夹"
 
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "无法重命名文件夹：%s：无效操作"
-
 #: camel/camel-vee-store.c:398
 #, c-format
 msgid "Cannot rename folder: %s: No such folder"
@@ -9768,10 +9873,12 @@ msgid "Cannot copy messages to the Junk folder"
 msgstr "无法关闭临时文件夹：%s"
 
 #: 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 "在所有文件夹中检查新邮件"
@@ -9804,6 +9911,7 @@ msgid "For accessing Novell Groupwise servers"
 msgstr "访问 Novell GroupWise 服务器"
 
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -9823,26 +9931,318 @@ msgstr "该选项将使用普通文本密码连接到 IMAP 服务器。"
 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：%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 "无法获取文件夹：%s：%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "无法创建文件夹：%s：%s"
+
+#: 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：%s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:616
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': No such message"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件：%1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:621
+#, fuzzy, c-format
+msgid "Cannot get message %s from folder `%s': Bad command"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件：%1$s\n"
+"  %3$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 ""
+"无法从文件夹 %2$s 获取邮件：%1$s\n"
+"  %3$s"
+
+#: camel/providers/imap4/camel-imap4-folder.c:858
+#, fuzzy, c-format
+msgid "Cannot copy messages from folder `%s' to folder `%s': Unknown"
+msgstr ""
+"无法从文件夹 %2$s 获取邮件：%1$s\n"
+"  %3$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 ""
+"无法从文件夹 %2$s 获取邮件：%1$s\n"
+"  %3$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 ""
+"无法从文件夹 %2$s 获取邮件：%1$s\n"
+"  %3$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:429
+#, 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
+#, 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: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/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 "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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "连接已取消"
+
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
+
+#: 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:1109
+msgid "Unknown error"
+msgstr "未知的错误"
+
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "无法连接到 POP 服务器 %s：不支持请求认证机制。"
+
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s请为 %s@%s 输入 SMTP 密码"
+
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "认证到 POP 服务器 %s 失败：%s"
+
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
+
+#: 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：%s"
+
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+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：%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：%s"
+
+#: 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
+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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 msgid "Operation cancelled"
 msgstr "操作已取消"
 
 #: camel/providers/imap/camel-imap-command.c:302
-#: camel/providers/imap/camel-imap-store.c:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "服务器意外地中止了连接：%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:1089
-msgid "Unknown error"
-msgstr "未知的错误"
-
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
 #, c-format
@@ -9887,21 +10287,21 @@ msgstr "无法创建目录 %s：%s"
 msgid "Could not load summary for %s"
 msgstr "无法为 %s 装入概要"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: 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:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "正在扫描改变了的邮件"
 
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: 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:2010
+#: 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
@@ -9917,25 +10317,25 @@ msgstr ""
 "无法获取邮件：%s\n"
 "  %s"
 
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
 msgid "No such message"
 msgstr "没有该邮件"
 
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "该邮件目前不可用"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "无法在 FETCH 应答中找到邮件体。"
 
@@ -9974,23 +10374,6 @@ msgstr "使用自定义命令连接到服务器"
 msgid "Command:"
 msgstr "命令："
 
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "文件夹"
-
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "只显示订约了的文件夹"
-
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "覆盖服务器提供的文件夹命名空间"
-
-#: camel/providers/imap/camel-imap-provider.c:61
-msgid "Namespace"
-msgstr "命名空间"
-
 #: camel/providers/imap/camel-imap-provider.c:64
 msgid "Apply filters to new messages in INBOX on this server"
 msgstr "应用过滤规则到本服务器上收件箱中的新邮件"
@@ -10013,85 +10396,43 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "IMAP 服务器上的邮件的读写。"
 
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 服务器 %s"
-
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%2$s 为 %1$s 提供的 IMAP 服务"
-
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-msgid "SSL unavailable"
-msgstr "SSL 不可用"
-
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "连接已取消"
-
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式连接到 IMAP 服务器 %s 失败：%s"
-
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: camel/providers/pop3/camel-pop3-store.c:228
 msgid "SSL/TLS extension not supported."
 msgstr "不支持 SSL/TLS 扩展。"
 
-#: camel/providers/imap/camel-imap-store.c:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: camel/providers/pop3/camel-pop3-store.c:269
 msgid "SSL negotiations failed"
 msgstr "SSL 协商失败"
 
-#: camel/providers/imap/camel-imap-store.c:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, c-format
 msgid "Could not connect with command \"%s\": %s"
 msgstr "无法使用命令“%s”连接：%s"
 
-#: camel/providers/imap/camel-imap-store.c:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, c-format
 msgid "IMAP server %s does not support requested authentication type %s"
 msgstr "IMAP 服务器 %s 不支持要求的验证类型 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: 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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "您没有输入密码。"
 
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -10102,25 +10443,18 @@ msgstr ""
 "%s\n"
 "\n"
 
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "没有文件夹 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "文件夹名“%s”无效，原因是其中含有字符“%c”"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 msgid "The parent folder is not allowed to contain subfolders"
 msgstr "父文件夹不允许含有子文件夹"
 
-#: camel/providers/imap/camel-imap-store.c:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -10128,7 +10462,7 @@ msgstr "父文件夹不允许含有子文件夹"
 msgid "Cannot create folder `%s': folder exists."
 msgstr "无法创建文件夹：%s：%s"
 
-#: camel/providers/imap/camel-imap-store.c:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "未知的父文件夹：%s"
@@ -10232,58 +10566,58 @@ msgstr ""
 "对于读取和存储外部标准 mbox 脱机文件中的本地邮件。\n"
 "也可用于读取 Elm、Pine 或 Mutt 风格的文件夹树。"
 
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
 msgid "Store root %s is not an absolute path"
 msgstr "存储根目录 %s 不是绝对路径"
 
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "存储根目录 %s 不是普通目录"
 
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "本地存储没有收件箱"
 
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地邮件文件 %s"
 
-#: camel/providers/local/camel-local-store.c:295
+#: 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:360
+#: 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:385
+#: 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:395
+#: 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-store.c:418
+#: camel/providers/local/camel-local-store.c:456
 #: camel/providers/local/camel-mbox-store.c:320
 #, c-format
 msgid "Could not delete folder meta file `%s': %s"
@@ -10349,7 +10683,7 @@ msgstr "无法删除文件夹“%s”：%s"
 msgid "not a maildir directory"
 msgstr "不是邮件目录"
 
-#: camel/providers/local/camel-maildir-store.c:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -10682,7 +11016,7 @@ msgid "Server rejected username/password"
 msgstr "服务器拒绝了用户名/密码"
 
 #: camel/providers/nntp/camel-nntp-folder.c:168
-#: camel/providers/nntp/camel-nntp-folder.c:258
+#: 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
@@ -10691,8 +11025,8 @@ msgid "User cancelled"
 msgstr "用户已取消"
 
 #: camel/providers/nntp/camel-nntp-folder.c:170
-#: camel/providers/nntp/camel-nntp-folder.c:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -10701,48 +11035,48 @@ msgstr "用户已取消"
 msgid "Cannot get message %s: %s"
 msgstr "无法获取消息 %s：%s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "自动存储邮件错误：%s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 msgid "You cannot post NNTP messages while working offline!"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "无法关闭临时文件夹：%s"
@@ -10918,8 +11252,8 @@ msgstr "没有 uid 为 %s 的邮件"
 msgid "Retrieving POP message %d"
 msgstr "检索 POP 邮件 %d"
 
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "未知原因"
 
@@ -11367,7 +11701,7 @@ msgstr "%.0fM"
 msgid "%.0fG"
 msgstr "%.0fG"
 
-#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "附件"
 
@@ -11411,6 +11745,98 @@ msgstr "MIME 类型："
 msgid "Suggest automatic display of attachment"
 msgstr "建议自动显示附件"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "当使用该账户时总是发送签名邮件(_A)"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "当使用该账户时总是发送签名邮件(_A)"
+
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "无法打开文件"
+
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "无法从编辑器检索邮件"
+
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+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:1479
+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] "附加了 <b>%d</b> 个文件"
+
+#: composer/e-msg-composer.c:2327
+msgid "Hide _Attachment Bar (drop attachments here)"
+msgstr "隐藏附件栏(将附件拖至此处)(_A)"
+
+#: composer/e-msg-composer.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr "显示附件栏(将附件拖至此处)(_A)"
+
+#: 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 ""
+"无法创建撰写窗口：\n"
+"无法激活地址选择控制。"
+
+#: 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 ""
+"无法创建撰写窗口：\n"
+"无法激活 HTML 编辑器组件。\n"
+"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
+"本正确。\n"
+
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"无法创建撰写窗口：\n"
+"无法激活 HTML 编辑器组件。"
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>(编写器含有不可编辑的非文本消息体。)<b>"
+
 #: composer/e-msg-composer-hdrs.c:512
 msgid "Posting destination"
 msgstr "投递目的"
@@ -11491,207 +11917,135 @@ msgstr "<点击这里以便选择文件夹>"
 msgid "Attach file(s)"
 msgstr "添加附件"
 
-#: composer/e-msg-composer.c:695
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "当使用该账户时总是发送签名邮件(_A)"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "无法打开文件"
-
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "无法从编辑器检索邮件"
-
-#: composer/e-msg-composer.c:1551
-#, fuzzy
-msgid "Untitled Message"
-msgstr "多封邮件"
-
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "打开文件"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "自动生成的"
-
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "签名："
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] "附加了 <b>%d</b> 个文件"
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr "隐藏附件栏(将附件拖至此处)(_A)"
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr "显示附件栏(将附件拖至此处)(_A)"
-
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "撰写邮件"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "把文件附件到邮件"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"无法创建撰写窗口：\n"
-"无法激活地址选择控制。"
 
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"无法创建撰写窗口：\n"
-"无法激活 HTML 编辑器组件。\n"
-"请确定您的 gtkhtml 和 libgtkhtml 所安装的版\n"
-"本正确。\n"
 
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"无法创建撰写窗口：\n"
-"无法激活 HTML 编辑器组件。"
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>(编写器含有不可编辑的非文本消息体。)<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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/mail-composer-errors.xml.in.h:3
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "您真的想要删除此无标题约会吗？"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "下一封未读邮件"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "您希望保存修改吗？"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"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.in.h:7
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "无法创建管道：%s"
+msgid "Don't Recover"
+msgstr "不删除"
 
-#: composer/mail-composer-errors.xml.in.h:8
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "无法保存签名文件：%s"
+msgid "Recover"
+msgstr "删除"
 
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "无法保存签名文件：%s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
-msgid "Discard Changes"
-msgstr "丢弃修改(_D)"
-
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "您希望保存修改吗？"
+msgid "Error saving to autosave because \"{1}\"."
+msgstr "保存快捷方式错误。"
 
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "不删除"
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "警告：已改动的邮件"
 
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
 #, fuzzy
-msgid "Error saving to autosave because \"{1}\"."
-msgstr "保存快捷方式错误。"
+msgid ""
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "您真的想要删除此无标题约会吗？"
 
-#: composer/mail-composer-errors.xml.in.h:15
+#. mail-composer:exit-unsaved secondary
+#: composer/mail-composer-errors.xml.h:28
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"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.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "删除"
+msgid "Discard Changes"
+msgstr "丢弃修改(_D)"
 
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "保存邮件..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "无法创建管道：%s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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/mail-composer-errors.xml.in.h:20
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "下一封未读邮件"
+msgid "Could not read signature file \"{0}\"."
+msgstr "无法保存签名文件：%s"
 
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "警告：已改动的邮件"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "把文件附件到邮件"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
-#: composer/mail-composer-errors.xml.in.h:23
+#. 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 "在您可以撰写邮件之前您需要配置一个帐户。"
 
@@ -11818,7 +12172,8 @@ msgstr ""
 "指定名称的文件已经存在。\n"
 "覆盖它？"
 
-#: e-util/e-dialog-utils.c:251
+#. 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 "覆盖文件吗？"
 
@@ -11840,16 +12195,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"
@@ -11901,31 +12252,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"
@@ -11999,72 +12342,88 @@ msgstr "选择用于比较的时间"
 msgid "_Filter Rules"
 msgstr "过滤规则(_F)"
 
-#: filter/filter-errors.xml.in.h:1
-msgid "Bad regular expression \"{0}\"."
-msgstr "无效的正规表达式“{0}”。"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "文件“%s”不存在或者不是普通文件。"
-
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 msgid "Missing date."
 msgstr "缺少日期。"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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-errors.xml.in.h:6
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+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 "文件“%s”不存在或者不是普通文件。"
+
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 msgid "Missing folder."
 msgstr "缺少文件夹。"
 
-#: filter/filter-errors.xml.in.h:7
-msgid "Missing name."
-msgstr "缺少名称。"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr "名称“{0}”已使用。"
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "您必须指定文件夹。"
 
-#: filter/filter-errors.xml.in.h:9
-msgid "No sources selected."
-msgstr "没有选定来源。"
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
+msgid "Bad regular expression \"{0}\"."
+msgstr "无效的正规表达式“{0}”。"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
-msgstr "请另选一个名称。"
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "您忘记选择日期了。"
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+msgid "Missing name."
+msgstr "缺少名称。"
 
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "您必须为该过滤规则命名。"
 
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 msgid "You must name this vFolder."
 msgstr "您必须为该虚拟文件夹命名。"
 
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "您必须指定文件名。"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr "名称“{0}”已使用。"
 
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "您必须指定文件夹。"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr "请另选一个名称。"
+
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+msgid "No sources selected."
+msgstr "没有选定来源。"
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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-file.c:288
@@ -12076,64 +12435,11 @@ msgstr "选择文件"
 msgid "<b>Then</b>"
 msgstr "<b>则</b>"
 
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "选择文件夹"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "重要"
-
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "待办"
-
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "稍候"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "测试"
-
-#: filter/filter-rule.c:746
-msgid "Rule name:"
-msgstr "规则名："
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "无标题"
-
-#: filter/filter-rule.c:773
-msgid "<b>If</b>"
-msgstr "<b>如果</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "执行动作"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "如果满足所有条件"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "如果满足任一条件"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "接收"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "发送"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr "    "
@@ -12216,6 +12522,75 @@ 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
+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
+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
+msgid "Later"
+msgstr "稍候"
+
+#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
+msgid "Test"
+msgstr "测试"
+
+#: filter/filter-rule.c:790
+msgid "Rule name:"
+msgstr "规则名："
+
+#: filter/filter-rule.c:817
+msgid "<b>If</b>"
+msgstr "<b>如果</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "如果满足所有条件"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "如果满足任一条件"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "执行动作"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "被委任的"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "收件人"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "到 %s 的回复"
+
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "包含："
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "接收"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "发送"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -12345,7 +12720,7 @@ msgstr "未标志"
 msgid "Junk Test"
 msgstr "垃圾测试"
 
-#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "标签"
@@ -12382,7 +12757,7 @@ msgstr "管道到程序"
 msgid "Play Sound"
 msgstr "播放声音"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "已读"
 
@@ -12451,9 +12826,9 @@ msgstr "以之开始"
 msgid "Stop Processing"
 msgstr "停止处理"
 
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "主题"
@@ -12514,101 +12889,60 @@ msgstr "主题不含有"
 msgid "Virtual _Folders"
 msgstr "虚拟文件夹(_F)"
 
-#: filter/vfolder-rule.c:572
+#: filter/vfolder-rule.c:493
+#, fuzzy
+msgid "_Add"
+msgstr "添加(_D)"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "虚拟文件夹来源"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "编写器首选项"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此配置邮件首选项，包括安全和邮件显示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此配置拼写检查、签名和邮件编写器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在这里配置您的电子邮件账号"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-msgid "Evolution Mail"
-msgstr "Evolution 邮件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 邮件账户配置控制"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-msgid "Evolution Mail component"
-msgstr "Evolution 邮件组件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-msgid "Evolution Mail composer"
-msgstr "Evolution 邮件撰写器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 邮件撰写控件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 邮件文件夹查看器"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 邮件首选项控件"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "邮件"
-
-#: 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:96
-msgid "Mail Preferences"
-msgstr "邮件首选项"
-
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[默认]"
 
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "账户名"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "协议"
 
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "未命名"
 
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "语言"
 
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 msgid "Add signature script"
 msgstr "添加签名脚本"
 
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "签名"
 
-#: mail/em-folder-browser.c:139
+#: mail/em-composer-utils.c:888
+msgid "-------- Forwarded Message --------"
+msgstr "-------- 转发的邮件 --------"
+
+#: mail/em-composer-utils.c:1499
+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
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "在%Y年%m月%d日的%H:%M，%%s写道："
+
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "根据搜索创建虚拟文件夹(_V)..."
 
@@ -12642,543 +12976,569 @@ msgstr "<点击这里以便选择文件夹>"
 msgid "Create New Folder"
 msgstr "创建新文件夹"
 
-#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2334
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: 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 "文件夹名称(_N)："
 
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "虚拟文件夹"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "收件箱"
-
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "正在装入..."
-
-#: mail/em-folder-tree.c:934
+#: mail/em-folder-tree.c:839
 #, c-format
 msgid "Moving folder %s"
 msgstr "正在移动文件夹“%s”"
 
-#: mail/em-folder-tree.c:936
+#: mail/em-folder-tree.c:841
 #, c-format
 msgid "Copying folder %s"
 msgstr "正在复制文件夹 %s"
 
-#: mail/em-folder-tree.c:943
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, c-format
 msgid "Moving messages into folder %s"
 msgstr "正在把邮件移动到文件夹 %s"
 
-#: mail/em-folder-tree.c:945
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, c-format
 msgid "Copying messages into folder %s"
 msgstr "把邮件复制到文件夹 %s"
 
-#: mail/em-folder-tree.c:961
+#: mail/em-folder-tree.c:866
 msgid "Cannot drop message(s) into toplevel store"
 msgstr "无法将消息放到顶级文件夹存储"
 
-#: mail/em-folder-tree.c:2108 mail/em-folder-tree.c:2121
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: mail/em-folder-tree.c:956 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
+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
+msgid "_Move"
+msgstr "移动(_M)"
+
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "取消任务"
+
+#: 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/importers/evolution-mbox-importer.c:119
 msgid "Select folder"
 msgstr "选择文件夹"
 
-#: mail/em-folder-tree.c:2148
+#: mail/em-folder-tree.c:2056 mail/em-folder-view.c:812
+#, fuzzy
+msgid "C_opy"
+msgstr "复制"
+
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/em-folder-tree.c:2334 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 msgid "Create folder"
 msgstr "创建文件夹"
 
-#: mail/em-folder-tree.c:2526
+#: mail/em-folder-tree.c:2474
 #, c-format
 msgid "Rename the \"%s\" folder to:"
 msgstr "把文件夹“%s”重命名为："
 
-#: mail/em-folder-tree.c:2528
+#: mail/em-folder-tree.c:2476
 msgid "Rename Folder"
 msgstr "重命名文件夹"
 
-#: mail/em-folder-tree.c:2597 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "查看(_V)"
 
-#: mail/em-folder-tree.c:2598
+#: mail/em-folder-tree.c:2546
 msgid "Open in _New Window"
 msgstr "在新窗口中打开(_N)"
 
-#: mail/em-folder-tree.c:2603
-msgid "_Move"
-msgstr "移动(_M)"
-
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2607
+#: mail/em-folder-tree.c:2555
 msgid "_New Folder..."
 msgstr "新建文件夹(_N)..."
 
-#: mail/em-folder-tree.c:2610
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "重命名(_R)"
 
-#: mail/em-folder-tree.c:2613 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "虚拟文件夹"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+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:778
+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
+msgid "Mail"
+msgstr "邮件"
+
 #. { EM_POPUP_ITEM, "00.select.00", N_("_Open"), G_CALLBACK(emp_popup_open), NULL, NULL, 0 },
-#: mail/em-folder-view.c:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "作为新邮件进行编辑(_E)..."
 
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "打印(_P)"
 
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: ui/evolution-mail-message.xml.h:88
 msgid "Reply to _List"
 msgstr "回复邮件列表(_L)"
 
-#: mail/em-folder-view.c:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回复所有人(_A)"
 
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "转发(_F)"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "跟随(_W)..."
 
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "已完成标志(_G)"
 
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "清除标志(_E)"
 
-#: mail/em-folder-view.c:787 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 "标记为已读(_K)"
 
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "标记为未读(_U)"
 
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "标记为重要(_I)"
 
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "标记为不重要(_M)"
 
-#: mail/em-folder-view.c:791 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 "标记为垃圾(_J)"
 
-#: mail/em-folder-view.c:792 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 "标记为非垃圾(_N)"
 
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "取消删除(_N)"
 
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "移动到文件夹(_V)..."
 
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "复制到文件夹(_C)..."
 
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "将发件人添加到地址簿(_B)"
 
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "应用过滤规则(_Y)"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 msgid "F_ilter Junk"
 msgstr "过滤垃圾(_I)"
 
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "从邮件创建规则(_T)"
 
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "基于主题的虚拟文件夹(_S)"
 
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "基于发件人的虚拟文件夹(_N)"
 
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "基于收件人的虚拟文件夹(_R)"
 
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "基于邮件列表的虚拟文件夹(_L)"
 
-#: mail/em-folder-view.c:821
-msgid "VFolder on Thread"
-msgstr "基于线索的虚拟文件夹"
-
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "基于主题过滤(_J)"
 
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "基于发件人过滤(_D)"
 
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "基于收件人过滤(_C)"
 
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "基于邮件列表过滤(_M)"
 
-#: mail/em-folder-view.c:830
-msgid "Filter on Thread"
-msgstr "基于线索过滤"
-
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "默认"
 
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "打印消息"
 
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 msgid "_Copy Link Location"
 msgstr "复制链接位置(_C)"
 
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, c-format
 msgid "Click to mail %s"
 msgstr "点击以给 %s 发送邮件"
 
-#: mail/em-folder-view.c:2214
+#: 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 "抄送"
+
+#: 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 "密件抄送"
+
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+#: mail/em-format.c:993
 #, c-format
-msgid "Click to open %s"
-msgstr "点击以打开 %s"
+msgid "%s attachment"
+msgstr "%s 附件"
 
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+#: 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 ""
+
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "无法解析 MIME 邮件。显示源文本。"
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支持的方案"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "无法校验叶子签名"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "无法校验叶子签名"
+
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, c-format
-msgid "Matches: %d"
-msgstr "匹配：%d"
+msgid "Retrieving `%s'"
+msgstr "正在收取“%s”"
 
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 msgid "Unsigned"
 msgstr "未签名"
 
-#: mail/em-format-html-display.c:646
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "该邮件有数字签名，但不能证实是可信的。"
-
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
 msgid "Valid signature"
 msgstr "编辑签名"
 
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "该邮件有数字签名，但不能证实是可信的。"
-
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
 msgid "Invalid signature"
 msgstr "编辑签名"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-#, fuzzy
-msgid ""
-"This message is signed with a valid signature, but the sender of the message "
-"cannot be verified."
-msgstr "input_token 包含无效的签名，或者无法验证签名。"
-
-#: mail/em-format-html-display.c:655 mail/em-format-html.c:578
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
 msgid "Unencrypted"
 msgstr "被中断"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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:657 mail/em-format-html.c:580
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP 加密"
 
-#: mail/em-format-html-display.c:657
-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:658 mail/em-format-html.c:581
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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:755
-#, fuzzy
-msgid "_View Certificate"
-msgstr "证书 ID(_C)："
-
-#: mail/em-format-html-display.c:770
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "证书未生效"
-
-#: mail/em-format-html-display.c:1002
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A，%H:%M"
-
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
-msgstr "延误："
-
-#: mail/em-format-html-display.c:1013
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "到 %m月%d日%A，%H:%M"
-
-#: mail/em-format-html-display.c:1083
-msgid "_View Inline"
-msgstr "嵌入视图(_V)"
-
-#: mail/em-format-html-display.c:1084
-msgid "_Hide"
-msgstr "隐藏(_H)"
-
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d 页，共 %d 页"
-
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, c-format
-msgid "Retrieving `%s'"
-msgstr "正在收取“%s”"
-
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "格式不正确的 external-body 部分。"
 
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "指向 FTP 站点 (%s)"
 
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "在站点“%2$s”指向本地文件 (%1$s) 合法"
 
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "指向本地文件 (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "指向远程数据 (%s)"
 
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "指向未知的外部数据 (“%s”类型)"
 
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "正在移动邮件"
 
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "发件人"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "回复至"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件人"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "抄送"
-
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "密件抄送"
-
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: 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:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, c-format
+msgid "Matches: %d"
+msgstr "匹配：%d"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "该邮件有数字签名，但不能证实是可信的。"
+
+#: mail/em-format-html-display.c:645
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "该邮件有数字签名，但不能证实是可信的。"
+
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附件"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-#: mail/em-format.c:1065 mail/em-format.c:1184
+#: mail/em-format-html-display.c:647
 #, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "无法解析 MIME 邮件。显示源文本。"
+msgid ""
+"This message is signed with a valid signature, but the sender of the message "
+"cannot be verified."
+msgstr "input_token 包含无效的签名，或者无法验证签名。"
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "无法解析 MIME 邮件。显示源文本。"
+#: 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."
+msgstr ""
 
-#: mail/em-format.c:1339
+#: 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 ""
+
+#: 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 ""
+
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支持的方案"
+msgid "_View Certificate"
+msgstr "证书 ID(_C)："
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "无法校验叶子签名"
+msgid "This certificate is not viewable"
+msgstr "证书未生效"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "无法校验叶子签名"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "到 %m月%d日%A，%H:%M"
+
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr "延误："
+
+#: mail/em-format-html-display.c:1018
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "到 %m月%d日%A，%H:%M"
+
+#: mail/em-format-html-display.c:1088
+msgid "_View Inline"
+msgstr "嵌入视图(_V)"
+
+#: mail/em-format-html-display.c:1089
+msgid "_Hide"
+msgstr "隐藏(_H)"
 
-#: mail/em-junk-filter.c:82
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d 页，共 %d 页"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "每年"
 
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 msgid "Once per day"
 msgstr ""
 
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "每周"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "每月"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -13186,25 +13546,55 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "缓冲 %s 失败：%s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "无法创建文件夹：%s：%s"
 
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "缓冲 %s 失败：%s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr "无法将文件夹 %s 改名为 %s：%s"
 
-#: mail/em-migrate.c:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1715
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"无法创建输出文件：%s\n"
+" %s"
+
+#: mail/em-migrate.c:1919
+#, fuzzy, c-format
+msgid "Unable to open old POP keep-on-server data `%s': %s"
+msgstr "认证到 POP 服务器 %s 失败：%s"
+
+#: mail/em-migrate.c:1933
+#, fuzzy, c-format
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "创建到“%s”的管道失败：%s"
 
-#: mail/em-migrate.c:2350
+#: mail/em-migrate.c:1962
+#, c-format
+msgid "Unable to copy POP3 keep-on-server data `%s': %s"
+msgstr ""
+
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
-msgstr "解析主机“%s”：%s"
+msgid "Failed to create local mail storage `%s': %s"
+msgstr "创建到“%s”的管道失败：%s"
+
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"无法创建输出文件：%s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
 
 #: mail/em-popup.c:699
 msgid "Save As..."
@@ -13215,90 +13605,76 @@ msgstr "另存为..."
 msgid "untitled_image.%s"
 msgstr "无标题图像.%s"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr "设为背景(_B)"
 
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 msgid "_Reply to sender"
 msgstr "回复发件人(_R)"
 
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 msgid "_Open Link in Browser"
 msgstr "在浏览器中打开链接(_O)"
 
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 msgid "Se_nd message to..."
 msgstr "把邮件发送到列表(_N)..."
 
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 msgid "_Add to Addressbook"
 msgstr "添加到地址簿(_A)"
 
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 中打开..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "此服务器不支持 LDAPv3 schema 信息"
 
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 msgid "Subscribed"
 msgstr "已订阅"
 
-#: mail/em-subscribe-editor.c:637 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 "文件夹"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "请选择服务器。"
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "没有选定服务器"
 
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "不再显示此信息。"
 
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "过滤规则"
 
-#: mail/em-utils.c:530
-msgid "-------- Forwarded Message --------"
-msgstr "-------- 转发的邮件 --------"
-
-#: mail/em-utils.c:1137
-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-utils.c:1147
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "在%Y年%m月%d日的%H:%M，%%s写道："
-
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 msgid "message"
 msgstr "邮件"
 
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 msgid "Save Message..."
 msgstr "保存邮件..."
 
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "地址"
 
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "来自 %s 的邮件"
@@ -13438,159 +13814,160 @@ msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "邮件账户"
 
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "邮件账户"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "执行动作"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "默认窗口高度"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "新邮件提醒"
 
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "新邮件提醒"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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."
 msgstr "发送给不想接收 HTML 的联系人时提示(_P)"
 
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "发送只有暗送收件人的邮件时提示(_O)"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:65
@@ -13789,33 +14166,63 @@ msgstr ""
 msgid "spamd port"
 msgstr "导入"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
-msgid "Evolution Elm importer"
-msgstr "Evolution Elm 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
-msgid "Evolution Netscape Mail importer"
-msgstr "Evolution Netscape 邮件导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:2
+msgid "Composer Preferences"
+msgstr "编写器首选项"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr "Evolution Outlook Express 4 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:3
+msgid ""
+"Configure mail preferences, including security and message display, here"
+msgstr "在此配置邮件首选项，包括安全和邮件显示"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
-msgid "Evolution Pine importer"
-msgstr "Evolution Pine 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此配置拼写检查、签名和邮件编写器"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
-msgid "Evolution mbox importer"
-msgstr "Evolution mbox 导入器"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "在这里配置您的电子邮件账号"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr "MBox (mbox)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
+msgid "Evolution Mail"
+msgstr "Evolution 邮件"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr "Outlook Express 4 (.mbx)"
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 邮件账户配置控制"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
+msgid "Evolution Mail component"
+msgstr "Evolution 邮件组件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
+msgid "Evolution Mail composer"
+msgstr "Evolution 邮件撰写器"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
+msgid "Evolution Mail composer configuration control"
+msgstr "Evolution 邮件撰写控件"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 邮件首选项控件"
+
+#: 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:96
+msgid "Mail Preferences"
+msgstr "邮件首选项"
+
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+#, fuzzy
+msgid "_Mail"
+msgstr "邮件"
 
 #: mail/importers/elm-importer.c:88
 msgid "Evolution is importing your old Elm mail"
@@ -13823,15 +14230,15 @@ msgstr "Evolution 正在导入您原来的电子邮件"
 
 #: mail/importers/elm-importer.c:89
 #: mail/importers/evolution-mbox-importer.c:220
-#: mail/importers/evolution-outlook-importer.c:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "请稍候"
 
@@ -13863,19 +14270,47 @@ msgid "Select folder to import into"
 msgstr "选择要导入的证书..."
 
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: mail/importers/mail-importer.c:226
 #, fuzzy, c-format
 msgid "Importing `%s'"
 msgstr "正在导入"
 
-#: mail/importers/evolution-outlook-importer.c:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "正在导入文件"
 
-#: mail/importers/mail-importer.c:354
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+msgid "Evolution Elm importer"
+msgstr "Evolution Elm 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution Netscape 邮件导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr "Evolution Outlook Express 4 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+msgid "Evolution Pine importer"
+msgstr "Evolution Pine 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+msgid "Evolution mbox importer"
+msgstr "Evolution mbox 导入器"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr "MBox (mbox)"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr "Outlook Express 4 (.mbx)"
+
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "正在扫描 %s"
@@ -13885,7 +14320,7 @@ msgstr "正在扫描 %s"
 msgid "Priority Filter \"%s\""
 msgstr "优先级过滤器“%s”"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -13908,7 +14343,7 @@ msgstr ""
 "的过滤器也会用评分来替代优先级。请仔细检查导入的优先级，以确\n"
 "保过滤能够正常进行。"
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -13919,7 +14354,7 @@ msgstr ""
 "或“观察线索”特性，而 Evolution 并不支持该\n"
 "特性。这些过滤器将被丢弃。"
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -13931,24 +14366,24 @@ msgstr ""
 "给定字符串，而 Evolution 并不支持该特性。这些过滤器\n"
 "将被修改为给定字符串是否包含于邮件体中。"
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution 正在导入您原来的 Netscape 数据"
 
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "设置"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "邮件过滤规则"
 
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -13982,128 +14417,139 @@ msgid "Pine"
 msgstr "Pine"
 
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 账户编辑器"
 
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "主机(_H)："
 
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "用户名(_N)："
 
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "路径(_P)："
 
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "邮寄给 %s"
 
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "主题是 %s"
 
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "来自 %s 的邮件"
 
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 邮件列表"
 
-#: mail/mail-autofilter.c:318
-#, c-format
-msgid "Replies to %s"
-msgstr "到 %s 的回复"
-
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "添加过滤规则"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "已删除"
 
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, c-format
 msgid "%d junk"
 msgstr ""
 
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "%d 天"
 
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, fuzzy, c-format
 msgid "%d sent"
 msgstr "%d 秒"
 
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, fuzzy, c-format
 msgid "%d unsent"
 msgstr "%d 秒"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, fuzzy, c-format
 msgid "%d total"
 msgstr "%d 个联系人"
 
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, c-format
 msgid ", %d unread"
 msgstr ""
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "已删除"
-
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "新建邮件"
 
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "邮件(_M)"
 
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "撰写一封新邮件"
 
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "新建虚拟文件夹"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "邮件过滤规则"
 
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "创建新日历"
 
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "日历将显示的 URI"
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "检查服务"
 
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: 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:89
 msgid "Identity"
 msgstr "标识"
 
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -14112,12 +14558,12 @@ msgstr ""
 "请在下面输入您的姓名和电子邮件地址。下面的“可选”域不必填入，除非您想要在您发"
 "出的邮件中包含此信息。"
 
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 msgid "Receiving Mail"
 msgstr "接收邮件"
 
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -14125,15 +14571,15 @@ msgstr ""
 "请在下面输入您的收件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "请从以下选项中选择"
 
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 msgid "Sending Mail"
 msgstr "发送邮件"
 
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -14141,11 +14587,11 @@ msgstr ""
 "请在下面输入您的发件服务器信息。如果您不太确定的话，请询问您的系统管理员或者"
 "互联网服务提供商ISP。"
 
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "账户管理"
 
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -14156,14 +14602,6 @@ msgstr ""
 "您即将完成邮件配置的过程了。您提供的用于收件服务器和发送方式将被组合在一起，"
 "成为 Evolution 的邮件帐户。请在下面输入此帐户的名称。此名称只会用作显示。"
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "检查服务"
-
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "正在连接服务器..."
-
 #: mail/mail-config.glade.h:1
 #, fuzzy
 msgid " Ch_eck for Supported Types "
@@ -14805,346 +15243,451 @@ msgstr "颜色"
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-errors.xml.in.h:1
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
 #, fuzzy
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr "已经存在名为“%s”的文件夹。请使用不同的名称。"
-
-#: mail/mail-errors.xml.in.h:2
-msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "您确信您要删除该账户吗？"
+msgid "Invalid authentication"
+msgstr "身份验证"
 
-#: mail/mail-errors.xml.in.h:4
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "从该文件夹永久删除所有已删除的邮件"
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
 
-#: mail/mail-errors.xml.in.h:5
-#, fuzzy
+#. mail:camel-service-auth-failed primary
+#: mail/mail-errors.xml.h:6
+msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+msgstr ""
+
+#. mail:camel-service-auth-failed secondary
+#: mail/mail-errors.xml.h:8
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "永久删除所有文件夹中的所有已删除的邮件"
+"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-errors.xml.in.h:6
+#. 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 "您确定您想要删除此 URL 吗？"
 
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
-msgstr "发送只有暗送收件人的邮件时提示(_O)"
+msgid ""
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件：\n"
 
-#: mail/mail-errors.xml.in.h:8
+#: 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: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 "您确定要删除此联系人吗？"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
-msgstr ""
+#. 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 "发送只有暗送收件人的邮件时提示(_O)"
 
-#: mail/mail-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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-errors.xml.in.h:13
-#, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "无法复制文件夹：%s"
-
-#: mail/mail-errors.xml.in.h:14
-#, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "无法创建文件夹：%s：%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-errors.xml.in.h:15
-#, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "无法创建临时目录：%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-errors.xml.in.h:16
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr "无法创建目录“%s”：%s"
+msgid "Use default drafts folder?"
+msgstr "正在打开默认任务文件夹"
 
-#: mail/mail-errors.xml.in.h:17
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
 msgstr ""
-"无法删除文件夹：\n"
-"%s"
+"无法为该账户打开草稿文件夹。\n"
+"您是否希望使用默认草稿文件夹？"
 
-#: mail/mail-errors.xml.in.h:18
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "无法删除文件夹：%s：没有该文件夹"
+msgid "Use _Default"
+msgstr "默认"
 
-#: mail/mail-errors.xml.in.h:19
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "文件夹“%s”不存在。"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "从该文件夹永久删除所有已删除的邮件"
 
-#: mail/mail-errors.xml.in.h:20
-#, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "无法移动文件夹：%s"
+#. 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-errors.xml.in.h:21
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "无法打开“%s”：%s"
+msgid "_Expunge"
+msgstr "销毁(_X)"
 
-#: mail/mail-errors.xml.in.h:22
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "无法打开“%s”：%s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "永久删除所有文件夹中的所有已删除的邮件"
 
-#: mail/mail-errors.xml.in.h:23
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "无法打开消息"
+msgid "_Empty Trash"
+msgstr "清空回收站(_T)"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:25
-#, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "无法重命名文件夹：%s：没有该文件夹"
-
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+#. 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-errors.xml.in.h:27
-#, fuzzy
-msgid "Cannot save to directory \"{0}\"."
-msgstr "无法创建目录“%s”：%s"
-
-#: mail/mail-errors.xml.in.h:28
-#, fuzzy
-msgid "Cannot save to file \"{0}\"."
+#. mail:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message message, with the subject \"{0}\" was not delivered."
 msgstr ""
-"无法保存到“%s”\n"
-" %s"
 
-#: mail/mail-errors.xml.in.h:29
-#, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "添加签名(_A)"
-
-#: mail/mail-errors.xml.in.h:30
+#. mail:camel-exception secondary
+#: mail/mail-errors.xml.h:59
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"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-errors.xml.in.h:31
-#, fuzzy
-msgid "Could not save signature file."
-msgstr "无法保存签名文件：%s"
-
-#: mail/mail-errors.xml.in.h:32
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Delete \"{0}\"?"
-msgstr "删除“%s”"
+msgid "Error while {0}."
+msgstr ""
+"当“%s”时错误：\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:33
-#, fuzzy
-msgid "Delete account?"
-msgstr "删除选中的联系人"
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:34
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Discard changed?"
-msgstr "丢弃更改(_D)"
+msgid "Error while performing operation."
+msgstr ""
+"执行操作时错误：\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "您希望保存修改吗？"
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "不要删除"
+#. 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-errors.xml.in.h:37
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
 msgid "Enter password."
 msgstr "输入密码"
 
-#: mail/mail-errors.xml.in.h:38
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
 #, fuzzy
 msgid "Error loading filter definitions."
 msgstr ""
 "装入过滤规则信息错误：\n"
 "%s"
 
-#: mail/mail-errors.xml.in.h:39
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
-msgid "Error while performing operation."
+msgid "Cannot save to directory \"{0}\"."
+msgstr "无法创建目录“%s”：%s"
+
+#. mail:no-save-path secondary
+#: mail/mail-errors.xml.h:92
+msgid "{1}"
 msgstr ""
-"执行操作时错误：\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:40
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
-msgid "Error while {0}."
+msgid "Cannot save to file \"{0}\"."
+msgstr ""
+"无法保存到“%s”\n"
+" %s"
+
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
+#, fuzzy
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr "无法创建目录“%s”：%s"
+
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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 ""
-"当“%s”时错误：\n"
-"%s"
 
-#: mail/mail-errors.xml.in.h:41
+#. mail:no-write-path-exists secondary
+#: mail/mail-errors.xml.h:104
 #, fuzzy
 msgid "File exists but cannot overwrite it."
 msgstr "文件存在，覆盖它？"
 
-#: mail/mail-errors.xml.in.h:42
+#. 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-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
 msgstr ""
+"无法删除文件夹：\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:44
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "无法删除文件夹：%s：没有该文件夹"
+
+#. mail:no-delete-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."
+msgstr ""
+
+#. 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 "您真的要删除文件夹“%s”及其全部子文件夹吗？"
+
+#. 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-errors.xml.in.h:45
-msgid "If you proceed, the account information will be deleted permanently."
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
+#. 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-errors.xml.in.h:47
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "身份验证"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "无法移动文件夹：%s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
-msgstr ""
+#. 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 "无法打开“%s”：%s"
 
-#: mail/mail-errors.xml.in.h:49
-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: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-errors.xml.in.h:50
-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: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-errors.xml.in.h:51
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
-msgstr "您即将发送 HTML 格式的邮件。请确定下列收件人愿意接收 HTML 邮件：\n"
+msgid "Cannot create folder \"{0}\"."
+msgstr "无法创建文件夹：%s：%s"
 
-#: mail/mail-errors.xml.in.h:52
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "您真的要删除文件夹“%s”及其全部子文件夹吗？"
+msgid "Cannot open source \"{1}\""
+msgstr "无法打开“%s”：%s"
 
-#: mail/mail-errors.xml.in.h:53
-msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+#. 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-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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:account-incomplete secondary
+#: mail/mail-errors.xml.h:158
+msgid "You have not filled in all of the required information."
+msgstr "您还没有填写所有必须的信息。"
 
-#: mail/mail-errors.xml.in.h:55
+#. 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 ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+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 ""
-"下列虚拟文件夹：\n"
-"%s使用了已删除的文件夹：\n"
-"   “%s”\n"
-"已经被更新。"
 
-#: mail/mail-errors.xml.in.h:56
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "不要删除"
+
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
-msgstr ""
-"下列虚拟文件夹：\n"
-"%s使用了已删除的文件夹：\n"
-"   “%s”\n"
-"已经被更新。"
+msgid "Could not save signature file."
+msgstr "无法保存签名文件：%s"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "添加签名(_A)"
 
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
-msgstr ""
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
+#, fuzzy
+msgid "Discard changed?"
+msgstr "丢弃更改(_D)"
 
-#: mail/mail-errors.xml.in.h:61
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
 #, fuzzy
-msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP 服务器 %s 不支持请求的认证类型 %s。"
+msgid "Do you wish to save your changes?"
+msgstr "您希望保存修改吗？"
 
-#: mail/mail-errors.xml.in.h:62
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
 #, fuzzy
 msgid "This signature has been changed, but has not been saved."
 msgstr ""
@@ -15152,85 +15695,97 @@ msgstr ""
 "\n"
 "您希望保存改动吗？"
 
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"无法为该账户打开草稿文件夹。\n"
-"您是否希望使用默认草稿文件夹？"
-
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "默认"
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "丢弃更改(_D)"
 
-#: mail/mail-errors.xml.in.h:65
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Use default drafts folder?"
-msgstr "正在打开默认任务文件夹"
-
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "您还没有填写所有必须的信息。"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "文件夹“%s”不存在。"
 
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
+#. 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."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "您不能以相同的名字创建两个账户。"
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "丢弃更改(_D)"
-
-#: mail/mail-errors.xml.in.h:72
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
-msgid "_Empty Trash"
-msgstr "清空回收站(_T)"
+msgid ""
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
+msgstr ""
+"下列虚拟文件夹：\n"
+"%s使用了已删除的文件夹：\n"
+"   “%s”\n"
+"已经被更新。"
 
-#: mail/mail-errors.xml.in.h:73
-#, fuzzy
-msgid "_Expunge"
-msgstr "销毁(_X)"
+#. mail:filter-updated primary
+#: mail/mail-errors.xml.h:202
+msgid "Mail filters automatically updated."
+msgstr ""
 
-#: mail/mail-errors.xml.in.h:74
+#. mail:filter-updated secondary
+#: mail/mail-errors.xml.h:204
 #, fuzzy
-msgid "_Send"
-msgstr "发送"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
+msgid ""
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
+"下列虚拟文件夹：\n"
+"%s使用了已删除的文件夹：\n"
+"   “%s”\n"
+"已经被更新。"
 
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
+#. 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-errors.xml.in.h:78
-msgid "{1}"
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-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:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "正在查验 %s"
@@ -15239,20 +15794,20 @@ msgstr "正在查验 %s"
 msgid "Working"
 msgstr "工作"
 
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "过滤文件夹"
 
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "收取邮件"
 
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "应用寄出过滤器失败：%s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -15261,113 +15816,113 @@ msgstr ""
 "追加到 %s：%s 失败\n"
 "转而追加到本地“已发”文件夹。"
 
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "追加到本地“已发”文件夹失败：%s"
 
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, c-format
 msgid "Sending message %d of %d"
 msgstr "发送第 %d 个邮件，共 %d 个"
 
-#: mail/mail-ops.c:693
+#: mail/mail-ops.c:704
 #, fuzzy, c-format
 msgid "Failed to send %d of %d messages"
 msgstr "在第 %d 个消息失败，共 %d 个"
 
-#: mail/mail-ops.c:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "完成。"
 
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "把邮件保存到文件夹中"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "把邮件移动到 %s"
 
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "把邮件复制到 %s"
 
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "正在“%s”中扫描文件夹"
 
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "转发的邮件"
 
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "正在打开文件夹 %s"
 
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "正在打开存储 %s"
 
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "正在删除文件夹“%s”"
 
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "正在存储文件夹“%s”"
 
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "正在刷新文件夹"
 
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "正在销毁文件夹"
 
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, c-format
 msgid "Emptying trash in '%s'"
 msgstr "正在清空“%s”中的已删除邮件"
 
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "本地文件夹"
 
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "正在收取邮件 %s"
 
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
 msgstr[0] "正在收取 %d 封邮件"
 
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
 msgstr[0] "正在保存 %d 封邮件"
 
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -15376,7 +15931,7 @@ msgstr ""
 "无法创建输出文件：%s\n"
 " %s"
 
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -15385,11 +15940,11 @@ msgstr ""
 "在将邮件保存到 %s 时发生错误：\n"
 " %s"
 
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "正在保存附件"
 
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -15398,17 +15953,17 @@ msgstr ""
 "无法创建输出文件：%s：\n"
 " %s"
 
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "无法写数据：%s"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "正在断开与 %s 的连接"
 
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "正在重新连接到 %s"
@@ -15472,24 +16027,24 @@ msgstr "正在更新..."
 msgid "Waiting..."
 msgstr "正在等待..."
 
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "用户己取消操作。"
 
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "为 %s 输入密码"
 
-#: mail/mail-session.c:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "输入密码"
 
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "记住该密码(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "在本会话中记住该密码(_R)"
 
@@ -15531,89 +16086,94 @@ msgstr "转发的邮件"
 msgid "Invalid folder: `%s'"
 msgstr "无效的文件夹：“%s”"
 
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "设置虚拟文件夹：%s"
 
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "为 uri: %s 更新虚拟文件夹"
+
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "为 uri: %s 更新虚拟文件夹"
 
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "虚拟文件夹"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "编辑虚拟文件夹"
 
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "新建虚拟文件夹"
 
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "不可见"
 
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "可见"
 
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "已答复"
 
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "多封不可见邮件"
 
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "多封邮件"
 
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "最低"
 
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "较低"
 
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "较高"
 
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "最高"
 
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "?"
 
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "今天 %H:%M"
 
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %H:%M"
 
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%A %H:%M"
 
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%m月%d日 %H:%M"
 
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%Y年%m月%d日"
 
-#: mail/message-list.c:3105
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "正在生成邮件列表"
 
@@ -15645,43 +16205,43 @@ 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:42
+#: 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:85
+#: 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:86
+#: 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:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "跟随的标志"
 
@@ -15726,18 +16286,6 @@ msgstr "订阅(_S)"
 msgid "_Unsubscribe"
 msgstr "退订(_U)"
 
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-msgid "Evolution Shell"
-msgstr "Evolution 外壳"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-msgid "Evolution Test"
-msgstr "Evolution 测试"
-
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-msgid "Evolution Test component"
-msgstr "Evolution 测试组件"
-
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 msgid "480"
 msgstr "480"
@@ -15796,6 +16344,32 @@ msgstr "邮件"
 msgid "Brought to you by"
 msgstr "制作团队"
 
+#: shell/e-shell.c:545 shell/e-shell.c:546
+#, fuzzy, c-format
+msgid "%ld KB"
+msgstr "%m月%d日"
+
+#: shell/e-shell.c:744
+#, fuzzy
+msgid "Uknown system error."
+msgstr "未知的错误"
+
+#: shell/e-shell.c:1101
+msgid "Invalid arguments"
+msgstr "无效参数"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "无法注册到 OAF"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "找不到配置数据库"
+
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "通用错误"
+
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
 msgid "(Untitled)"
 msgstr "(无标题)"
@@ -15932,7 +16506,7 @@ msgstr "执行 gpg 失败。"
 msgid "_Import"
 msgstr "导入(_I)"
 
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "正在关闭连接..."
 
@@ -15973,77 +16547,60 @@ msgstr "文件夹名不能含有字符“#”。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是保留文件夹名。"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。"
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution 正在离线过程中。"
+
+#: shell/e-shell-window.c:349
+#, fuzzy
+msgid "Evolution is currently offline.  Click on this button to work online."
+msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
+
+#: shell/e-shell-window.c:621
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "邮寄给 %s"
+
+#: shell/e-shell-window-commands.c:64
 msgid "The GNOME Pilot tools do not appear to be installed on this system."
 msgstr "GNOME Pilot 工具好像并未安装到系统中。"
 
-#: shell/e-shell-window-commands.c:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "执行 %s 错误。"
 
-#: shell/e-shell-window-commands.c:120
+#: shell/e-shell-window-commands.c:121
 msgid "Bug buddy is not installed."
 msgstr "未安装 Bug buddy。"
 
-#: shell/e-shell-window-commands.c:128
+#: shell/e-shell-window-commands.c:129
 msgid "Bug buddy could not be run."
 msgstr "无法运行 Bug buddy。"
 
-#: shell/e-shell-window-commands.c:170
-msgid "About Ximian Evolution"
+#: shell/e-shell-window-commands.c:171
+#, fuzzy
+msgid "About Evolution"
 msgstr "关于 Ximian Evolution"
 
-#: shell/e-shell-window-commands.c:381
+#: shell/e-shell-window-commands.c:382
 msgid "_Work Online"
 msgstr "在线工作(_W)"
 
-#: shell/e-shell-window-commands.c:394 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "离线工作(_W)"
 
-#: shell/e-shell-window-commands.c:407 ui/evolution.xml.h:22
+#: shell/e-shell-window-commands.c:408 ui/evolution.xml.h:22
 msgid "Work Offline"
 msgstr "离线工作"
 
-#: shell/e-shell-window.c:336
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution 目前在线。点击该按钮则离线工作。"
-
-#: shell/e-shell-window.c:343
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution 正在离线过程中。"
-
-#: shell/e-shell-window.c:349
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution 目前离线。点击该按钮则在线工作。"
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "无效参数"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "无法注册到 OAF"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "找不到配置数据库"
-
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "通用错误"
-
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
 msgstr "复选框"
@@ -16114,6 +16671,51 @@ msgstr "当前连接"
 msgid "Click OK to close these connections and go offline"
 msgstr "点击确定以关闭这些连接并下线"
 
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+#, fuzzy
+msgid "C_alendar:"
+msgstr "日历(_A)"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "联系人："
+
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+#, fuzzy
+msgid "_Mail:"
+msgstr "邮件"
+
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+#, fuzzy
+msgid "_Tasks:"
+msgstr "任务(_T)"
+
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "文件类型(_T)："
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+#, fuzzy
+msgid "Open Other User's Folder"
+msgstr "已发送邮件文件夹(_M)："
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+#, fuzzy
+msgid "_Account:"
+msgstr "账户名(_A)："
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+#, fuzzy
+msgid "_Folder Name:"
+msgstr "文件夹名称"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+#, fuzzy
+msgid "_User:"
+msgstr "用户名(_N)："
+
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
 msgstr "Evolution 设置助手"
@@ -16154,6 +16756,18 @@ msgstr ""
 "\n"
 "单击“应用”按钮可保存您的设置。"
 
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+msgid "Evolution Shell"
+msgstr "Evolution 外壳"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+msgid "Evolution Test"
+msgstr "Evolution 测试"
+
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+msgid "Evolution Test component"
+msgstr "Evolution 测试组件"
+
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
 msgstr "点击“导入”以便开始将文件导入到 Evolution。"
@@ -16217,13 +16831,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以从下列文件中导入数据："
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
-#, no-c-format
+#: shell/main.c:231
+#, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -16249,57 +16863,48 @@ msgstr ""
 "\n"
 "我们希望您尽情享受我们努力工作的成果，我们也热切盼望着您的意见！\n"
 
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "感谢\n"
 "Ximian Evolution 团队\n"
 
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "不要再问我"
 
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "无法访问 Ximian Evolution shell。"
-
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "无法初始化 Ximian Evolution shell：%s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "以离线模式启动"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "以在线模式启动"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr "强制关闭所有 Evolution 组件"
 
-#: shell/main.c:508
+#: shell/main.c:507
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr ""
 
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "把所有成员的调试输出发送到一个文件中。"
 
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -16308,6 +16913,72 @@ msgstr ""
 "%s：不能同时使用 --online 和 --offline。\n"
 "  详情请使用 %s --help。\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "连接"
+
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "无法访问 Ximian Evolution shell。"
+
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution 账户助手"
+
+#. 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 ""
+
+#. 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 ""
+
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
 #: smime/gui/certificate-manager.c:522
 msgid "Select a cert to import..."
@@ -16554,12 +17225,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "您的证书"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "卡片 ID 已经存在"
-
 #: smime/lib/e-cert.c:234 smime/lib/e-cert.c:244
 msgid "%d/%m/%Y"
 msgstr "%Y-%m-%d"
@@ -16766,6 +17431,12 @@ msgstr "主题是 %s"
 msgid "Certificate Signature Value"
 msgstr "证书签名失败"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "卡片 ID 已经存在"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -16876,7 +17547,8 @@ msgid "Select all contacts"
 msgstr "选中所有的联系人"
 
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "给选定的联系人发邮件。"
 
 #: ui/evolution-addressbook.xml.h:24
@@ -16907,8 +17579,8 @@ msgstr "查看当前联系人"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "操作(_A)"
@@ -16926,7 +17598,8 @@ msgid "_Preview Pane"
 msgstr "预览板(_P)"
 
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "另存为 VCard(_S)"
 
 #: ui/evolution-addressbook.xml.h:42
@@ -17386,6 +18059,16 @@ msgstr "反转选择(_I)"
 msgid "_Threaded Message List"
 msgstr "按线索编排的邮件列表(_T)"
 
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+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
+msgid "_Close"
+msgstr "关闭(_C)"
+
 #: ui/evolution-mail-message.xml.h:1
 msgid "A_dd Sender to Address Book"
 msgstr "将发件人添加到地址簿(_D)"
@@ -17626,7 +18309,8 @@ msgid "Open the selected message in a new window"
 msgstr "在新窗口中打开选中的邮件"
 
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "在邮件撰写器中打开选中的邮件以便重发"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -17741,58 +18425,46 @@ msgstr "基于主题的虚拟文件夹(_S)..."
 msgid "_Attached"
 msgstr "附加(_A)"
 
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "复制到文件夹(_C)"
-
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "根据邮件创建过滤规则(_C)"
 
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "转到(_G)"
 
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "嵌入(_I)"
 
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "较大(_L)"
 
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "邮件显示(_M)"
 
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "移动到文件夹(_M)"
-
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "下一封邮件(_N)"
 
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "普通显示(_N)"
 
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "打开邮件(_O)"
 
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "上一封邮件(_P)"
 
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "重发(_R)..."
-
 #: ui/evolution-mail-message.xml.h:129 ui/evolution.xml.h:34
 msgid "_Tools"
 msgstr "工具(_T)"
@@ -17801,16 +18473,6 @@ msgstr "工具(_T)"
 msgid "_Undelete"
 msgstr "取消删除(_U)"
 
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-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
-msgid "_Close"
-msgstr "关闭(_C)"
-
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
 msgstr "附件"
@@ -18199,6 +18861,11 @@ msgstr "快速首选项(_Q)"
 msgid "_Send / Receive"
 msgstr "发送/接收(_S)"
 
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "新建窗口(_W)"
+
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
 msgstr "按公司(_C)"
@@ -18263,10 +18930,6 @@ msgstr "到期日期(_D)"
 msgid "With _Status"
 msgstr "状态(_S)s"
 
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "任务(_T)"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -18421,6 +19084,35 @@ msgstr "其它..."
 msgid "..."
 msgstr "..."
 
+#: widgets/misc/e-error.c:78 widgets/misc/e-error.c:79
+#: widgets/misc/e-error.c:121
+#, fuzzy
+msgid "Evolution Error"
+msgstr "Evolution"
+
+#: widgets/misc/e-error.c:80 widgets/misc/e-error.c:81
+#: widgets/misc/e-error.c:119
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution 邮件"
+
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "会议信息"
+
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution 测试"
+
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "已发送和草稿邮件"
+
 #: widgets/misc/e-expander.c:181
 #, fuzzy
 msgid "Expanded"
@@ -18535,6 +19227,35 @@ msgstr "文字"
 msgid "Find _Now"
 msgstr "立即查找(_N)"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"您打算覆盖它吗？"
+
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"无法保存到“%s”\n"
+" %s"
+
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"无法保存到“%s”\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -18545,3 +19266,81 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution 地址簿文件夹查看器"
+
+#~ msgid "Address 2:"
+#~ msgstr "地址 2："
+
+#~ msgid "Blog:"
+#~ msgstr "Blog："
+
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution 日历查看器"
+
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution 任务查看器"
+
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "无法创始化 gnome-vfs"
+
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "无法在“%s”中打开文件夹"
+
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "日历将显示的 URI"
+
+#~ msgid "The type of view to show"
+#~ msgstr "要显示的视图"
+
+#~ msgid "Display a message"
+#~ msgstr "显示消息"
+
+#~ msgid "Select source"
+#~ msgstr "选择源"
+
+#~ msgid "calendar"
+#~ msgstr "日历"
+
+#~ msgid "task list"
+#~ msgstr "任务列表"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "无法更新日历文件！\n"
+
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "要显示的任务文件夹的 URI"
+
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "无法从“%s”中装入任务"
+
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution 邮件文件夹查看器"
+
+#~ msgid "VFolder on Thread"
+#~ msgstr "基于线索的虚拟文件夹"
+
+#~ msgid "Filter on Thread"
+#~ msgstr "基于线索过滤"
+
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "缓冲 %s 失败：%s"
+
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "缓冲 %s 失败：%s"
+
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "解析主机“%s”：%s"
+
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "日历将显示的 URI"
+
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "无法初始化 Ximian Evolution shell：%s"
+
+#~ msgid "_Resend..."
+#~ msgstr "重发(_R)..."
diff --git a/po/zh_TW.po b/po/zh_TW.po
index b042511723..a0296bdd4e 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-04-29 13:14-0400\n"
+"POT-Creation-Date: 2004-05-19 14:00-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"
@@ -23,6 +23,18 @@ msgstr ""
 msgid "evolution addressbook"
 msgstr "Evolution 目錄服務迷你名片檢視"
 
+# ui/evolution-addressbook.xml.h:17
+#: a11y/addressbook/ea-minicard.c:105
+#, fuzzy
+msgid "contact's header: "
+msgstr "連絡人: "
+
+# ui/evolution.xml.h:17
+#: a11y/addressbook/ea-minicard.c:166
+#, fuzzy
+msgid "evolution minicard"
+msgstr "Evolution 視窗(_W)"
+
 #: a11y/addressbook/ea-minicard-view.c:101
 #, fuzzy
 msgid "current addressbook folder "
@@ -58,18 +70,6 @@ msgstr "名片"
 msgid " card"
 msgstr "1 張名片"
 
-# ui/evolution-addressbook.xml.h:17
-#: a11y/addressbook/ea-minicard.c:105
-#, fuzzy
-msgid "contact's header: "
-msgstr "連絡人: "
-
-# ui/evolution.xml.h:17
-#: a11y/addressbook/ea-minicard.c:166
-#, fuzzy
-msgid "evolution minicard"
-msgstr "Evolution 視窗(_W)"
-
 # mail/mail-config.glade.h:29
 #: addressbook/conduit/address-conduit.c:272
 msgid "Default Sync Address:"
@@ -89,83 +89,21 @@ msgstr "無法載入 %s：%s"
 msgid "Could not read pilot's Address application block"
 msgstr "無法讀取 pilot 通訊錄程式區塊"
 
-# mail/mail-config.glade.h:76
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
-#, fuzzy
-msgid "Autocompletion"
-msgstr "自動補齊資料夾"
-
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
-#, fuzzy
-msgid "Certificates"
-msgstr "憑證 ID(_C):"
-
-# ui/evolution-mail.xml.h:19
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
-#, fuzzy
-msgid "Configure autocomple here"
-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/GNOME_Evolution_Addressbook.server.in.in.h:4
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:51
-#: calendar/gui/migration.c:373
-msgid "Contacts"
-msgstr "連絡人"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Addressbook"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Addressbook address pop-up"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Addressbook address viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Addressbook card viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Addressbook component"
-msgstr "Evolution 測試元件。"
-
-# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Addressbook folder viewer"
-msgstr "Evolution 目錄服務迷你名片檢視"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
-#, fuzzy
-msgid "Evolution S/Mime Certificate Management Control"
-msgstr "Evolution 郵件執行摘要元件。"
+#: addressbook/gui/component/addressbook.c:89
+msgid "Accessing LDAP Server anonymously"
+msgstr "正以匿名方式存取 LDAP 伺服器"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
-msgid "Evolution folder settings configuration control"
-msgstr ""
+#: addressbook/gui/component/addressbook.c:165
+#: camel/providers/groupwise/camel-gw-listener.c:369
+msgid "Failed to authenticate.\n"
+msgstr "驗證憑證失敗。\n"
 
-#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
-msgid "Manager your S/Mime certificates here"
-msgstr ""
+# camel/camel-smime-context.c:194
+#: addressbook/gui/component/addressbook.c:171
+#: camel/providers/groupwise/camel-gw-listener.c:358
+#, c-format
+msgid "%sEnter password for %s (user %s)"
+msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
 
 # ui/evolution-addressbook.xml.h:7
 #: addressbook/gui/component/addressbook-component.c:93
@@ -217,49 +155,53 @@ msgstr "連絡人(_C):"
 msgid "Create a new contacts group"
 msgstr "新增功能群組"
 
+#: addressbook/gui/component/addressbook-component.c:182
+msgid "Failed upgrading Addressbook settings or folders."
+msgstr ""
+
 # camel/providers/imap/camel-imap-store.c:531
-#: addressbook/gui/component/addressbook-config.c:466
+#: 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:490
+#: addressbook/gui/component/addressbook-config.c:507
 msgid "Failed to authenticate with LDAP server"
 msgstr "無法驗證進入 LDAP 伺服器"
 
-#: addressbook/gui/component/addressbook-config.c:518
+#: addressbook/gui/component/addressbook-config.c:535
 msgid "Could not perform query on Root DSE"
 msgstr "無法在 Root DSE 上執行查詢"
 
-#: addressbook/gui/component/addressbook-config.c:822
+#: addressbook/gui/component/addressbook-config.c:840
 msgid "The server responded with no supported search bases"
 msgstr "伺服器回報了不支援的搜尋起點"
 
-#: addressbook/gui/component/addressbook-config.c:1216
+#: 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:1237
+#: 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:1245
+#: 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:1070
+#: calendar/gui/migration.c:137 mail/em-migrate.c:1064
 #, 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:1111
+#: calendar/gui/migration.c:184 mail/em-migrate.c:1105
 #, fuzzy, c-format
 msgid "Migrating `%s':"
 msgstr "Pinging %s"
@@ -267,8 +209,8 @@ msgstr "Pinging %s"
 #. create the local source group
 #: addressbook/gui/component/addressbook-migrate.c:438
 #: calendar/gui/migration.c:446 calendar/gui/migration.c:528
-#: mail/em-folder-tree-model.c:192 mail/em-folder-tree-model.c:194
-#: mail/mail-component.c:242
+#: 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 ""
 
@@ -276,7 +218,7 @@ msgstr ""
 #: addressbook/gui/component/addressbook-migrate.c:446
 #: addressbook/gui/contact-editor/contact-editor.glade.h:37
 #: calendar/gui/migration.c:454 calendar/gui/migration.c:536
-#: filter/filter-label.c:123 mail/em-migrate.c:924 mail/mail-config.c:67
+#: filter/filter-label.c:123 mail/em-migrate.c:918 mail/mail-config.c:78
 #: mail/mail-config.glade.h:106
 msgid "Personal"
 msgstr "個人"
@@ -329,21 +271,59 @@ msgid ""
 "Please be patient while Evolution migrates your Pilot Sync data..."
 msgstr ""
 
-#: addressbook/gui/component/addressbook.c:89
-msgid "Accessing LDAP Server anonymously"
-msgstr "正以匿名方式存取 LDAP 伺服器"
+#: addressbook/gui/component/addressbook-view.c:674
+#, c-format
+msgid "Address book '%s' will be removed. Are you sure you want to continue?"
+msgstr ""
 
-#: addressbook/gui/component/addressbook.c:165
-#: camel/providers/groupwise/camel-gw-listener.c:369
-msgid "Failed to authenticate.\n"
-msgstr "驗證憑證失敗。\n"
+# importers/pine-importer.c:661
+#: addressbook/gui/component/addressbook-view.c:761
+#, fuzzy
+msgid "New Address Book"
+msgstr "目錄服務"
 
-# camel/camel-smime-context.c:194
-#: addressbook/gui/component/addressbook.c:171
-#: camel/providers/groupwise/camel-gw-listener.c:358
-#, c-format
-msgid "%sEnter password for %s (user %s)"
-msgstr "%s請輸入 %s 所需的密碼(使用者 %s)"
+# addressbook/gui/component/addressbook-config.glade.h:3
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
+# addressbook/gui/widgets/e-addressbook-view.c:616
+# calendar/gui/e-meeting-dialog.glade.h:8
+# calendar/gui/event-editor-dialog.glade.h:9
+# mail/mail-config.glade.h:23
+# mail/message-browser.c:202
+# ui/evolution-addressbook.xml.h:3
+# 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
+#: ui/evolution-contact-list-editor.xml.h:3 ui/evolution-mail-message.xml.h:24
+#: ui/evolution-tasks.xml.h:6
+msgid "Delete"
+msgstr "刪除"
+
+# ui/evolution-event-editor.xml.h:70
+# 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
+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
+#: 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 "連絡人"
 
 #: addressbook/gui/component/apps_evolution_addressbook.schemas.in.in.h:1
 msgid "EFolderList xml for the list of completion uris"
@@ -363,6 +343,77 @@ msgstr ""
 msgid "URI for the folder last used in the select names dialog"
 msgstr ""
 
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:1
+msgid "*Control*F2"
+msgstr ""
+
+# mail/mail-config.glade.h:76
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:2
+#, fuzzy
+msgid "Autocompletion"
+msgstr "自動補齊資料夾"
+
+# ui/evolution-addressbook.xml.h:17
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:3
+#, fuzzy
+msgid "C_ontacts"
+msgstr "連絡人"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:4
+#, fuzzy
+msgid "Certificates"
+msgstr "憑證 ID(_C):"
+
+# ui/evolution-mail.xml.h:19
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:5
+#, fuzzy
+msgid "Configure autocomplete here"
+msgstr "在此設定您的郵件帳號"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Addressbook"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Addressbook address pop-up"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Addressbook address viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:10
+#, fuzzy
+msgid "Evolution Addressbook card viewer"
+msgstr "Evolution 目錄服務迷你名片檢視"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Addressbook component"
+msgstr "Evolution 測試元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:12
+#, fuzzy
+msgid "Evolution S/Mime Certificate Management Control"
+msgstr "Evolution 郵件執行摘要元件。"
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:13
+msgid "Evolution folder settings configuration control"
+msgstr ""
+
+#: addressbook/gui/component/GNOME_Evolution_Addressbook.server.in.in.h:14
+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 "
@@ -385,6 +436,7 @@ msgstr " 顯示支援的起點(_S) "
 #: calendar/gui/dialogs/url-editor-dialog.glade.h:1
 #: composer/e-msg-composer-attachment.glade.h:1 mail/mail-config.glade.h:2
 #: 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 "*"
@@ -465,7 +517,7 @@ msgstr "連絡人(_C):"
 msgid "Address Book Properties"
 msgstr "目錄服務來源"
 
-#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:68
+#: addressbook/gui/component/ldap-config.glade.h:18 mail/mail-account-gui.c:79
 #: mail/mail-config.glade.h:40
 msgid "Always"
 msgstr "永遠"
@@ -480,132 +532,113 @@ msgstr "匿名"
 msgid "Basic"
 msgstr "基本"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: addressbook/gui/component/ldap-config.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:4
-#, fuzzy
-msgid "C_olor:"
-msgstr "顏色(_O)"
-
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:22
+#: 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:23
+#: addressbook/gui/component/ldap-config.glade.h:22
 #: 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:24
+#: addressbook/gui/component/ldap-config.glade.h:23
 msgid "Distinguished _name:"
 msgstr "'辨別的名稱(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:25
+#: addressbook/gui/component/ldap-config.glade.h:24
 #, fuzzy
 msgid "Distinguished name"
 msgstr "'辨別的名稱(_N):"
 
-#: addressbook/gui/component/ldap-config.glade.h:26
+#: addressbook/gui/component/ldap-config.glade.h:25
 #, fuzzy
 msgid "Download limit:"
 msgstr "下載限制(_D):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:26
 #, fuzzy
 msgid "Email address"
 msgstr "電子郵件位址(_A):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:28
+#: addressbook/gui/component/ldap-config.glade.h:27
 #, fuzzy
 msgid "Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:29
+#: 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:30
+#: addressbook/gui/component/ldap-config.glade.h:29
 msgid ""
 "Evolution will use this email address to authenticate you with the server"
 msgstr "Evolution 會使用電子郵件位址透過伺服器來驗證您"
 
-#: addressbook/gui/component/ldap-config.glade.h:31
+#: addressbook/gui/component/ldap-config.glade.h:30
 #, 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:32
-#: calendar/gui/dialogs/calendar-setup.glade.h:6 mail/mail-config.glade.h:84
-#: smime/gui/smime-ui.glade.h:27
+#: addressbook/gui/component/ldap-config.glade.h:31
+#: calendar/gui/dialogs/calendar-setup.glade.h:6
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: mail/mail-config.glade.h:84 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:33 mail/mail-account-gui.c:70
+#: addressbook/gui/component/ldap-config.glade.h:32 mail/mail-account-gui.c:81
 #: mail/mail-config.glade.h:99
 msgid "Never"
 msgstr "永不"
 
 # addressbook/gui/component/addressbook-config.c:179
-#: addressbook/gui/component/ldap-config.glade.h:34
+#: addressbook/gui/component/ldap-config.glade.h:33
 msgid "One"
 msgstr "一層"
 
-#: addressbook/gui/component/ldap-config.glade.h:35
+#: addressbook/gui/component/ldap-config.glade.h:34
 msgid "Only locations within starting point"
 msgstr ""
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
-# mail/mail-config.glade.h:54
-#: addressbook/gui/component/ldap-config.glade.h:36
-#: calendar/gui/dialogs/calendar-setup.glade.h:7 mail/mail-config.glade.h:107
-msgid "Pick a color"
-msgstr "選取顏色"
-
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:37
+#: addressbook/gui/component/ldap-config.glade.h:35
 msgid "S_earch scope: "
 msgstr "搜尋範圍(_E):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:38
+#: addressbook/gui/component/ldap-config.glade.h:36
 #, fuzzy
 msgid "Search base only"
 msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:39
+#: addressbook/gui/component/ldap-config.glade.h:37
 #, fuzzy
 msgid "Search base:"
 msgstr "搜尋起點(_S):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:40
+#: addressbook/gui/component/ldap-config.glade.h:38
 #, 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:41
+#: addressbook/gui/component/ldap-config.glade.h:39
 msgid "Searching"
 msgstr "搜尋中"
 
-#: addressbook/gui/component/ldap-config.glade.h:42
+#: addressbook/gui/component/ldap-config.glade.h:40
 msgid ""
 "Selecting this option means that Evolution will only connect to your LDAP "
 "server if\n"
@@ -614,7 +647,7 @@ msgstr ""
 "選擇這個選項代表 Evolution 只有在您的 LDAP 伺服器支援 SSL 或 TLS 時\n"
 "才會連線到您的 LDAP 伺服器。"
 
-#: addressbook/gui/component/ldap-config.glade.h:44
+#: addressbook/gui/component/ldap-config.glade.h:42
 msgid ""
 "Selecting this option means that Evolution will only try to use SSL/TLS if "
 "you are in a \n"
@@ -630,7 +663,7 @@ msgstr ""
 "那麼 Evolution 就不需要使用 SSL/TLS，因為您的連線已經\n"
 "很安全了。"
 
-#: addressbook/gui/component/ldap-config.glade.h:48
+#: addressbook/gui/component/ldap-config.glade.h:46
 msgid ""
 "Selecting this option means that your server does not support either SSL or "
 "TLS.  This \n"
@@ -642,20 +675,20 @@ msgstr ""
 "表示您的連線將是不安全的，同時您在安全性上是有\n"
 "弱點的。"
 
-#: addressbook/gui/component/ldap-config.glade.h:51
+#: addressbook/gui/component/ldap-config.glade.h:49
 msgid "Starting point and locations within it"
 msgstr ""
 
 # calendar/gui/print.c:362
-#: addressbook/gui/component/ldap-config.glade.h:52
+#: addressbook/gui/component/ldap-config.glade.h:50
 msgid "Sub"
 msgstr "子目錄"
 
-#: addressbook/gui/component/ldap-config.glade.h:53
+#: addressbook/gui/component/ldap-config.glade.h:51
 msgid "Supported Search Bases"
 msgstr "支援的搜尋起點"
 
-#: addressbook/gui/component/ldap-config.glade.h:54
+#: addressbook/gui/component/ldap-config.glade.h:52
 msgid ""
 "The search base is the distinguished name (DN)  of the entry where your "
 "searches will \n"
@@ -665,7 +698,7 @@ msgstr ""
 "搜尋起點是您的搜尋起始處的辨認的名稱 (DN)。\n"
 "如果您讓它保持空白，搜尋會從樹狀目錄的根目錄開始。"
 
-#: addressbook/gui/component/ldap-config.glade.h:56
+#: addressbook/gui/component/ldap-config.glade.h:54
 msgid ""
 "The search scope defines how deep you would like the search to extend down "
 "the \n"
@@ -678,13 +711,13 @@ msgstr ""
 "“子目錄”的搜尋範圍會包括在您的搜尋起點之下的所有項目。\n"
 "“一層”的搜尋範圍只會包括在您的起點下一層的項目。\n"
 
-#: addressbook/gui/component/ldap-config.glade.h:60
+#: addressbook/gui/component/ldap-config.glade.h:58
 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:61
+#: addressbook/gui/component/ldap-config.glade.h:59
 #, fuzzy
 msgid ""
 "This is the maximum number of entries to download. Setting this number to "
@@ -694,7 +727,7 @@ msgstr ""
 "這是要下載的項目的最大數量。把這個數量設得\n"
 "太大會減慢您的目錄服務的速度。"
 
-#: addressbook/gui/component/ldap-config.glade.h:63
+#: 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 "
@@ -703,7 +736,7 @@ msgstr ""
 "這是 Evolution 將要用驗證您的方法。注意要設定此項至“電子郵件位址”需要您的 "
 "LDAP 伺服器的匿名存取。"
 
-#: addressbook/gui/component/ldap-config.glade.h:64
+#: addressbook/gui/component/ldap-config.glade.h:62
 msgid ""
 "This is the name for this server that will appear in your Evolution folder "
 "list.\n"
@@ -712,7 +745,7 @@ msgstr ""
 "這是此伺服器出現於您的 Evolution 資料夾清單中的名稱。\n"
 "它僅做為顯示之用。"
 
-#: addressbook/gui/component/ldap-config.glade.h:66
+#: addressbook/gui/component/ldap-config.glade.h:64
 msgid ""
 "This is the port on the LDAP server that Evolution will try to connect to. "
 "A \n"
@@ -723,102 +756,102 @@ msgstr ""
 "這裡提供了標準連接埠的清單。請詢問您的系統管理者\n"
 "您應該指定哪個連接埠。"
 
-#: addressbook/gui/component/ldap-config.glade.h:69
+#: 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:70
+#: addressbook/gui/component/ldap-config.glade.h:68
 #, fuzzy
 msgid "Timeout:"
 msgstr "時間格式:"
 
-#: addressbook/gui/component/ldap-config.glade.h:71
+#: addressbook/gui/component/ldap-config.glade.h:69
 msgid "U_se SSL/TLS:"
 msgstr "使用 SSL/TLS(_S):"
 
-#: addressbook/gui/component/ldap-config.glade.h:72
+#: addressbook/gui/component/ldap-config.glade.h:70
 msgid "Using distinguished name (DN)"
 msgstr "使用辨認的名稱 (DN)"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:73
+#: addressbook/gui/component/ldap-config.glade.h:71
 msgid "Using email address"
 msgstr "使用電子郵件位址"
 
-#: addressbook/gui/component/ldap-config.glade.h:74 mail/mail-account-gui.c:69
+#: addressbook/gui/component/ldap-config.glade.h:72 mail/mail-account-gui.c:80
 #: mail/mail-config.glade.h:154
 msgid "Whenever Possible"
 msgstr "每次可能的時候"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/component/ldap-config.glade.h:75
+#: addressbook/gui/component/ldap-config.glade.h:73
 #, 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:76
+#: 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:77
+#: addressbook/gui/component/ldap-config.glade.h:75
 msgid "_Download limit:"
 msgstr "下載限制(_D):"
 
 # mail/mail-config.glade.h:29
-#: addressbook/gui/component/ldap-config.glade.h:78
+#: addressbook/gui/component/ldap-config.glade.h:76
 #, fuzzy
 msgid "_Email address:"
 msgstr "電子郵件位址(_A):"
 
-#: addressbook/gui/component/ldap-config.glade.h:79
+#: addressbook/gui/component/ldap-config.glade.h:77
 msgid "_Log in method:"
 msgstr "登入方法(_L):"
 
 # addressbook/gui/component/addressbook-config.c:686
 # mail/mail-config.glade.h:43
-#: addressbook/gui/component/ldap-config.glade.h:80
+#: addressbook/gui/component/ldap-config.glade.h:78
 #: calendar/gui/dialogs/calendar-setup.glade.h:13 mail/mail-config.glade.h:170
 msgid "_Name:"
 msgstr "名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:409
-#: addressbook/gui/component/ldap-config.glade.h:81
+#: 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:82
+#: addressbook/gui/component/ldap-config.glade.h:80
 #, fuzzy
 msgid "_Port:"
 msgstr "優先順序(_P):"
 
 # addressbook/gui/component/addressbook-config.c:430
-#: addressbook/gui/component/ldap-config.glade.h:83
+#: 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:84
+#: addressbook/gui/component/ldap-config.glade.h:82
 msgid "_Server name:"
 msgstr "伺服器名稱(_S):"
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: addressbook/gui/component/ldap-config.glade.h:85
+#: addressbook/gui/component/ldap-config.glade.h:83
 #, fuzzy
 msgid "_Server:"
 msgstr "每(_E)"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: addressbook/gui/component/ldap-config.glade.h:86
+#: addressbook/gui/component/ldap-config.glade.h:84
 msgid "_Timeout (minutes):"
 msgstr "逾時時間（分鐘）(_T):"
 
 # mail/mail-config.glade.h:79
-#: addressbook/gui/component/ldap-config.glade.h:87
+#: addressbook/gui/component/ldap-config.glade.h:85
 #, fuzzy
 msgid "_Use secure connection:"
 msgstr "使用安全連線 (SSL)(_U):"
@@ -827,23 +860,23 @@ 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:88
+#: addressbook/gui/component/ldap-config.glade.h:86
 msgid "cards"
 msgstr "名片"
 
 # mail/mail-ops.c:1939
-#: addressbook/gui/component/ldap-config.glade.h:89
+#: 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:90
+#: 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:91
+#: addressbook/gui/component/ldap-config.glade.h:89
 #: 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
@@ -852,31 +885,38 @@ msgstr "分"
 
 # addressbook/gui/search/e-addressbook-search-dialog.c:158
 # mail/mail-search.c:242
-#: addressbook/gui/component/ldap-config.glade.h:92
+#: addressbook/gui/component/ldap-config.glade.h:90
 msgid "searching-tab"
 msgstr "searching-tab"
 
-# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
-#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
+#: addressbook/gui/component/select-names/e-select-names.c:497
+#: addressbook/gui/component/select-names/select-names.glade.h:6
 #, fuzzy
-msgid "Evolution Addressbook name selection interface"
-msgstr "Evolution 目錄服務名稱選擇界面。"
-
-# addressbook/gui/component/select-names/e-select-names-popup.c:176
-#: addressbook/gui/component/select-names/e-select-names-popup.c:208
-msgid "Remove All"
-msgstr "全部移除"
+msgid "Select Contacts from Address Book"
+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
-#: addressbook/gui/component/select-names/e-select-names-popup.c:215
 #: addressbook/gui/component/select-names/e-select-names.c:696
+#: 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/addressbook-config.glade.h:5
+#: 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:176
+#: addressbook/gui/component/select-names/e-select-names-popup.c:208
+msgid "Remove All"
+msgstr "全部移除"
+
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/component/select-names/e-select-names-popup.c:222
 #, fuzzy
@@ -908,13 +948,6 @@ msgstr "新增到連絡人"
 msgid "Unnamed Contact"
 msgstr "未命名的連絡人"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
-#: 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
-msgid "Name"
-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
@@ -922,11 +955,11 @@ msgstr "名稱"
 msgid "Source"
 msgstr "來源"
 
-#: addressbook/gui/component/select-names/e-select-names.c:497
-#: addressbook/gui/component/select-names/select-names.glade.h:6
+# addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.oaf.in.h:1
+#: addressbook/gui/component/select-names/GNOME_Evolution_Addressbook_SelectNames.server.in.in.h:1
 #, fuzzy
-msgid "Select Contacts from Address Book"
-msgstr "從目錄服務選擇連絡人"
+msgid "Evolution Addressbook name selection interface"
+msgstr "Evolution 目錄服務名稱選擇界面。"
 
 #: addressbook/gui/component/select-names/select-names.glade.h:2
 #, fuzzy
@@ -1008,71 +1041,60 @@ msgid "<b>Work</b>"
 msgstr "工作週"
 
 #: addressbook/gui/contact-editor/contact-editor.glade.h:11
-#: addressbook/gui/contact-editor/e-contact-editor.c:179
-#: addressbook/gui/widgets/eab-contact-display.c:302
-#: addressbook/gui/widgets/eab-contact-display.c:321
+#: 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
 msgid "AIM"
 msgstr ""
 
-# addressbook/contact-editor/fulladdr.glade.h:1
-#: addressbook/gui/contact-editor/contact-editor.glade.h:12
-#, fuzzy
-msgid "Address 2:"
-msgstr "地址 _2:"
-
 # addressbook/contact-editor/fulladdr.glade.h:7
-#: addressbook/gui/contact-editor/contact-editor.glade.h:13
+#: addressbook/gui/contact-editor/contact-editor.glade.h:12
 #, fuzzy
 msgid "Address:"
 msgstr "地址(_A):"
 
 # addressbook/contact-editor/contact-editor.glade.h:2
-#: addressbook/gui/contact-editor/contact-editor.glade.h:14
+#: addressbook/gui/contact-editor/contact-editor.glade.h:13
 #, fuzzy
 msgid "Anniversary:"
 msgstr "週年紀念(_V):"
 
 # addressbook/contact-editor/e-contact-editor.c:1242
 # addressbook/gui/widgets/e-addressbook-view.c:733
-#: addressbook/gui/contact-editor/contact-editor.glade.h:15
+#: addressbook/gui/contact-editor/contact-editor.glade.h:14
 #, fuzzy
 msgid "Assistant:"
 msgstr "助理"
 
 # addressbook/contact-editor/contact-editor.glade.h:20
-#: addressbook/gui/contact-editor/contact-editor.glade.h:16
+#: addressbook/gui/contact-editor/contact-editor.glade.h:15
 #, fuzzy
 msgid "Birthday:"
 msgstr "生日(_Y):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:17
-#, fuzzy
-msgid "Blog:"
-msgstr "波隆納"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: addressbook/gui/contact-editor/contact-editor.glade.h:18
+#: addressbook/gui/contact-editor/contact-editor.glade.h:16
 #: calendar/gui/dialogs/event-page.glade.h:5
 #, fuzzy
 msgid "Calendar:"
 msgstr "行事曆(_A):"
 
 # addressbook/contact-editor/fulladdr.glade.h:8
-#: addressbook/gui/contact-editor/contact-editor.glade.h:19
+#: addressbook/gui/contact-editor/contact-editor.glade.h:17
 #, fuzzy
 msgid "City:"
 msgstr "縣/市(_C):"
 
 # addressbook/contact-editor/e-contact-editor.c:1248
-#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/contact-editor.glade.h:18
 #, fuzzy
 msgid "Company:"
 msgstr "公司電話"
 
 # ui/evolution-addressbook.xml.h:17
-#: addressbook/gui/contact-editor/contact-editor.glade.h:21
-#: addressbook/gui/contact-editor/e-contact-editor.c:260
+#: 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-list-editor/e-contact-list-editor.etspec.h:1
 #: addressbook/gui/widgets/e-minicard.c:181
@@ -1080,98 +1102,111 @@ msgid "Contact"
 msgstr "連絡人"
 
 # addressbook/contact-editor/contact-editor.glade.h:7
-#: addressbook/gui/contact-editor/contact-editor.glade.h:22
-#: addressbook/gui/contact-editor/e-contact-editor.c:1442
+#: addressbook/gui/contact-editor/contact-editor.glade.h:20
+#: addressbook/gui/contact-editor/e-contact-editor.c:1527
 msgid "Contact Editor"
 msgstr "連絡人編輯器"
 
 # addressbook/contact-editor/fulladdr.glade.h:4
-#: addressbook/gui/contact-editor/contact-editor.glade.h:23
+#: addressbook/gui/contact-editor/contact-editor.glade.h:21
 #, fuzzy
 msgid "Country:"
 msgstr "國家(_Y):"
 
 # addressbook/contact-editor/contact-editor.glade.h:24
-#: addressbook/gui/contact-editor/contact-editor.glade.h:24
+#: addressbook/gui/contact-editor/contact-editor.glade.h:22
 #, fuzzy
 msgid "Department:"
 msgstr "部門(_E):"
 
 # addressbook/gui/widgets/e-addressbook-view.c:737
-#: addressbook/gui/contact-editor/contact-editor.glade.h:25
+#: addressbook/gui/contact-editor/contact-editor.glade.h:23
 #, fuzzy
 msgid "Free/Busy:"
 msgstr "空閒/忙碌 URL(_R):"
 
 # addressbook/contact-editor/contact-editor.glade.h:25
-#: addressbook/gui/contact-editor/contact-editor.glade.h:26
+#: addressbook/gui/contact-editor/contact-editor.glade.h:24
 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:27
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:194
 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
+#, fuzzy
+msgid "Home Page:"
+msgstr "住家傳真"
+
 # addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/contact-editor/contact-editor.glade.h:28
+#: 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:29
+#: 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:30
+#: addressbook/gui/contact-editor/contact-editor.glade.h:29
 #: 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:31
+#: addressbook/gui/contact-editor/contact-editor.glade.h:30
 #, fuzzy
 msgid "Mailing Address"
 msgstr "電子郵件地址:"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: addressbook/gui/contact-editor/contact-editor.glade.h:32
+#: addressbook/gui/contact-editor/contact-editor.glade.h:31
 #, fuzzy
 msgid "Manager:"
 msgstr "主管"
 
 # addressbook/contact-editor/contact-editor.glade.h:30
-#: addressbook/gui/contact-editor/contact-editor.glade.h:33
+#: addressbook/gui/contact-editor/contact-editor.glade.h:32
 #, fuzzy
 msgid "Ni_ckname:"
 msgstr "暱稱(_N):"
 
 # addressbook/contact-editor/contact-editor.glade.h:12
-#: addressbook/gui/contact-editor/contact-editor.glade.h:34
+#: addressbook/gui/contact-editor/contact-editor.glade.h:33
 #, fuzzy
 msgid "Notes:"
 msgstr "備註(_T):"
 
-#: addressbook/gui/contact-editor/contact-editor.glade.h:35
+#: addressbook/gui/contact-editor/contact-editor.glade.h:34
 #: 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:36
+#: 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
-#: addressbook/gui/contact-editor/e-contact-editor.c:195
 msgid "Other"
 msgstr "其它"
 
+# addressbook/contact-editor/fulladdr.glade.h:9
+#: addressbook/gui/contact-editor/contact-editor.glade.h:36
+#, fuzzy
+msgid "PO Box:"
+msgstr "郵箱(_P):"
+
 # mail/mail-config.glade.h:47
 #: addressbook/gui/contact-editor/contact-editor.glade.h:38
 #, fuzzy
@@ -1204,9 +1239,9 @@ 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-im.c:244
-#: addressbook/gui/contact-editor/e-contact-editor.c:193
-#: filter/filter-label.c:122 mail/em-migrate.c:923 mail/mail-config.c:66
+#: filter/filter-label.c:122 mail/em-migrate.c:917 mail/mail-config.c:77
 #: mail/mail-config.glade.h:155
 msgid "Work"
 msgstr "工作"
@@ -1243,26 +1278,46 @@ msgstr ""
 msgid "item8"
 msgstr ""
 
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/eab-editor.c:316
+msgid ""
+"Are you sure you want\n"
+"to delete these contacts?"
+msgstr ""
+"您確定要刪除\n"
+"這些連絡人？"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#: addressbook/gui/contact-editor/eab-editor.c:319
+msgid ""
+"Are you sure you want\n"
+"to delete this contact?"
+msgstr ""
+"您確定要刪除\n"
+"這個連絡人？"
+
 # addressbook/backend/ebook/e-card.c:3346
 #: addressbook/gui/contact-editor/e-contact-editor-address.c:96
-#: addressbook/gui/widgets/eab-contact-display.c:311
-#: addressbook/gui/widgets/eab-contact-display.c:332
+#: addressbook/gui/widgets/eab-contact-display.c:351
+#: addressbook/gui/widgets/eab-contact-display.c:372
 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-fullname.c:95
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:141
-#: addressbook/gui/contact-editor/e-contact-editor.c:281
 #: addressbook/gui/contact-list-editor/e-contact-list-editor.c:174
 #: 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:119
 #: addressbook/gui/widgets/e-minicard-view.c:474
-#: addressbook/gui/widgets/e-minicard.c:174
+#: addressbook/gui/widgets/e-minicard-view-widget.c:119
 msgid "Editable"
 msgstr "可編輯的"
 
@@ -2341,113 +2396,132 @@ msgstr "尚比亞"
 msgid "Zimbabwe"
 msgstr "辛巴威"
 
-# mail/mail-callbacks.c:1407
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
-#, fuzzy
-msgid "AOL Instant Messenger"
-msgstr "張貼郵件(_P)"
-
 # addressbook/gui/component/addressbook-storage.c:99
+#: addressbook/gui/contact-editor/e-contact-editor.c:185
 #: addressbook/gui/contact-editor/e-contact-editor-im.c:64
-#: addressbook/gui/contact-editor/e-contact-editor.c:180
-#: addressbook/gui/widgets/eab-contact-display.c:305
-#: addressbook/gui/widgets/eab-contact-display.c:324
+#: addressbook/gui/widgets/eab-contact-display.c:345
+#: addressbook/gui/widgets/eab-contact-display.c:364
 #, fuzzy
 msgid "Jabber"
 msgstr "未命名的清單"
 
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
-msgid "Yahoo Messenger"
-msgstr ""
-
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:67
-#: addressbook/gui/contact-editor/e-contact-editor.c:183
-#: addressbook/gui/widgets/eab-contact-display.c:304
-#: addressbook/gui/widgets/eab-contact-display.c:323
-msgid "ICQ"
-msgstr ""
-
-# camel/providers/smtp/camel-smtp-transport.c:180
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
-#, fuzzy
-msgid "Service"
-msgstr "服務已就緒"
-
-# addressbook/backend/ebook/e-card.c:3442
-#: 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 "位置:"
-
-# mail/mail-config.glade.h:80
-#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
-#, fuzzy
-msgid "Username"
-msgstr "使用者名稱(_N):"
-
-#: addressbook/gui/contact-editor/e-contact-editor.c:181
-#: addressbook/gui/widgets/eab-contact-display.c:307
-#: addressbook/gui/widgets/eab-contact-display.c:326
+#: 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
 #, fuzzy
 msgid "Yahoo"
 msgstr "約羅"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:182
-#: addressbook/gui/widgets/eab-contact-display.c:306
-#: addressbook/gui/widgets/eab-contact-display.c:325
+#: 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
 msgid "MSN"
 msgstr ""
 
+#: addressbook/gui/contact-editor/e-contact-editor.c:188
+#: 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
+msgid "ICQ"
+msgstr ""
+
 # shell/e-shortcuts-view.c:137
-#: addressbook/gui/contact-editor/e-contact-editor.c:184
+#: addressbook/gui/contact-editor/e-contact-editor.c:189
 #, fuzzy
 msgid "GroupWise"
 msgstr "組別"
 
 # addressbook/gui/widgets/e-addressbook-view.c:735
-#: addressbook/gui/contact-editor/e-contact-editor.c:246
+#: addressbook/gui/contact-editor/e-contact-editor.c:257
 #, fuzzy
 msgid "Source Book"
 msgstr "來源"
 
-#: addressbook/gui/contact-editor/e-contact-editor.c:253
+#: addressbook/gui/contact-editor/e-contact-editor.c:264
 msgid "Target Book"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
-#: addressbook/gui/contact-editor/e-contact-editor.c:267
+#: addressbook/gui/contact-editor/e-contact-editor.c:278
 #, fuzzy
 msgid "Is New Contact"
 msgstr "新增連絡人"
 
 # ui/evolution-message-composer.xml.h:47
-#: addressbook/gui/contact-editor/e-contact-editor.c:274
+#: addressbook/gui/contact-editor/e-contact-editor.c:285
 msgid "Writable Fields"
 msgstr "可寫的欄位"
 
 # addressbook/contact-editor/e-contact-editor.c:1247
-#: addressbook/gui/contact-editor/e-contact-editor.c:288
+#: addressbook/gui/contact-editor/e-contact-editor.c:299
 msgid "Changed"
 msgstr "已變更"
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: addressbook/gui/contact-editor/e-contact-editor.c:1656
+#: 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:1664
+#: addressbook/gui/contact-editor/e-contact-editor.c:1749
 msgid "This contact belongs to these categories:"
 msgstr "此連絡人屬於這些類別:"
 
+#. Create the selector
+#: addressbook/gui/contact-editor/e-contact-editor.c:1832
+#, 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
+#, fuzzy
+msgid "No image"
+msgstr "諾姆"
+
+#: addressbook/gui/contact-editor/e-contact-editor.c:2029
+#, fuzzy
+msgid ""
+"The following entries are invalid:\n"
+"\n"
+msgstr "以下是目前接通的連線："
+
 # camel/providers/local/camel-local-store.c:279
-#: addressbook/gui/contact-editor/e-contact-editor.c:2495
+#: addressbook/gui/contact-editor/e-contact-editor.c:2738
 #, c-format
 msgid "Could not find widget for a field: `%s'"
 msgstr "無法找到此欄位之界面工具：“%s”"
 
+# mail/mail-callbacks.c:1407
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:62
+#, fuzzy
+msgid "AOL Instant Messenger"
+msgstr "張貼郵件(_P)"
+
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:65
+msgid "Yahoo Messenger"
+msgstr ""
+
+# camel/providers/smtp/camel-smtp-transport.c:180
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:118
+#, fuzzy
+msgid "Service"
+msgstr "服務已就緒"
+
+# addressbook/backend/ebook/e-card.c:3442
+#: 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 "位置:"
+
+# mail/mail-config.glade.h:80
+#: addressbook/gui/contact-editor/e-contact-editor-im.c:134
+#, fuzzy
+msgid "Username"
+msgstr "使用者名稱(_N):"
+
 # addressbook/contact-editor/e-contact-quick-add.c:233
 #: addressbook/gui/contact-editor/e-contact-quick-add.c:280
 msgid "Contact Quick-Add"
@@ -2472,26 +2546,6 @@ msgstr "全名(_F):"
 msgid "E-_mail:"
 msgstr "電子郵件"
 
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:316
-msgid ""
-"Are you sure you want\n"
-"to delete these contacts?"
-msgstr ""
-"您確定要刪除\n"
-"這些連絡人？"
-
-# mail/mail-accounts.c:280
-# mail/mail-accounts.c:284
-#: addressbook/gui/contact-editor/eab-editor.c:319
-msgid ""
-"Are you sure you want\n"
-"to delete this contact?"
-msgstr ""
-"您確定要刪除\n"
-"這個連絡人？"
-
 # addressbook/contact-editor/fulladdr.glade.h:1
 #: addressbook/gui/contact-editor/fulladdr.glade.h:2
 msgid "Address _2:"
@@ -2679,8 +2733,8 @@ msgstr "連絡人清單編輯器"
 #: 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-minicard-view-widget.c:105
 #: addressbook/gui/widgets/e-minicard-view.c:460
+#: addressbook/gui/widgets/e-minicard-view-widget.c:105
 msgid "Book"
 msgstr "書本"
 
@@ -2751,6 +2805,543 @@ msgstr ""
 msgid "Advanced Search"
 msgstr "進階搜尋"
 
+#: addressbook/gui/widgets/eab-contact-display.c:129
+#: addressbook/gui/widgets/eab-contact-display.c:192
+msgid "(map)"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:139
+#: addressbook/gui/widgets/eab-contact-display.c:205
+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
+#, 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
+#, fuzzy
+msgid "E-mail"
+msgstr "電子郵件"
+
+# addressbook/gui/widgets/e-addressbook-view.c:708
+#: addressbook/gui/widgets/eab-contact-display.c:340
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
+msgid "Organization"
+msgstr "團體"
+
+#: addressbook/gui/widgets/eab-contact-display.c:341
+#, 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
+#, fuzzy
+msgid "Groupwise"
+msgstr "組別"
+
+#: addressbook/gui/widgets/eab-contact-display.c:348
+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
+#, fuzzy
+msgid "Phone"
+msgstr "朋榭"
+
+#: addressbook/gui/widgets/eab-contact-display.c:350
+msgid "Fax"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:354
+#, fuzzy
+msgid "work"
+msgstr "工作"
+
+#: addressbook/gui/widgets/eab-contact-display.c:367
+msgid "WWW"
+msgstr ""
+
+#: addressbook/gui/widgets/eab-contact-display.c:368
+#: addressbook/gui/widgets/eab-contact-display.c:587
+#, fuzzy
+msgid "Blog"
+msgstr "波隆納"
+
+# addressbook/gui/widgets/e-addressbook-view.c:711
+#: addressbook/gui/widgets/eab-contact-display.c:371
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
+msgid "Mobile Phone"
+msgstr "行動電話"
+
+#: addressbook/gui/widgets/eab-contact-display.c:375
+#, fuzzy
+msgid "personal"
+msgstr "個人"
+
+# addressbook/gui/widgets/e-addressbook-view.c:736
+#: addressbook/gui/widgets/eab-contact-display.c:382
+#: 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
+#, 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/e-addressbook-view.etspec.h:10
+#: smime/lib/e-cert.c:774
+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
+#, fuzzy
+msgid "Home page"
+msgstr "住家傳真"
+
+#. E_BOOK_ERROR_OK
+#: addressbook/gui/widgets/eab-gui-util.c:50
+msgid "Success"
+msgstr "成功"
+
+#. E_BOOK_ERROR_INVALID_ARG
+#. E_BOOK_ERROR_BUSY
+#: addressbook/gui/widgets/eab-gui-util.c:52
+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
+msgid "Repository offline"
+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
+#. E_BOOK_ERROR_NO_SUCH_BOOK
+#: addressbook/gui/widgets/eab-gui-util.c:54
+#, 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
+#, fuzzy
+msgid "No Self Contact defined"
+msgstr "新增連絡人清單"
+
+# shell/e-storage.c:475
+#. 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
+msgid "Permission denied"
+msgstr "權限不足"
+
+# calendar/gui/calendar-commands.c:266
+#. E_BOOK_ERROR_CONTACT_NOT_FOUND
+#: addressbook/gui/widgets/eab-gui-util.c:59
+#, fuzzy
+msgid "Contact not found"
+msgstr "找不到名片"
+
+#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
+#: addressbook/gui/widgets/eab-gui-util.c:60
+#, 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
+msgid "Protocol not supported"
+msgstr "通訊協定不支援"
+
+# calendar/gui/calendar-model.c:647
+# calendar/gui/calendar-model.c:1182
+# calendar/gui/dialogs/task-editor-dialog.glade.h:4
+# calendar/gui/e-calendar-table.c:422
+# camel/camel-service.c:544
+# camel/camel-service.c:580
+#. E_BOOK_ERROR_CANCELLED
+#: addressbook/gui/widgets/eab-gui-util.c:62
+#: 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
+#: camel/providers/pop3/camel-pop3-store.c:451
+#: camel/providers/pop3/camel-pop3-store.c:532
+msgid "Cancelled"
+msgstr "已取消"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#. E_BOOK_ERROR_COULD_NOT_CANCEL
+#: addressbook/gui/widgets/eab-gui-util.c:63
+#, fuzzy
+msgid "Could not cancel"
+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
+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
+msgid "Authentication Required"
+msgstr "要求驗證"
+
+#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
+#: addressbook/gui/widgets/eab-gui-util.c:66
+msgid "TLS not Available"
+msgstr "TLS 無法使用"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-mbox-folder.c:319
+# 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
+#, fuzzy
+msgid "No such source"
+msgstr "沒有這封郵件"
+
+# shell/e-storage.c:467
+#. E_BOOK_ERROR_OTHER_ERROR
+#: addressbook/gui/widgets/eab-gui-util.c:69
+msgid "Other error"
+msgstr "其他錯誤"
+
+# addressbook/gui/component/addressbook.c:458
+#: addressbook/gui/widgets/eab-gui-util.c:103
+#, 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/component/addressbook.c:445
+#: addressbook/gui/widgets/eab-gui-util.c:110
+#, fuzzy
+msgid ""
+"We were unable to open this addressbook.  This either means you have entered "
+"an incorrect URI, or the LDAP server is unreachable."
+msgstr ""
+"我們無法開啟這個目錄服務。\n"
+"這表示您輸入了一個錯誤的 URI，\n"
+"或者 LDAP 伺服器沒有啟動。"
+
+# addressbook/gui/component/addressbook.c:450
+#: addressbook/gui/widgets/eab-gui-util.c:115
+#, 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."
+msgstr ""
+"這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
+"如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
+"及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
+
+# addressbook/gui/component/addressbook.c:445
+#: addressbook/gui/widgets/eab-gui-util.c:124
+#, 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"
+"這表示您輸入了一個錯誤的 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
+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 ""
+"在伺服器設定傳回的或是 Evolution 設定顯示的\n"
+"有許多名片符合此次查詢。\n"
+"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
+"伺服器偏好設定中的結果上限。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:168
+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 ""
+"執行此次查詢的時間超過了伺服器的限制或是您為\n"
+"此目錄服務所設定的上限。請使用更加明確的查詢\n"
+"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
+"結果上限。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:174
+msgid "The backend for this addressbook was unable to parse this query."
+msgstr "此目錄服務的後端程式無法解析這次的查詢。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:177
+msgid "The backend for this addressbook refused to perform this query."
+msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
+
+#: addressbook/gui/widgets/eab-gui-util.c:180
+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
+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
+#, fuzzy
+msgid "Error adding contact"
+msgstr "新增名片時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:240
+msgid "Error modifying list"
+msgstr "編輯清單時發生錯誤"
+
+# shell/e-shell-importer.c:404
+#: addressbook/gui/widgets/eab-gui-util.c:240
+#, fuzzy
+msgid "Error modifying contact"
+msgstr "編輯名片時發生錯誤"
+
+# executive-summary/component/e-summary.c:940
+#: addressbook/gui/widgets/eab-gui-util.c:252
+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
+#, fuzzy
+msgid "Error removing contact"
+msgstr "移除名片時發生錯誤"
+
+#: addressbook/gui/widgets/eab-gui-util.c:334
+#, fuzzy, 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 ""
+"開啟 %d 張名片也會同時開啟 %d 個新視窗。\n"
+"您真的要顯示所有這些名片嗎？"
+
+#: addressbook/gui/widgets/eab-gui-util.c:360
+#, c-format
+msgid ""
+"%s already exists\n"
+"Do you want to overwrite it?"
+msgstr ""
+"%s 已經存在\n"
+"您是否要複寫它？"
+
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: addressbook/gui/widgets/eab-gui-util.c:364
+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
+msgid "card.vcf"
+msgstr "card.vcf"
+
+# addressbook/contact-editor/fullname.glade.h:8
+#: addressbook/gui/widgets/eab-gui-util.c:571
+msgid "list"
+msgstr "清單"
+
+#: addressbook/gui/widgets/eab-gui-util.c:706
+#, fuzzy
+msgid "Move contact to"
+msgstr "移動名片到"
+
+# calendar/gui/e-calendar-table.c:714
+#: addressbook/gui/widgets/eab-gui-util.c:708
+#, fuzzy
+msgid "Copy contact to"
+msgstr "複製名片到"
+
+# calendar/gui/calendar-model.c:638
+# 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
+#, fuzzy
+msgid "Move contacts to"
+msgstr "移動名片到"
+
+# calendar/gui/calendar-model.c:638
+# 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
+#, fuzzy
+msgid "Copy contacts to"
+msgstr "複製名片到"
+
+#: addressbook/gui/widgets/eab-gui-util.c:716
+#, fuzzy
+msgid "Select target addressbook."
+msgstr "從目錄服務選擇連絡人"
+
+# addressbook/backend/ebook/e-card.c:3745
+#: addressbook/gui/widgets/eab-gui-util.c:939
+msgid "Multiple VCards"
+msgstr "多重 VCard"
+
+# addressbook/backend/ebook/e-card.c:3753
+#: addressbook/gui/widgets/eab-gui-util.c:942
+#, c-format
+msgid "VCard for %s"
+msgstr "給 %s 的 VCard"
+
+# shell/e-storage.c:178
+#.
+#. * 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/contact-editor/contact-editor.glade.h:14
+# addressbook/contact-editor/e-contact-editor.c:1284
+#: addressbook/gui/widgets/eab-popup-control.c:432
+msgid "Primary Email"
+msgstr "主要電子郵件"
+
+# addressbook/contact-editor/e-contact-editor.c:1285
+# addressbook/gui/widgets/e-addressbook-view.c:725
+#: addressbook/gui/widgets/eab-popup-control.c:442
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
+msgid "Email 2"
+msgstr "電子郵件 2"
+
+# addressbook/contact-editor/e-contact-editor.c:1286
+# addressbook/gui/widgets/e-addressbook-view.c:726
+#: addressbook/gui/widgets/eab-popup-control.c:452
+#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
+msgid "Email 3"
+msgstr "電子郵件 3"
+
+# shell/e-shell-importer.c:545
+# shell/importer/import.glade.h:5
+#: addressbook/gui/widgets/eab-popup-control.c:568
+msgid "Select an Action"
+msgstr "選擇一個動作"
+
+# ui/evolution-addressbook.xml.h:2
+#: 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/e-minicard-control.c:282
+#: addressbook/gui/widgets/eab-popup-control.c:870
+#, fuzzy
+msgid "Querying Address Book..."
+msgstr "查詢目錄服務..."
+
+# addressbook/gui/component/e-address-widget.c:388
+# addressbook/gui/component/select-names/e-select-names-popup.c:281
+#: addressbook/gui/widgets/eab-popup-control.c:953
+msgid "Edit Contact Info"
+msgstr "編輯連絡人資訊"
+
+# mail/mail-config.glade.h:29
+#: 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] "和 1 個其他名片。"
+msgstr[1] "和 1 個其他名片。"
+
+# addressbook/printing/e-contact-print.glade.h:11
+#: addressbook/gui/widgets/eab-vcard-control.c:223
+#: addressbook/gui/widgets/eab-vcard-control.c:273
+#, fuzzy
+msgid "Show Full VCard"
+msgstr "顯示全部檔頭(_H)"
+
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
+# 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/eab-vcard-control.c:227
+#, fuzzy
+msgid "Show Compact VCard"
+msgstr "儲存成 VCard 檔案格式"
+
+# addressbook/gui/widgets/e-minicard-control.c:282
+#: addressbook/gui/widgets/eab-vcard-control.c:278
+msgid "Save in addressbook"
+msgstr "存入目錄服務"
+
 # ui/evolution-addressbook.xml.h:17
 #: addressbook/gui/widgets/e-addressbook-model.c:148
 #, fuzzy
@@ -2768,8 +3359,8 @@ 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-minicard-view-widget.c:112
 #: addressbook/gui/widgets/e-minicard-view.c:467
+#: addressbook/gui/widgets/e-minicard-view-widget.c:112
 msgid "Query"
 msgstr "查詢"
 
@@ -2838,9 +3429,10 @@ msgstr "目錄服務"
 # 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:2066
+#: addressbook/gui/widgets/e-addressbook-view.c:2076
 #: ui/evolution-addressbook.xml.h:19
-msgid "Save as VCard"
+#, fuzzy
+msgid "Save as VCard..."
 msgstr "儲存成 VCard 檔案格式"
 
 # ui/evolution-addressbook.xml.h:7
@@ -2934,7 +3526,7 @@ msgstr "剪下"
 # 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:425 calendar/gui/tasks-component.c:359
+#: 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
 #: ui/evolution-tasks.xml.h:2
 msgid "Copy"
@@ -2947,30 +3539,9 @@ msgstr "複製"
 msgid "Paste"
 msgstr "貼上"
 
-# addressbook/gui/component/addressbook-config.glade.h:3
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
-# addressbook/gui/widgets/e-addressbook-view.c:616
-# calendar/gui/e-meeting-dialog.glade.h:8
-# calendar/gui/event-editor-dialog.glade.h:9
-# mail/mail-config.glade.h:23
-# mail/message-browser.c:202
-# ui/evolution-addressbook.xml.h:3
-# ui/evolution-event-editor.xml.h:17
-# ui/evolution-mail.xml.h:22
-# ui/evolution-task-editor-dialog.xml.h:18
-#: addressbook/gui/widgets/e-addressbook-view.c:1086
-#: calendar/gui/calendar-component.c:427 calendar/gui/tasks-component.c:361
-#: 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
-#: ui/evolution-tasks.xml.h:6
-msgid "Delete"
-msgstr "刪除"
-
 # widgets/menus/gal-view-menus.c:176
 #: addressbook/gui/widgets/e-addressbook-view.c:1090
-#: calendar/gui/e-calendar-view.c:1262
+#: calendar/gui/e-calendar-view.c:1277
 msgid "Current View"
 msgstr "目前檢視"
 
@@ -2987,7 +3558,7 @@ msgstr ""
 
 # calendar/gui/e-tasks.c:155
 #. All, unmatched, separator
-#: addressbook/gui/widgets/e-addressbook-view.c:1657
+#: addressbook/gui/widgets/e-addressbook-view.c:1667
 #: calendar/gui/cal-search-bar.c:362
 msgid "Any Category"
 msgstr "任何類別"
@@ -3039,26 +3610,6 @@ msgstr "類別"
 msgid "Company Phone"
 msgstr "公司電話"
 
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:10
-#: addressbook/gui/widgets/eab-contact-display.c:512 smime/lib/e-cert.c:774
-msgid "Email"
-msgstr "電子郵件"
-
-# addressbook/contact-editor/e-contact-editor.c:1285
-# addressbook/gui/widgets/e-addressbook-view.c:725
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:11
-#: addressbook/gui/widgets/eab-popup-control.c:442
-msgid "Email 2"
-msgstr "電子郵件 2"
-
-# addressbook/contact-editor/e-contact-editor.c:1286
-# addressbook/gui/widgets/e-addressbook-view.c:726
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:12
-#: addressbook/gui/widgets/eab-popup-control.c:452
-msgid "Email 3"
-msgstr "電子郵件 3"
-
 # addressbook/contact-editor/e-contact-quick-add.c:276
 # addressbook/gui/widgets/e-addressbook-view.c:700
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:13
@@ -3109,34 +3660,16 @@ msgstr "約旦"
 msgid "Manager"
 msgstr "主管"
 
-# addressbook/gui/widgets/e-addressbook-view.c:711
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:23
-#: addressbook/gui/widgets/eab-contact-display.c:331
-msgid "Mobile Phone"
-msgstr "行動電話"
-
 # addressbook/gui/widgets/e-addressbook-view.c:734
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:24
 msgid "Nickname"
 msgstr "暱稱"
 
-# addressbook/gui/widgets/e-addressbook-view.c:736
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:342
-msgid "Note"
-msgstr "備註"
-
 # addressbook/gui/widgets/e-addressbook-view.c:729
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:26
 msgid "Office"
 msgstr "辦公室"
 
-# addressbook/gui/widgets/e-addressbook-view.c:708
-#: addressbook/gui/widgets/e-addressbook-view.etspec.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:300
-msgid "Organization"
-msgstr "團體"
-
 # addressbook/contact-editor/e-contact-editor.c:1255
 # addressbook/gui/widgets/e-addressbook-view.c:719
 #: addressbook/gui/widgets/e-addressbook-view.etspec.h:28
@@ -3206,22 +3739,33 @@ msgid "Web Site"
 msgstr "網址"
 
 # addressbook/printing/e-contact-print.glade.h:41
-#: addressbook/gui/widgets/e-minicard-label.c:115
 #: addressbook/gui/widgets/e-minicard.c:137
+#: addressbook/gui/widgets/e-minicard-label.c:115
 msgid "Width"
 msgstr "寬度"
 
 # addressbook/printing/e-contact-print.glade.h:15
-#: addressbook/gui/widgets/e-minicard-label.c:122
 #: addressbook/gui/widgets/e-minicard.c:144
+#: addressbook/gui/widgets/e-minicard-label.c:122
 msgid "Height"
 msgstr "高度"
 
-#: addressbook/gui/widgets/e-minicard-label.c:129
 #: addressbook/gui/widgets/e-minicard.c:152
+#: addressbook/gui/widgets/e-minicard-label.c:129
 msgid "Has Focus"
 msgstr "得到焦點"
 
+#: addressbook/gui/widgets/e-minicard.c:160
+msgid "Selected"
+msgstr "已選擇"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: addressbook/gui/widgets/e-minicard.c:167
+msgid "Has Cursor"
+msgstr "有游標"
+
 # ui/evolution-message-composer.xml.h:47
 #: addressbook/gui/widgets/e-minicard-label.c:136
 msgid "Field"
@@ -3241,10 +3785,6 @@ msgstr "文字模型"
 msgid "Max field name length"
 msgstr "最大欄位名稱長度"
 
-#: addressbook/gui/widgets/e-minicard-view-widget.c:126
-msgid "Column Width"
-msgstr "欄寬"
-
 # addressbook/gui/widgets/e-minicard-view.c:216
 #: addressbook/gui/widgets/e-minicard-view.c:142
 msgid ""
@@ -3275,512 +3815,9 @@ msgstr ""
 msgid "Adapter"
 msgstr "轉接器"
 
-#: addressbook/gui/widgets/e-minicard.c:160
-msgid "Selected"
-msgstr "已選擇"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: addressbook/gui/widgets/e-minicard.c:167
-msgid "Has Cursor"
-msgstr "有游標"
-
-#: addressbook/gui/widgets/eab-contact-display.c:114
-#: addressbook/gui/widgets/eab-contact-display.c:177
-msgid "(map)"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:124
-#: addressbook/gui/widgets/eab-contact-display.c:190
-msgid "map"
-msgstr ""
-
-# calendar/gui/goto-dialog.glade.h:12
-#: addressbook/gui/widgets/eab-contact-display.c:242
-#: addressbook/gui/widgets/eab-contact-display.c:493
-#, fuzzy
-msgid "List Members"
-msgstr "會員"
-
-# addressbook/gui/widgets/e-addressbook-view.c:701
-#: addressbook/gui/widgets/eab-contact-display.c:293
-#, fuzzy
-msgid "E-mail"
-msgstr "電子郵件"
-
-#: addressbook/gui/widgets/eab-contact-display.c:301
-#, fuzzy
-msgid "Position"
-msgstr "波士頓"
-
-# shell/e-shortcuts-view.c:137
-#: addressbook/gui/widgets/eab-contact-display.c:303
-#: addressbook/gui/widgets/eab-contact-display.c:322
-#, fuzzy
-msgid "Groupwise"
-msgstr "組別"
-
-#: addressbook/gui/widgets/eab-contact-display.c:308
-msgid "Video Conferencing"
-msgstr ""
-
-# mail/mail-config.glade.h:25
-#: addressbook/gui/widgets/eab-contact-display.c:309
-#: addressbook/gui/widgets/eab-contact-display.c:330
-#, fuzzy
-msgid "Phone"
-msgstr "朋榭"
-
-#: addressbook/gui/widgets/eab-contact-display.c:310
-msgid "Fax"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:314
-#, fuzzy
-msgid "work"
-msgstr "工作"
-
-#: addressbook/gui/widgets/eab-contact-display.c:327
-msgid "WWW"
-msgstr ""
-
-#: addressbook/gui/widgets/eab-contact-display.c:328
-#: addressbook/gui/widgets/eab-contact-display.c:547
-#, fuzzy
-msgid "Blog"
-msgstr "波隆納"
-
-#: addressbook/gui/widgets/eab-contact-display.c:335
-#, fuzzy
-msgid "personal"
-msgstr "個人"
-
-# addressbook/contact-editor/contact-editor.glade.h:27
-#: addressbook/gui/widgets/eab-contact-display.c:508
-#, fuzzy
-msgid "Job Title"
-msgstr "職稱(_J):"
-
-# addressbook/contact-editor/e-contact-editor.c:1251
-# addressbook/gui/widgets/e-addressbook-view.c:714
-#: addressbook/gui/widgets/eab-contact-display.c:539
-#, fuzzy
-msgid "Home page"
-msgstr "住家傳真"
-
-#. E_BOOK_ERROR_OK
-#: addressbook/gui/widgets/eab-gui-util.c:49
-msgid "Success"
-msgstr "成功"
-
-#. E_BOOK_ERROR_INVALID_ARG
-#. E_BOOK_ERROR_BUSY
-#: addressbook/gui/widgets/eab-gui-util.c:51
-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:52
-msgid "Repository offline"
-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
-#. E_BOOK_ERROR_NO_SUCH_BOOK
-#: addressbook/gui/widgets/eab-gui-util.c:53
-#, 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:54
-#, fuzzy
-msgid "No Self Contact defined"
-msgstr "新增連絡人清單"
-
-# shell/e-storage.c:475
-#. E_BOOK_ERROR_URI_NOT_LOADED
-#. E_BOOK_ERROR_URI_ALREADY_LOADED
-#. E_BOOK_ERROR_PERMISSION_DENIED
-#: addressbook/gui/widgets/eab-gui-util.c:57
-msgid "Permission denied"
-msgstr "權限不足"
-
-# calendar/gui/calendar-commands.c:266
-#. E_BOOK_ERROR_CONTACT_NOT_FOUND
-#: addressbook/gui/widgets/eab-gui-util.c:58
-#, fuzzy
-msgid "Contact not found"
-msgstr "找不到名片"
-
-#. E_BOOK_ERROR_CONTACT_ID_ALREADY_EXISTS
-#: addressbook/gui/widgets/eab-gui-util.c:59
-#, 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:60
-msgid "Protocol not supported"
-msgstr "通訊協定不支援"
-
-# calendar/gui/calendar-model.c:647
-# calendar/gui/calendar-model.c:1182
-# calendar/gui/dialogs/task-editor-dialog.glade.h:4
-# calendar/gui/e-calendar-table.c:422
-# camel/camel-service.c:544
-# camel/camel-service.c:580
-#. E_BOOK_ERROR_CANCELLED
-#: addressbook/gui/widgets/eab-gui-util.c:61
-#: calendar/gui/dialogs/task-details-page.glade.h:3
-#: calendar/gui/e-cal-model-tasks.c:352 calendar/gui/e-cal-model-tasks.c:627
-#: calendar/gui/e-calendar-table.c:450 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 "已取消"
-
-# camel/providers/local/camel-mbox-summary.c:655
-#. E_BOOK_ERROR_COULD_NOT_CANCEL
-#: addressbook/gui/widgets/eab-gui-util.c:62
-#, fuzzy
-msgid "Could not cancel"
-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:63
-msgid "Authentication Failed"
-msgstr "驗証失敗"
-
-# camel/providers/smtp/camel-smtp-transport.c:218
-#. E_BOOK_ERROR_AUTHENTICATION_REQUIRED
-#: addressbook/gui/widgets/eab-gui-util.c:64
-msgid "Authentication Required"
-msgstr "要求驗證"
-
-#. E_BOOK_ERROR_TLS_NOT_AVAILABLE
-#: addressbook/gui/widgets/eab-gui-util.c:65
-msgid "TLS not Available"
-msgstr "TLS 無法使用"
-
-# camel/providers/local/camel-maildir-folder.c:197
-# camel/providers/local/camel-mbox-folder.c:319
-# 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:67
-#, fuzzy
-msgid "No such source"
-msgstr "沒有這封郵件"
-
-# shell/e-storage.c:467
-#. E_BOOK_ERROR_OTHER_ERROR
-#: addressbook/gui/widgets/eab-gui-util.c:68
-msgid "Other error"
-msgstr "其他錯誤"
-
-# addressbook/gui/component/addressbook.c:458
-#: addressbook/gui/widgets/eab-gui-util.c:102
-#, 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/component/addressbook.c:445
-#: 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 LDAP server is unreachable."
-msgstr ""
-"我們無法開啟這個目錄服務。\n"
-"這表示您輸入了一個錯誤的 URI，\n"
-"或者 LDAP 伺服器沒有啟動。"
-
-# addressbook/gui/component/addressbook.c:450
-#: addressbook/gui/widgets/eab-gui-util.c:114
-#, 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."
-msgstr ""
-"這個版本的 Evolution 沒有內建支援 LDAP 目錄服務。\n"
-"如果您想使用 LDAP 目錄服務， 請到以下超連結下載\n"
-"及安裝 OpenLDAP，然後再重新編譯 Evolution。\n"
-
-# addressbook/gui/component/addressbook.c:445
-#: addressbook/gui/widgets/eab-gui-util.c:123
-#, 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"
-"這表示您輸入了一個錯誤的 URI，\n"
-"或者伺服器沒有啟動。"
-
-# addressbook/gui/component/addressbook.c:438
-#: addressbook/gui/widgets/eab-gui-util.c:140
-msgid "Unable to open addressbook"
-msgstr "無法開啟目錄服務"
-
-#: addressbook/gui/widgets/eab-gui-util.c:161
-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 ""
-"在伺服器設定傳回的或是 Evolution 設定顯示的\n"
-"有許多名片符合此次查詢。\n"
-"請使用更加明確的查詢或是提高此目錄服務的目錄\n"
-"伺服器偏好設定中的結果上限。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:167
-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 ""
-"執行此次查詢的時間超過了伺服器的限制或是您為\n"
-"此目錄服務所設定的上限。請使用更加明確的查詢\n"
-"或是提高此目錄服務的目錄伺服器偏好設定中的\n"
-"結果上限。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:173
-msgid "The backend for this addressbook was unable to parse this query."
-msgstr "此目錄服務的後端程式無法解析這次的查詢。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:176
-msgid "The backend for this addressbook refused to perform this query."
-msgstr "此目錄服務的後端程式拒絕執行這次的查詢。"
-
-#: addressbook/gui/widgets/eab-gui-util.c:179
-msgid "This query did not complete successfully."
-msgstr "這次的查詢並未完全成功。"
-
-# calendar/gui/dialogs/save-comp.c:51
-#: addressbook/gui/widgets/eab-gui-util.c:205
-msgid "Do you want to save changes?"
-msgstr "您是否須要儲存變更？"
-
-# ui/evolution-calendar.xml.h:25
-#: addressbook/gui/widgets/eab-gui-util.c:207
-msgid "_Discard"
-msgstr "放棄(_D)"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:228
-msgid "Error adding list"
-msgstr "新增清單時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:228
-#: addressbook/gui/widgets/eab-gui-util.c:650
-#, fuzzy
-msgid "Error adding contact"
-msgstr "新增名片時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:239
-msgid "Error modifying list"
-msgstr "編輯清單時發生錯誤"
-
-# shell/e-shell-importer.c:404
-#: addressbook/gui/widgets/eab-gui-util.c:239
-#, fuzzy
-msgid "Error modifying contact"
-msgstr "編輯名片時發生錯誤"
-
-# executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:251
-msgid "Error removing list"
-msgstr "移除清單時發生錯誤"
-
-# executive-summary/component/e-summary.c:940
-#: addressbook/gui/widgets/eab-gui-util.c:251
-#: addressbook/gui/widgets/eab-gui-util.c:608
-#, fuzzy
-msgid "Error removing contact"
-msgstr "移除名片時發生錯誤"
-
-#: addressbook/gui/widgets/eab-gui-util.c:333
-#, fuzzy, 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 ""
-"開啟 %d 張名片也會同時開啟 %d 個新視窗。\n"
-"您真的要顯示所有這些名片嗎？"
-
-#: addressbook/gui/widgets/eab-gui-util.c:359
-#, c-format
-msgid ""
-"%s already exists\n"
-"Do you want to overwrite it?"
-msgstr ""
-"%s 已經存在\n"
-"您是否要複寫它？"
-
-# mail/mail-callbacks.c:1140
-# mail/mail-display.c:92
-#: addressbook/gui/widgets/eab-gui-util.c:363
-msgid "Overwrite"
-msgstr "覆寫"
-
-# composer/e-msg-composer.c:785
-#: addressbook/gui/widgets/eab-gui-util.c:399
-#, c-format
-msgid "Error saving %s: %s"
-msgstr "儲存 %s 時發生錯誤：%s"
-
-#. This is a filename. Translators take note.
-#: addressbook/gui/widgets/eab-gui-util.c:436
-msgid "card.vcf"
-msgstr "card.vcf"
-
-# addressbook/contact-editor/fullname.glade.h:8
-#: addressbook/gui/widgets/eab-gui-util.c:569
-msgid "list"
-msgstr "清單"
-
-#: addressbook/gui/widgets/eab-gui-util.c:704
-#, fuzzy
-msgid "Move contact to"
-msgstr "移動名片到"
-
-# calendar/gui/e-calendar-table.c:714
-#: addressbook/gui/widgets/eab-gui-util.c:706
-#, fuzzy
-msgid "Copy contact to"
-msgstr "複製名片到"
-
-# calendar/gui/calendar-model.c:638
-# 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:709
-#, fuzzy
-msgid "Move contacts to"
-msgstr "移動名片到"
-
-# calendar/gui/calendar-model.c:638
-# 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
-#, fuzzy
-msgid "Copy contacts to"
-msgstr "複製名片到"
-
-#: addressbook/gui/widgets/eab-gui-util.c:714
-#, fuzzy
-msgid "Select target addressbook."
-msgstr "從目錄服務選擇連絡人"
-
-# addressbook/backend/ebook/e-card.c:3745
-#: addressbook/gui/widgets/eab-gui-util.c:887
-msgid "Multiple VCards"
-msgstr "多重 VCard"
-
-# addressbook/backend/ebook/e-card.c:3753
-#: addressbook/gui/widgets/eab-gui-util.c:890
-#, c-format
-msgid "VCard for %s"
-msgstr "給 %s 的 VCard"
-
-# shell/e-storage.c:178
-#.
-#. * 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/contact-editor/contact-editor.glade.h:14
-# addressbook/contact-editor/e-contact-editor.c:1284
-#: addressbook/gui/widgets/eab-popup-control.c:432
-msgid "Primary Email"
-msgstr "主要電子郵件"
-
-# shell/e-shell-importer.c:545
-# shell/importer/import.glade.h:5
-#: addressbook/gui/widgets/eab-popup-control.c:568
-msgid "Select an Action"
-msgstr "選擇一個動作"
-
-# ui/evolution-addressbook.xml.h:2
-#: 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/e-minicard-control.c:282
-#: addressbook/gui/widgets/eab-popup-control.c:870
-#, fuzzy
-msgid "Querying Address Book..."
-msgstr "查詢目錄服務..."
-
-# addressbook/gui/component/e-address-widget.c:388
-# addressbook/gui/component/select-names/e-select-names-popup.c:281
-#: addressbook/gui/widgets/eab-popup-control.c:953
-msgid "Edit Contact Info"
-msgstr "編輯連絡人資訊"
-
-# mail/mail-config.glade.h:29
-#: 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] "和 1 個其他名片。"
-msgstr[1] "和 1 個其他名片。"
-
-# addressbook/printing/e-contact-print.glade.h:11
-#: addressbook/gui/widgets/eab-vcard-control.c:223
-#: addressbook/gui/widgets/eab-vcard-control.c:273
-#, fuzzy
-msgid "Show Full VCard"
-msgstr "顯示全部檔頭(_H)"
-
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:135
-# 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/eab-vcard-control.c:227
-#, fuzzy
-msgid "Show Compact VCard"
-msgstr "儲存成 VCard 檔案格式"
-
-# addressbook/gui/widgets/e-minicard-control.c:282
-#: addressbook/gui/widgets/eab-vcard-control.c:278
-msgid "Save in addressbook"
-msgstr "存入目錄服務"
+#: addressbook/gui/widgets/e-minicard-view-widget.c:126
+msgid "Column Width"
+msgstr "欄寬"
 
 # addressbook/gui/widgets/gal-view-factory-minicard.c:26
 #: addressbook/gui/widgets/gal-view-factory-minicard.c:24
@@ -3833,13 +3870,6 @@ msgstr "Evolution 郵件編輯器。"
 msgid "VCard (.vcf, .gcrd)"
 msgstr ""
 
-# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
-# addressbook/gui/widgets/e-addressbook-view.c:615
-#: addressbook/printing/e-contact-print-envelope.c:212
-#: addressbook/printing/e-contact-print-envelope.c:233
-msgid "Print envelope"
-msgstr "列印信封"
-
 # ui/evolution-addressbook.xml.h:11
 #: addressbook/printing/e-contact-print.c:998
 #, fuzzy
@@ -3853,6 +3883,13 @@ msgstr "列印選定的連絡人"
 msgid "Print contact"
 msgstr "列印選定的連絡人"
 
+# addressbook/gui/widgets/e-addressbook-reflow-adapter.c:234
+# addressbook/gui/widgets/e-addressbook-view.c:615
+#: 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
 #: addressbook/printing/e-contact-print.glade.h:1
 msgid "10 pt. Tahoma"
@@ -4084,20 +4121,6 @@ msgstr "連絡人清單(_L)"
 msgid "This should test the contact print code"
 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
-#, fuzzy
-msgid "Can not open file"
-msgstr "不能開啟郵件"
-
-# calendar/gui/calendar-commands.c:266
-#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
-#, fuzzy
-msgid "Can not load URI"
-msgstr "找不到名片"
-
 #: addressbook/tools/evolution-addressbook-export.c:56
 msgid "Specify the output file instead of standard output"
 msgstr ""
@@ -4160,6 +4183,20 @@ msgstr ""
 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
+#, fuzzy
+msgid "Can not open file"
+msgstr "不能開啟郵件"
+
+# calendar/gui/calendar-commands.c:266
+#: addressbook/tools/evolution-addressbook-export-list-folders.c:78
+#, fuzzy
+msgid "Can not load URI"
+msgstr "找不到名片"
+
 # composer/e-msg-composer.c:805
 #: addressbook/tools/evolution-addressbook-import.c:46
 msgid "Error loading default addressbook."
@@ -4176,7 +4213,7 @@ msgid "No filename provided."
 msgstr "沒有提供檔案名稱。"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: addressbook/util/e-destination.c:576
+#: addressbook/util/e-destination.c:577
 msgid "Unnamed List"
 msgstr "未命名的清單"
 
@@ -4186,7 +4223,8 @@ 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 smime/gui/component.c:48
+#: calendar/common/authentication.c:37 calendar/gui/e-pub-utils.c:301
+#: smime/gui/component.c:48
 #, fuzzy
 msgid "Enter password"
 msgstr "輸入密碼"
@@ -4230,166 +4268,70 @@ msgstr "預設優先順序:"
 msgid "Could not read pilot's ToDo application block"
 msgstr "無法讀取 pilot 待辦事項程式區塊"
 
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
-msgid "Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
-#: calendar/gui/calendar-component.c:944
-#, fuzzy
-msgid "Calendars"
-msgstr "行事曆"
-
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:3
-msgid "Configure your timezone, Calendar and Task List here "
-msgstr "在這裡設定您的時區、行事曆與工作清單"
-
-# ui/evolution-mail.xml.h:110
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
-#, fuzzy
-msgid "Evolution Calendar and Tasks"
-msgstr "行事曆與工作"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:5
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Calendar configuration control"
-msgstr "Evolution 郵件資料夾元件工廠。"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Calendar scheduling message viewer"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Calendar viewer"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Calendar/Task editor"
-msgstr "Evolution 行事曆 iTip/iMip 檢視器"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Tasks viewer"
-msgstr "Evolution 提醒"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
-#, fuzzy
-msgid "Evolution's Calendar component"
-msgstr "Evolution 郵件資料夾顯示元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
-#, fuzzy
-msgid "Evolution's Tasks component"
-msgstr "Evolution 測試元件。"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:12
-#: calendar/gui/e-tasks.c:892 calendar/gui/print.c:1819
-#: calendar/gui/tasks-component.c:586 calendar/gui/tasks-control.c:516
-#: calendar/importers/icalendar-importer.c:79
-#: calendar/importers/icalendar-importer.c:705
-msgid "Tasks"
-msgstr "工作"
-
-# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
-#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Calendar alarm notification service"
-msgstr "聲音提醒服務的元件工廠"
-
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: 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 "結束:"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:258
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:259
 msgid "Evolution Alarm"
 msgstr "Evolution 提醒"
 
 # calendar/gui/e-calendar-table.c:162
-#: calendar/gui/alarm-notify/alarm-notify-dialog.c:353
+#: calendar/gui/alarm-notify/alarm-notify-dialog.c:358
 #, c-format
 msgid "Alarm on %s"
 msgstr "提醒於 %s"
 
-# calendar/gui/dialogs/alarm-notify.glade.h:1
-# ui/evolution-contact-editor.xml.h:1
-# ui/evolution-event-editor.xml.h:10
-# ui/evolution-message-composer.xml.h:3
-# ui/evolution-subscribe.xml.h:2
-# ui/evolution-task-editor-dialog.xml.h:11
-# ui/evolution.xml.h:5
-#: calendar/gui/alarm-notify/alarm-notify.glade.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 "關閉(_L)"
-
-# calendar/gui/alarm-notify/alarm-queue.c:877
-# calendar/gui/dialogs/alarm-notify.glade.h:3
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
-msgid "Snoo_ze"
-msgstr "延期(_Z)"
-
 # calendar/gui/dialogs/alarm-notify.glade.h:4
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
-msgid "Snooze time (minutes)"
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:1
+#, fuzzy
+msgid "Snooze _time (minutes):"
 msgstr "延遲時間（分鐘）"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/alarm-notify/alarm-notify.glade.h:4
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:2
 msgid "_Edit appointment"
 msgstr "編輯約會(_E)"
 
+# calendar/gui/alarm-notify/alarm-queue.c:877
+# calendar/gui/dialogs/alarm-notify.glade.h:3
+#: calendar/gui/alarm-notify/alarm-notify.glade.h:3
+#, fuzzy
+msgid "_Snooze"
+msgstr "延期(_Z)"
+
 # calendar/gui/e-day-view.c:3162
 # calendar/gui/e-week-view.c:3292
 # ui/evolution-calendar.xml.h:19
 # ui/evolution-message-composer.xml.h:11
-#: calendar/gui/alarm-notify/alarm-queue.c:873
+#: 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:875
+#: calendar/gui/alarm-notify/alarm-queue.c:883
 msgid "Dismiss"
 msgstr ""
 
-#: calendar/gui/alarm-notify/alarm-queue.c:877
+#: calendar/gui/alarm-notify/alarm-queue.c:885
 msgid "Dismiss All"
 msgstr ""
 
 # calendar/gui/dialogs/alarm-notify-dialog.c:207
-#: calendar/gui/alarm-notify/alarm-queue.c:944
+#: calendar/gui/alarm-notify/alarm-queue.c:949
 msgid "No description available."
 msgstr "沒有可用的描述。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:964
+#: calendar/gui/alarm-notify/alarm-queue.c:969
 #, c-format
 msgid ""
 "Alarm on %s\n"
@@ -4399,12 +4341,12 @@ msgid ""
 msgstr ""
 
 # widgets/misc/e-messagebox.c:159
-#: calendar/gui/alarm-notify/alarm-queue.c:1060
-#: calendar/gui/alarm-notify/alarm-queue.c:1084
+#: 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:1064
+#: 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"
@@ -4416,7 +4358,7 @@ msgstr ""
 "送出電子邸件。  Evolution 會顯示\n"
 "普通的提醒對話方塊來代替。"
 
-#: calendar/gui/alarm-notify/alarm-queue.c:1090
+#: calendar/gui/alarm-notify/alarm-queue.c:1099
 #, c-format
 msgid ""
 "An Evolution Calendar reminder is about to trigger. This reminder is "
@@ -4436,10 +4378,16 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/alarm-notify/alarm-queue.c:1104
+#: calendar/gui/alarm-notify/alarm-queue.c:1113
 msgid "Do not ask me about this program again."
 msgstr "不要再詢問我關於這個程式。"
 
+# calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.oaf.in.h:2
+#: calendar/gui/alarm-notify/GNOME_Evolution_Calendar_AlarmNotify.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Calendar alarm notification service"
+msgstr "聲音提醒服務的元件工廠"
+
 # addressbook/backend/ebook/load-gnomecard-addressbook.c:21
 # addressbook/backend/ebook/load-pine-addressbook.c:22
 # addressbook/backend/ebook/test-client-list.c:23
@@ -4450,26 +4398,12 @@ msgstr "不要再詢問我關於這個程式。"
 # calendar/conduits/todo/todo-conduit.c:965
 # calendar/gui/alarm-notify/notify-main.c:98
 # calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:164
+#: calendar/gui/alarm-notify/notify-main.c:139
 msgid "Could not initialize Bonobo"
 msgstr "無法初始化 Bonobo"
 
-# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
-# addressbook/backend/ebook/load-pine-addressbook.c:22
-# addressbook/backend/ebook/test-client-list.c:23
-# addressbook/backend/ebook/test-client.c:33
-# addressbook/conduit/address-conduit.c:1092
-# addressbook/gui/component/addressbook-factory.c:42
-# calendar/conduits/calendar/calendar-conduit.c:1151
-# calendar/conduits/todo/todo-conduit.c:965
-# calendar/gui/alarm-notify/notify-main.c:98
-# calendar/gui/main.c:57
-#: calendar/gui/alarm-notify/notify-main.c:167
-msgid "Could not initialize gnome-vfs"
-msgstr "無法始初化 gnome-vfs"
-
 # calendar/gui/alarm-notify/notify-main.c:108
-#: calendar/gui/alarm-notify/notify-main.c:178
+#: calendar/gui/alarm-notify/notify-main.c:150
 msgid "Could not create the alarm notify service factory"
 msgstr "無法建立聲音提醒服務元件工廠"
 
@@ -4586,69 +4520,50 @@ 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 "當刪除項目時先確認(_A)"
 
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:27
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
 #, fuzzy
 msgid "Whether to ask for confirmation when folder is expunged"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:28
+#: 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:29
+#: 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:30
+#: 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/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:31
+#: calendar/gui/apps_evolution_calendar.schemas.in.in.h:32
 #, fuzzy
 msgid "Whether to show week numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
-# calendar/gui/gnome-cal.c:234
-#: calendar/gui/cal-search-bar.c:51
-msgid "Summary contains"
-msgstr "主旨包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:52
-msgid "Description contains"
-msgstr "描述包含"
-
-# calendar/gui/gnome-cal.c:236
-#: calendar/gui/cal-search-bar.c:54
-msgid "Comment contains"
-msgstr "備註包含"
-
-# calendar/gui/gnome-cal.c:235
-#: calendar/gui/cal-search-bar.c:56
-#, fuzzy
-msgid "Location contains"
-msgstr "描述包含"
-
-#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
-msgid "Unmatched"
-msgstr "沒有相符資料"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/calendar-commands.c:116 calendar/gui/gnome-cal.c:1607
+#: 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
 msgid "Calendar"
 msgstr "行事曆"
 
-#: calendar/gui/calendar-commands.c:351
+#: calendar/gui/calendar-commands.c:352
 #, fuzzy
 msgid ""
 "This operation will permanently erase all events older than the selected "
@@ -4660,12 +4575,12 @@ msgstr ""
 "\n"
 "確定清除這些工作？"
 
-#: calendar/gui/calendar-commands.c:357
+#: calendar/gui/calendar-commands.c:358
 #, fuzzy
 msgid "Purge events older than"
 msgstr "傳回小於"
 
-#: calendar/gui/calendar-commands.c:362
+#: 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
 msgid "days"
@@ -4674,7 +4589,7 @@ msgstr "天"
 # calendar/gui/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:431
+#: calendar/gui/calendar-commands.c:432 calendar/gui/calendar-component.c:504
 msgid "%A %d %B %Y"
 msgstr "%A %d %B %Y"
 
@@ -4683,22 +4598,26 @@ msgstr "%A %d %B %Y"
 # calendar/gui/e-week-view-main-item.c:334
 #. 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:434 calendar/gui/e-day-view-top-item.c:694
-#: calendar/gui/e-day-view.c:1589 calendar/gui/e-week-view-main-item.c:329
+#: 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/print.c:1093
-#: calendar/gui/calendar-commands.c:436 calendar/gui/calendar-commands.c:441
-#: calendar/gui/calendar-commands.c:443
+#: 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/e-day-view-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
-#: calendar/gui/calendar-commands.c:460 calendar/gui/calendar-commands.c:466
-#: calendar/gui/calendar-commands.c:472 calendar/gui/calendar-commands.c:474
+#: 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"
 
@@ -4706,114 +4625,120 @@ 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:464
+#: 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-component.c:367
+#: calendar/gui/calendar-component.c:370
 #, c-format
 msgid "Calendar '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
 
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:423
+#: calendar/gui/calendar-component.c:426
 #, fuzzy
 msgid "New Calendar"
 msgstr "新喀里多尼亞島"
 
-# ui/evolution-event-editor.xml.h:70
-# ui/evolution-mail.xml.h:115
-# ui/evolution-task-editor-dialog.xml.h:83
-# ui/evolution.xml.h:60
-#: calendar/gui/calendar-component.c:428 calendar/gui/tasks-component.c:363
-msgid "Properties..."
-msgstr "屬性..."
+# calendar/gui/e-itip-control.glade.h:8
+#: calendar/gui/calendar-component.c:623
+#, fuzzy
+msgid "Failed upgrading calendars."
+msgstr "載入行事曆..."
 
-#: calendar/gui/calendar-component.c:790
+#: 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:802
+#: calendar/gui/calendar-component.c:929
 msgid "There is no calendar available for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/calendar-component.c:836
+#: 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/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/calendar-component.c:1071
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:4
+#, fuzzy
+msgid "Calendars"
+msgstr "行事曆"
+
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1095
+#: calendar/gui/calendar-component.c:1234
 msgid "New appointment"
 msgstr "新增約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/calendar-component.c:1096
+#: calendar/gui/calendar-component.c:1235
 msgid "_Appointment"
 msgstr "約會(_A)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:1097
+#: calendar/gui/calendar-component.c:1236
 msgid "Create a new appointment"
 msgstr "建立一個新的約會"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:1103
+#: calendar/gui/calendar-component.c:1242
 msgid "New meeting"
 msgstr "新增會議"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/calendar-component.c:1104
+#: calendar/gui/calendar-component.c:1243
 #, fuzzy
 msgid "M_eeting"
 msgstr "會議"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/calendar-component.c:1105
+#: calendar/gui/calendar-component.c:1244
 #, fuzzy
 msgid "Create a new meeting request"
 msgstr "建立一個新的會議要求"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1111
+#: calendar/gui/calendar-component.c:1250
 #, fuzzy
 msgid "New all day appointment"
 msgstr "新增全天約會"
 
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/calendar-component.c:1112
+#: calendar/gui/calendar-component.c:1251
 msgid "All _Day Appointment"
 msgstr "全天約會(_D)"
 
 # ui/evolution-calendar.xml.h:5
-#: calendar/gui/calendar-component.c:1113
+#: calendar/gui/calendar-component.c:1252
 #, fuzzy
 msgid "Create a new all-day appointment"
 msgstr "建立一個新的約會"
 
 # ui/evolution-addressbook.xml.h:7
-#: calendar/gui/calendar-component.c:1119
+#: calendar/gui/calendar-component.c:1258
 #, fuzzy
 msgid "New calendar"
 msgstr "新喀里多尼亞島"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: calendar/gui/calendar-component.c:1120
+#: calendar/gui/calendar-component.c:1259
 #, fuzzy
 msgid "C_alendar"
 msgstr "行事曆(_A):"
 
 # ui/evolution.xml.h:10
-#: calendar/gui/calendar-component.c:1121
+#: calendar/gui/calendar-component.c:1260
 #, fuzzy
 msgid "Create a new calendar"
 msgstr "新增一個資料夾"
@@ -4848,19 +4773,44 @@ msgstr "週檢視"
 msgid "Month View"
 msgstr "月檢視"
 
+# calendar/gui/gnome-cal.c:234
+#: calendar/gui/cal-search-bar.c:51
+msgid "Summary contains"
+msgstr "主旨包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:52
+msgid "Description contains"
+msgstr "描述包含"
+
+# calendar/gui/gnome-cal.c:236
+#: calendar/gui/cal-search-bar.c:54
+msgid "Comment contains"
+msgstr "備註包含"
+
+# calendar/gui/gnome-cal.c:235
+#: calendar/gui/cal-search-bar.c:56
+#, fuzzy
+msgid "Location contains"
+msgstr "描述包含"
+
+#: calendar/gui/cal-search-bar.c:366 camel/camel-vee-store.c:329
+msgid "Unmatched"
+msgstr "沒有相符資料"
+
 # calendar/conduits/calendar/calendar-conduit.c:687
 # calendar/conduits/todo/todo-conduit.c:501
-#: calendar/gui/comp-editor-factory.c:408
+#: calendar/gui/comp-editor-factory.c:409
 #, fuzzy
 msgid "Error while opening the calendar"
 msgstr "與行事曆伺服器通訊時發生錯誤"
 
-#: calendar/gui/comp-editor-factory.c:419
+#: calendar/gui/comp-editor-factory.c:420
 msgid "Method not supported when opening the calendar"
 msgstr ""
 
 # shell/e-storage.c:475
-#: calendar/gui/comp-editor-factory.c:425
+#: calendar/gui/comp-editor-factory.c:426
 #, fuzzy
 msgid "Permission denied to open the calendar"
 msgstr "權限不足"
@@ -4870,21 +4820,6 @@ msgstr "權限不足"
 msgid "open_client(): %s"
 msgstr ""
 
-# calendar/gui/gnome-cal.c:840
-#: calendar/gui/control-factory.c:142
-#, c-format
-msgid "Could not open the folder in '%s'"
-msgstr "無法開啟“%s”內的資料夾"
-
-# calendar/gui/control-factory.c:126
-#: calendar/gui/control-factory.c:194
-msgid "The URI that the calendar will display"
-msgstr "行事曆將顯示的 URI "
-
-#: calendar/gui/control-factory.c:201
-msgid "The type of view to show"
-msgstr "要顯示的檢視類型"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
 #: calendar/gui/dialogs/alarm-options.c:466
 msgid "Audio Alarm Options"
@@ -4965,7 +4900,7 @@ msgstr "提醒間隔每"
 msgid "hours"
 msgstr "時"
 
-#: calendar/gui/dialogs/alarm-page.c:800
+#: calendar/gui/dialogs/alarm-page.c:802
 msgid "Action/Trigger"
 msgstr ""
 
@@ -4991,17 +4926,16 @@ msgstr "基本"
 msgid "Date/Time:"
 msgstr "日期/時間:"
 
-# ui/evolution-mail.xml.h:23
-#: calendar/gui/dialogs/alarm-page.glade.h:4 calendar/gui/e-alarm-list.c:448
-msgid "Display a message"
-msgstr "顯示郵件"
-
 # calendar/gui/event-editor-dialog.glade.h:14
 # calendar/gui/event-editor.c:1588
-#: calendar/gui/dialogs/alarm-page.glade.h:5 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 "播放這個音效"
 
+#: calendar/gui/dialogs/alarm-page.glade.h:5 calendar/gui/e-alarm-list.c:448
+msgid "Pop up an alert"
+msgstr ""
+
 # calendar/gui/event-editor-dialog.glade.h:20
 #: calendar/gui/dialogs/alarm-page.glade.h:6
 #, fuzzy
@@ -5023,6 +4957,7 @@ msgstr "傳送電子郵件"
 # calendar/gui/e-itip-control.glade.h:11
 #: 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
 msgid "Summary:"
 msgstr "摘要:"
@@ -5070,12 +5005,143 @@ msgstr "分"
 msgid "start of appointment"
 msgstr "約會開始"
 
+# ui/evolution.xml.h:3
+#: calendar/gui/dialogs/calendar-setup.c:170
+#, 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
+#, fuzzy, c-format
+msgid "The source location '%s' is not well-formed."
+msgstr "不支援載入“%s”必須的方法"
+
+#: calendar/gui/dialogs/calendar-setup.c:193
+#, c-format
+msgid "The source location '%s' is not a webcal source."
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:265
+#, c-format
+msgid "Source with name '%s' already exists in the selected group"
+msgstr ""
+
+#: calendar/gui/dialogs/calendar-setup.c:278
+#, c-format
+msgid ""
+"The group '%s' is remote. You must specify a location to get the calendar "
+"from"
+msgstr ""
+
+# ui/evolution-addressbook.xml.h:7
+#: calendar/gui/dialogs/calendar-setup.glade.h:2
+#, fuzzy
+msgid "Add Calendar"
+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:3
+#, fuzzy
+msgid "Add Tasks Group"
+msgstr "工作清單"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:1
+# ui/evolution-contact-editor.xml.h:1
+# ui/evolution-event-editor.xml.h:10
+# ui/evolution-message-composer.xml.h:3
+# ui/evolution-subscribe.xml.h:2
+# ui/evolution-task-editor-dialog.xml.h:11
+# ui/evolution.xml.h:5
+#: calendar/gui/dialogs/calendar-setup.glade.h:4
+#, fuzzy
+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
+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
+#, fuzzy
+msgid "_Add Calendar"
+msgstr "新喀里多尼亞島"
+
+# shell/e-shortcuts-view.c:291
+#: calendar/gui/dialogs/calendar-setup.glade.h:11
+#, 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
+#, 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
+#, fuzzy
+msgid "_Type:"
+msgstr "類型:"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:21
+#: calendar/gui/dialogs/calendar-setup.glade.h:18
+#, fuzzy
+msgid "_URL:"
+msgstr "網址:"
+
+#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
+msgid "weeks"
+msgstr "週"
+
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
 #. 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:463
-#: mail/em-composer-prefs.c:663 mail/em-composer-prefs.c:891
+#: 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 "已啟用"
 
@@ -5095,10 +5161,10 @@ msgstr "不要移除"
 # mail/mail-accounts.c:197
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:369
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "停用"
 
@@ -5106,10 +5172,10 @@ msgstr "停用"
 # mail/mail-config.glade.h:30
 #: 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:285
-#: mail/em-account-prefs.c:326 mail/em-account-prefs.c:371
-#: mail/em-composer-prefs.c:582 mail/em-composer-prefs.c:640
-#: mail/em-composer-prefs.c:670
+#: 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 "啟用"
 
@@ -5139,207 +5205,220 @@ msgid "60 minutes"
 msgstr "60 分"
 
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:6
-msgid "Alerts"
-msgstr "警報"
+#, fuzzy
+msgid "<b>Alerts</b>"
+msgstr "<b>開始:</b>"
 
-# ui/evolution-mail.xml.h:110
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+# calendar/gui/event-editor-dialog.glade.h:21
 #: calendar/gui/dialogs/cal-prefs-dialog.glade.h:7
+#, fuzzy
+msgid "<b>General</b>"
+msgstr "提醒"
+
+# data/evolution.keys.in.h:2
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:8
+#, fuzzy
+msgid "<b>Task List</b>"
+msgstr "行事曆資訊"
+
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:9
+#, fuzzy
+msgid "<b>Time</b>"
+msgstr "<b>逾期:</b>"
+
+# ui/evolution-calendar.xml.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:10
+#, fuzzy
+msgid "<b>Work Week</b>"
+msgstr "工作週"
+
+# ui/evolution-mail.xml.h:110
+#: 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 "結束日(_E):"
 
 # ui/evolution-calendar.xml.h:7
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
 msgid "Days"
 msgstr "天"
 
+# calendar/gui/calendar-summary.c:622
+# mail/mail-config.glade.h:24
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#, fuzzy
+msgid "Display"
+msgstr "顯示(_D)"
+
 # mail/mail-accounts.c:199
 # mail/mail-config.glade.h:30
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:12
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
 #: mail/mail-config.glade.h:74
 msgid "E_nable"
 msgstr "啟用(_E)"
 
+# addressbook/gui/widgets/e-addressbook-view.c:737
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#, fuzzy
+msgid "Free/Busy Publishing"
+msgstr "空閒/忙碌請求"
+
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 # calendar/gui/event-editor.c:479
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:13
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
 #: calendar/gui/dialogs/recurrence-page.c:1048
 #: calendar/gui/e-itip-control.c:563
 msgid "Friday"
 msgstr "星期五"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
 msgid "Hours"
 msgstr "小時"
 
 # executive-summary/test-service/rdf-summary.c:806
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:15
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
 msgid "Minutes"
 msgstr "分"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 # calendar/gui/event-editor.c:475
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:16
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
 #: calendar/gui/dialogs/recurrence-page.c:1044
 #: calendar/gui/e-itip-control.c:559
 msgid "Monday"
 msgstr "星期一"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:17
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
 msgid "S_un"
 msgstr "週日(_U)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
 # calendar/gui/event-editor.c:480
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
 #: calendar/gui/dialogs/recurrence-page.c:1049
 #: calendar/gui/e-itip-control.c:564
 msgid "Saturday"
 msgstr "星期六"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:19
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
 msgid "Sh_ow a reminder"
 msgstr "顯示提醒(_O)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:20
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
 msgid "Show week _numbers in date navigator"
 msgstr "在日期導覽顯示週數(_N)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
 # calendar/gui/event-editor.c:481
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:21
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
 #: calendar/gui/dialogs/recurrence-page.c:1050
 #: calendar/gui/e-itip-control.c:558
 msgid "Sunday"
 msgstr "星期日"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
 msgid "T_asks due today:"
 msgstr "今天到期的工作(_A):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:23
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
 msgid "T_hu"
 msgstr "週四(_H)"
 
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:24
-#, fuzzy
-msgid "Task List"
-msgstr "工作清單"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 # calendar/gui/event-editor.c:478
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:25
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
 #: calendar/gui/dialogs/recurrence-page.c:1047
 #: calendar/gui/e-itip-control.c:562
 msgid "Thursday"
 msgstr "星期四"
 
-# addressbook/gui/widgets/e-addressbook-view.c:730
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:26
-msgid "Time"
-msgstr "時間"
-
 # addressbook/backend/ebook/e-card.c:3434
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:27
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
 msgid "Time _zone:"
 msgstr "時區(_Z):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:28
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
 msgid "Time format:"
 msgstr "時間格式:"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 # calendar/gui/event-editor.c:476
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
 #: calendar/gui/dialogs/recurrence-page.c:1045
 #: calendar/gui/e-itip-control.c:560
 msgid "Tuesday"
 msgstr "星期二"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:30
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
 msgid "W_eek starts:"
 msgstr "一週開始於(_E):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:55
 # calendar/gui/event-editor.c:477
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
 #: calendar/gui/dialogs/recurrence-page.c:1046
 #: calendar/gui/e-itip-control.c:561
 msgid "Wednesday"
 msgstr "星期三"
 
-# ui/evolution-calendar.xml.h:35
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:32
-#: ui/evolution-calendar.xml.h:37
-msgid "Work Week"
-msgstr "工作週"
-
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:33
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
 msgid "Work days:"
 msgstr "工作日:"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:34
+#: 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:5
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:35
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
 msgid "_24 hour"
 msgstr "_24 小時"
 
 # addressbook/contact-editor/contact-editor.glade.h:17
 # mail/mail-config.glade.h:84
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
 #, fuzzy
 msgid "_Add URL"
 msgstr "新增(_A) ->"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41
 msgid "_Ask for confirmation when deleting items"
 msgstr "當刪除項目時先確認(_A)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:14
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:38
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
 msgid "_Compress weekends in month view"
 msgstr "在月檢視內縮小週末顯示(_C)"
 
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:39
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
 msgid "_Day begins:"
 msgstr "開始日(_D):"
 
-# calendar/gui/calendar-summary.c:622
-# mail/mail-config.glade.h:24
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-msgid "_Display"
-msgstr "顯示(_D)"
-
 # mail/mail-config.glade.h:86
 # ui/evolution-event-editor.xml.h:58
 # ui/evolution-message-composer.xml.h:45
 # ui/evolution-subscribe.xml.h:10
 # ui/evolution-task-editor-dialog.xml.h:70
 # ui/evolution.xml.h:48
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:41 filter/filter.glade.h:12
+#: 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
 #: 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
@@ -5349,181 +5428,56 @@ msgstr "顯示(_D)"
 msgid "_Edit"
 msgstr "編輯 (_E)"
 
-# addressbook/gui/widgets/e-addressbook-view.c:737
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:42
-#, fuzzy
-msgid "_Free/Busy Publishing"
-msgstr "空閒/忙碌請求"
-
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:22
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:43
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
 msgid "_Fri"
 msgstr "週五(_F)"
 
-# addressbook/contact-editor/contact-editor.glade.h:10
-# executive-summary/component/executive-summary-config.glade.h:3
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:44
-msgid "_General"
-msgstr "一般(_G)"
-
 # ui/evolution-mail.xml.h:43
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:45
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
 msgid "_Hide completed tasks after"
 msgstr "隱藏已完成的工作(_H)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:29
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:46
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
 msgid "_Mon"
 msgstr "週一(_M)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:47
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
 msgid "_Overdue tasks:"
 msgstr "過期的工作(_O):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:37
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:48
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
 msgid "_Sat"
 msgstr "週六(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:40
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
 msgid "_Show appointment end times in week and month views"
 msgstr "在週及月的檢視內顯示約會的結束時間(_S)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:49
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:50
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
 msgid "_Time divisions:"
 msgstr "時間間隔(_T):"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:51
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
 msgid "_Tue"
 msgstr "週二(_T)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:52
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
 msgid "_Wed"
 msgstr "週三(_W)"
 
 # calendar/gui/event-editor.c:1612
-#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:53
+#: calendar/gui/dialogs/cal-prefs-dialog.glade.h:54
 msgid "before every appointment"
 msgstr "在每個約會前"
 
-# ui/evolution.xml.h:3
-#: calendar/gui/dialogs/calendar-setup.c:166
-#, 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:174
-#, fuzzy, c-format
-msgid "The source location '%s' is not well-formed."
-msgstr "不支援載入“%s”必須的方法"
-
-#: calendar/gui/dialogs/calendar-setup.c:189
-#, c-format
-msgid "The source location '%s' is not a webcal source."
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:234
-#, c-format
-msgid "Source with name '%s' already exists in the selected group"
-msgstr ""
-
-#: calendar/gui/dialogs/calendar-setup.c:247
-#, c-format
-msgid ""
-"The group '%s' is remote. You must specify a location to get the calendar "
-"from"
-msgstr ""
-
-# ui/evolution-addressbook.xml.h:7
-#: calendar/gui/dialogs/calendar-setup.glade.h:2
-#, fuzzy
-msgid "Add Calendar"
-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:3
-#, fuzzy
-msgid "Add Tasks Group"
-msgstr "工作清單"
-
-# 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 錯誤"
-
-# 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
-#, fuzzy
-msgid "_Add Calendar"
-msgstr "新喀里多尼亞島"
-
-# shell/e-shortcuts-view.c:291
-#: calendar/gui/dialogs/calendar-setup.glade.h:11
-#, 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
-#, 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
-#, fuzzy
-msgid "_Type:"
-msgstr "類型:"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:21
-#: calendar/gui/dialogs/calendar-setup.glade.h:18
-#, fuzzy
-msgid "_URL:"
-msgstr "網址:"
-
-#: calendar/gui/dialogs/calendar-setup.glade.h:23 filter/filter.glade.h:23
-msgid "weeks"
-msgstr "週"
-
 #: calendar/gui/dialogs/cancel-comp.c:57
 msgid ""
 "The event being deleted is a meeting, would you like to send a cancellation "
@@ -5603,56 +5557,20 @@ msgstr "%s  您已經做了些變更。放棄這些變更並且更新這個編�
 msgid "%s  You have made no changes, update the editor?"
 msgstr "%s  您沒有做任何變更，更新這個編輯器？"
 
-# camel/providers/local/camel-mbox-summary.c:879
-#: calendar/gui/dialogs/comp-editor-page.c:463
-#, c-format
-msgid "Validation error: %s"
-msgstr "確認上的錯誤： %s"
-
-#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
-msgid " to "
-msgstr " 到 "
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
-msgid " (Completed "
-msgstr " (已完成) "
-
-# calendar/gui/calendar-model.c:644
-# calendar/gui/calendar-model.c:1180
-# calendar/gui/dialogs/task-editor-dialog.glade.h:6
-# calendar/gui/e-calendar-table.c:421
-#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
-msgid "Completed "
-msgstr "已完成 "
-
-#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
-msgid " (Due "
-msgstr "(期限)"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
-# calendar/gui/e-calendar-table.c:155
-#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
-msgid "Due "
-msgstr "期限 "
-
 # shell/e-setup.c:163
-#: calendar/gui/dialogs/comp-editor.c:431
+#: calendar/gui/dialogs/comp-editor.c:430
 msgid "Could not update object"
 msgstr "無法更新物件"
 
 # calendar/gui/dialogs/alarm-notify.glade.h:2
-#: calendar/gui/dialogs/comp-editor.c:904
-#: calendar/gui/dialogs/comp-editor.c:941
+#: calendar/gui/dialogs/comp-editor.c:903
+#: calendar/gui/dialogs/comp-editor.c:940
 msgid "Edit Appointment"
 msgstr "編輯約會"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/comp-editor.c:909
-#: calendar/gui/dialogs/comp-editor.c:946
+#: calendar/gui/dialogs/comp-editor.c:908
+#: calendar/gui/dialogs/comp-editor.c:945
 #, c-format
 msgid "Appointment - %s"
 msgstr "約會 - %s"
@@ -5660,43 +5578,79 @@ msgstr "約會 - %s"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/dialogs/comp-editor.c:912
-#: calendar/gui/dialogs/comp-editor.c:949
+#: 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:915
-#: calendar/gui/dialogs/comp-editor.c:952
+#: calendar/gui/dialogs/comp-editor.c:914
+#: calendar/gui/dialogs/comp-editor.c:951
 #, c-format
 msgid "Journal entry - %s"
 msgstr "日誌項目 - %s"
 
 # calendar/gui/e-calendar-table.c:159
-#: calendar/gui/dialogs/comp-editor.c:926
-#: calendar/gui/dialogs/comp-editor.c:962
+#: calendar/gui/dialogs/comp-editor.c:925
+#: calendar/gui/dialogs/comp-editor.c:961
 msgid "No summary"
 msgstr "沒有摘要"
 
 # composer/e-msg-composer.c:774
-#: calendar/gui/dialogs/comp-editor.c:1377
-#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1020
-#: composer/e-msg-composer.c:1183
+#: calendar/gui/dialogs/comp-editor.c:1376
+#: calendar/gui/e-calendar-table.c:1175 calendar/gui/e-calendar-view.c:1035
+#: composer/e-msg-composer.c:1193
 msgid "Save as..."
 msgstr "另存新檔..."
 
-#: calendar/gui/dialogs/comp-editor.c:1480
-#: calendar/gui/dialogs/comp-editor.c:1515
-#: calendar/gui/dialogs/comp-editor.c:1541
+#: calendar/gui/dialogs/comp-editor.c:1479
+#: calendar/gui/dialogs/comp-editor.c:1514
+#: calendar/gui/dialogs/comp-editor.c:1540
 #, fuzzy
 msgid "Changes made to this item may be discarded if an update arrives"
 msgstr "如果有更新透過電子郵件到達，對此項目所做的變更可能被放棄"
 
-#: calendar/gui/dialogs/comp-editor.c:1577
+#: calendar/gui/dialogs/comp-editor.c:1576
 #, fuzzy
 msgid "Unable to use current version!"
 msgstr "無法取得目前的版本！"
 
+# camel/providers/local/camel-mbox-summary.c:879
+#: calendar/gui/dialogs/comp-editor-page.c:463
+#, c-format
+msgid "Validation error: %s"
+msgstr "確認上的錯誤： %s"
+
+#: calendar/gui/dialogs/comp-editor-util.c:187 calendar/gui/print.c:2258
+msgid " to "
+msgstr " 到 "
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/dialogs/comp-editor-util.c:191 calendar/gui/print.c:2262
+msgid " (Completed "
+msgstr " (已完成) "
+
+# calendar/gui/calendar-model.c:644
+# calendar/gui/calendar-model.c:1180
+# calendar/gui/dialogs/task-editor-dialog.glade.h:6
+# calendar/gui/e-calendar-table.c:421
+#: calendar/gui/dialogs/comp-editor-util.c:193 calendar/gui/print.c:2264
+msgid "Completed "
+msgstr "已完成 "
+
+#: calendar/gui/dialogs/comp-editor-util.c:198 calendar/gui/print.c:2269
+msgid " (Due "
+msgstr "(期限)"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:18
+# calendar/gui/e-calendar-table.c:155
+#: calendar/gui/dialogs/comp-editor-util.c:200 calendar/gui/print.c:2271
+msgid "Due "
+msgstr "期限 "
+
 # camel/providers/local/camel-mbox-summary.c:655
 #: calendar/gui/dialogs/copy-source-dialog.c:57
 #, fuzzy
@@ -5840,32 +5794,32 @@ msgid "Enter Delegate"
 msgstr "輸入代表"
 
 # calendar/gui/event-editor-dialog.glade.h:3
-#: calendar/gui/dialogs/event-editor.c:200 calendar/gui/print.c:2295
+#: calendar/gui/dialogs/event-editor.c:201 calendar/gui/print.c:2295
 msgid "Appointment"
 msgstr "約會"
 
 # calendar/gui/event-editor-dialog.glade.h:20
-#: calendar/gui/dialogs/event-editor.c:207
+#: calendar/gui/dialogs/event-editor.c:208
 msgid "Reminder"
 msgstr "提醒"
 
 # calendar/gui/event-editor-dialog.glade.h:18
-#: calendar/gui/dialogs/event-editor.c:214
+#: calendar/gui/dialogs/event-editor.c:215
 msgid "Recurrence"
 msgstr "週期性"
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/dialogs/event-editor.c:221
-#: calendar/gui/dialogs/event-editor.c:294
-#: calendar/gui/dialogs/event-editor.c:438
+#: calendar/gui/dialogs/event-editor.c:222
+#: calendar/gui/dialogs/event-editor.c:295
+#: calendar/gui/dialogs/event-editor.c:439
 msgid "Scheduling"
 msgstr "會議排程"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/dialogs/event-editor.c:228
-#: calendar/gui/dialogs/event-editor.c:297
-#: calendar/gui/dialogs/event-editor.c:441 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 "會議"
 
@@ -5878,7 +5832,7 @@ msgid "Event with no end date"
 msgstr ""
 
 # calendar/gui/e-calendar-table.c:154
-#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:514
+#: calendar/gui/dialogs/event-page.c:617 calendar/gui/dialogs/task-page.c:513
 msgid "Start date is wrong"
 msgstr "開始日期錯誤"
 
@@ -6008,10 +5962,10 @@ 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/e-cal-model-tasks.c:619 composer/e-msg-composer.c:2102
-#: mail/em-account-prefs.c:424 mail/em-folder-view.c:804
-#: mail/mail-account-gui.c:1540 mail/mail-account-gui.c:2034
-#: mail/mail-config.glade.h:100
+#: 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
 #: 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
@@ -6032,7 +5986,7 @@ msgstr "最少需要一個到會者。"
 
 # calendar/gui/e-calendar-table.c:708
 # ui/evolution-task-editor-dialog.xml.h:19
-#: calendar/gui/dialogs/meeting-page.c:650
+#: calendar/gui/dialogs/meeting-page.c:651
 msgid "_Delegate To..."
 msgstr "委派給(_D)..."
 
@@ -6044,10 +5998,10 @@ msgstr "委派給(_D)..."
 # ui/evolution-task-editor-dialog.xml.h:69
 # ui/evolution.xml.h:46
 #. FIXME: need to disable for undeletable folders
-#: calendar/gui/dialogs/meeting-page.c:654
+#: 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:1295 calendar/gui/e-calendar-view.c:1327
-#: mail/em-folder-tree.c:2541 mail/em-folder-view.c:795
+#: 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
 #: 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
@@ -6406,33 +6360,24 @@ msgstr "放棄變更(_D)"
 msgid "Save Event"
 msgstr "行事曆事件"
 
-# mail/mail-account-gui.c:682
-#. create the dialog
-#: calendar/gui/dialogs/select-source-dialog.c:63
-#, fuzzy
-msgid "Select source"
-msgstr "選擇匯入服務"
-
 # shell/e-shell-importer.c:602
-#. gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, FALSE);
-#: calendar/gui/dialogs/select-source-dialog.c:69
-#, fuzzy, c-format
-msgid "Select destination %s"
+#: calendar/gui/dialogs/select-source-dialog.c:65
+#, fuzzy
+msgid "Select destination"
 msgstr "選擇用來匯入這些資料的目的資料夾"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#: calendar/gui/dialogs/select-source-dialog.c:71
+# ui/evolution.xml.h:47
+#: calendar/gui/dialogs/select-source-dialog.c:86
 #, fuzzy
-msgid "calendar"
-msgstr "行事曆"
+msgid "_Destination"
+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:71
+#: calendar/gui/dialogs/select-source-dialog.c:88
 #, fuzzy
-msgid "task list"
+msgid "Task List"
 msgstr "工作清單"
 
 #: calendar/gui/dialogs/send-comp.c:57
@@ -6470,8 +6415,9 @@ msgstr "% 完成"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
 #: calendar/gui/dialogs/task-details-page.glade.h:4
-#: calendar/gui/e-cal-model-tasks.c:350 calendar/gui/e-cal-model-tasks.c:625
-#: calendar/gui/e-calendar-table.c:449 calendar/gui/e-meeting-store.c:187
+#: 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 "已完成"
@@ -6482,7 +6428,8 @@ msgstr "已完成"
 # calendar/gui/e-calendar-table.c:345
 # mail/message-list.c:689
 #: calendar/gui/dialogs/task-details-page.glade.h:5
-#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:923
+#: calendar/gui/e-cal-component-preview.c:249
+#: calendar/gui/e-calendar-table.c:374 mail/message-list.c:958
 msgid "High"
 msgstr "高"
 
@@ -6491,8 +6438,9 @@ msgstr "高"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:11
 # calendar/gui/e-calendar-table.c:420
 #: calendar/gui/dialogs/task-details-page.glade.h:6
-#: calendar/gui/e-cal-model-tasks.c:348 calendar/gui/e-cal-model-tasks.c:623
-#: calendar/gui/e-cal-model-tasks.c:698 calendar/gui/e-calendar-table.c:448
+#: 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 "進行中"
@@ -6503,7 +6451,8 @@ msgstr "進行中"
 # calendar/gui/e-calendar-table.c:347
 # mail/message-list.c:687
 #: calendar/gui/dialogs/task-details-page.glade.h:7
-#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:921
+#: calendar/gui/e-cal-component-preview.c:253
+#: calendar/gui/e-calendar-table.c:376 mail/message-list.c:956
 msgid "Low"
 msgstr "低"
 
@@ -6514,8 +6463,9 @@ msgstr "低"
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
 #: calendar/gui/dialogs/task-details-page.glade.h:8
-#: calendar/gui/e-cal-model.c:870 calendar/gui/e-calendar-table.c:375
-#: mail/message-list.c:922
+#: 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
 msgid "Normal"
 msgstr "普通"
 
@@ -6524,8 +6474,9 @@ msgstr "普通"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:14
 # calendar/gui/e-calendar-table.c:419
 #: calendar/gui/dialogs/task-details-page.glade.h:9
-#: calendar/gui/e-cal-model-tasks.c:346 calendar/gui/e-cal-model-tasks.c:621
-#: calendar/gui/e-calendar-table.c:447 calendar/gui/print.c:2340
+#: 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 "未開始"
 
@@ -6575,12 +6526,12 @@ msgstr "Web 網址(_W):"
 msgid "Assignment"
 msgstr "指派工作"
 
-#: calendar/gui/dialogs/task-page.c:487
+#: calendar/gui/dialogs/task-page.c:486
 msgid "Due date is wrong"
 msgstr "到期日錯誤"
 
 # addressbook/gui/component/addressbook.c:438
-#: calendar/gui/dialogs/task-page.c:824
+#: calendar/gui/dialogs/task-page.c:823
 #, fuzzy, c-format
 msgid "Unable to open tasks in '%s'."
 msgstr "無法開啟目錄服務"
@@ -6595,8 +6546,9 @@ msgstr "機密(_F)"
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
-#: calendar/gui/dialogs/task-page.glade.h:6 calendar/gui/e-itip-control.c:982
-#: calendar/gui/e-itip-control.glade.h:6
+#: 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
 msgid "Description:"
 msgstr "描述:"
@@ -6782,129 +6734,72 @@ msgstr "%s 在 %s"
 msgid "%s for an unknown trigger type"
 msgstr "%s 為未知的觸發類型"
 
+# calendar/gui/e-calendar-table.c:163
+#: 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/dialogs/task-editor-dialog.glade.h:18
+#: calendar/gui/e-cal-component-preview.c:194
+#: calendar/gui/e-cal-component-preview.c:205
+#, fuzzy
+msgid "Start Date:"
+msgstr "開始日期(_R):"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:25
+#: calendar/gui/e-cal-component-preview.c:216
+#, fuzzy
+msgid "Due Date:"
+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
+msgid "Status:"
+msgstr "狀態:"
+
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
+#: calendar/gui/e-cal-component-preview.c:247
+#, fuzzy
+msgid "Priority:"
+msgstr "優先順序(_P):"
+
+# addressbook/contact-editor/contact-editor.glade.h:16
+#: calendar/gui/e-cal-component-preview.c:300
+#, fuzzy
+msgid "Web Page:"
+msgstr "Web 網址(_W):"
+
 # calendar/gui/calendar-model.c:360
 # calendar/gui/calendar-model.c:898
 # calendar/gui/e-calendar-table.c:323
-#: calendar/gui/e-cal-list-view.c:255 calendar/gui/e-cal-model.c:316
-#: calendar/gui/e-cal-model.c:323 calendar/gui/e-calendar-table.c:352
+#: 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/calendar-model.c:363
 # calendar/gui/calendar-model.c:900
 # calendar/gui/e-calendar-table.c:324
-#: calendar/gui/e-cal-list-view.c:256 calendar/gui/e-cal-model.c:325
-#: calendar/gui/e-calendar-table.c:353
+#: 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/calendar-model.c:366
 # calendar/gui/calendar-model.c:902
 # calendar/gui/e-calendar-table.c:325
-#: calendar/gui/e-cal-list-view.c:257 calendar/gui/e-cal-model.c:327
-#: calendar/gui/e-calendar-table.c:354
+#: 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:153
-#: calendar/gui/e-cal-list-view.etspec.h:1
-msgid "End Date"
-msgstr "結束日期"
-
-# calendar/gui/e-calendar-table.c:154
-#: calendar/gui/e-cal-list-view.etspec.h:3
-msgid "Start Date"
-msgstr "開始日期"
-
-# calendar/gui/e-calendar-table.c:159
-#: calendar/gui/e-cal-list-view.etspec.h:4
-#: calendar/gui/e-calendar-table.etspec.h:10 mail/mail-security.glade.h:5
-msgid "Summary"
-msgstr "摘要"
-
-# ui/evolution-calendar.xml.h:36
-#: calendar/gui/e-cal-model-calendar.c:163 calendar/gui/e-calendar-table.c:426
-msgid "Free"
-msgstr "空閒"
-
-# widgets/meeting-time-sel/e-meeting-time-sel.c:393
-#: calendar/gui/e-cal-model-calendar.c:166 calendar/gui/e-calendar-table.c:427
-#: calendar/gui/e-meeting-time-sel.c:399
-msgid "Busy"
-msgstr "忙碌"
-
-# calendar/gui/calendar-model.c:457
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "N"
-msgstr "N"
-
-# calendar/gui/calendar-model.c:457
-#: calendar/gui/e-cal-model-tasks.c:302
-msgid "S"
-msgstr "S"
-
-# calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
-msgid "E"
-msgstr "E"
-
-# calendar/gui/calendar-model.c:459
-#: calendar/gui/e-cal-model-tasks.c:304
-msgid "W"
-msgstr "W"
-
-# calendar/gui/calendar-model.c:970
-#: calendar/gui/e-cal-model-tasks.c:573
-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/calendar-model.c:1584
-#: calendar/gui/e-cal-model-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:168 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-tasks.c:981 calendar/gui/e-cal-model.c:876
-#: calendar/gui/e-meeting-list-view.c:169 calendar/gui/e-meeting-store.c:171
-msgid "No"
-msgstr "否"
-
-# calendar/gui/calendar-model.c:369
-# calendar/gui/event-editor.c:1601
-# calendar/gui/event-editor.c:1628
-# camel/providers/smtp/camel-smtp-transport.c:221
-#. This is the default filename used for temporary file creation
-#: calendar/gui/e-cal-model.c:329 calendar/gui/e-cal-model.c:332
-#: 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-meeting-store.c:150 calendar/gui/e-meeting-store.c:215
-#: camel/camel-gpg-context.c:1674 camel/camel-gpg-context.c:1725
-#: camel/camel-tcp-stream-openssl.c:631
-#: camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/providers/smtp/camel-smtp-transport.c:227 mail/em-utils.c:2120
-#: shell/e-component-registry.c:168 widgets/misc/e-charset-picker.c:62
-msgid "Unknown"
-msgstr "不明"
-
-# calendar/gui/calendar-model.c:1576
-#: calendar/gui/e-cal-model.c:872
-msgid "Recurring"
-msgstr "循環模式"
-
-# calendar/gui/calendar-model.c:1578
-#: calendar/gui/e-cal-model.c:874
-msgid "Assigned"
-msgstr "已指定"
-
 # calendar/gui/e-calendar-table.c:367
 #: calendar/gui/e-calendar-table.c:396
 msgid "0%"
@@ -6960,19 +6855,30 @@ msgstr "90%"
 msgid "100%"
 msgstr "100%"
 
+# ui/evolution-calendar.xml.h:36
+#: calendar/gui/e-calendar-table.c:426 calendar/gui/e-cal-model-calendar.c:163
+msgid "Free"
+msgstr "空閒"
+
+# widgets/meeting-time-sel/e-meeting-time-sel.c:393
+#: 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:714
-#: calendar/gui/e-calendar-table.c:683 calendar/gui/e-calendar-view.c:629
+#: 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:846 calendar/gui/e-calendar-view.c:730
+#: calendar/gui/e-calendar-table.c:846 calendar/gui/e-calendar-view.c:747
 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:1275 calendar/gui/e-calendar-view.c:1355
-#: mail/em-folder-view.c:770 ui/evolution-addressbook.xml.h:37
+#: 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
 msgid "_Open"
 msgstr "開啟(_O)"
 
@@ -6987,8 +6893,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:1276 calendar/gui/e-calendar-view.c:1361
-#: mail/em-folder-view.c:772 mail/em-popup.c:690 mail/em-popup.c:805
+#: 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
 #: ui/evolution-mail-message.xml.h:128
 msgid "_Save As..."
 msgstr "另存新檔(_S)..."
@@ -6997,10 +6903,10 @@ 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:1254 calendar/gui/e-calendar-view.c:1277
-#: calendar/gui/e-calendar-view.c:1359 ui/evolution-addressbook.xml.h:40
+#: 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:124
+#: ui/evolution-contact-editor.xml.h:17 ui/evolution-mail-message.xml.h:125
 #: ui/evolution-tasks.xml.h:25
 msgid "_Print..."
 msgstr "列印(_P)..."
@@ -7008,7 +6914,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:1282 calendar/gui/e-calendar-view.c:1325
+#: 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
 #: ui/evolution-tasks.xml.h:1
 msgid "C_ut"
@@ -7017,8 +6923,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:1283 calendar/gui/e-calendar-view.c:1323
-#: mail/em-folder-tree.c:2534 ui/evolution-addressbook.xml.h:31
+#: 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
 #: 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"
@@ -7027,10 +6934,10 @@ 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:1258 calendar/gui/e-calendar-view.c:1284
-#: calendar/gui/e-calendar-view.c:1357 ui/evolution-addressbook.xml.h:38
+#: 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:122 ui/evolution-tasks.xml.h:24
+#: ui/evolution-mail-message.xml.h:123 ui/evolution-tasks.xml.h:24
 msgid "_Paste"
 msgstr "貼上(_P)"
 
@@ -7104,6 +7011,12 @@ msgstr "優先順序"
 msgid "Start date"
 msgstr "開始日期"
 
+# calendar/gui/e-calendar-table.c:159
+#: 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/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
@@ -7113,94 +7026,183 @@ msgstr "工作排序"
 
 # calendar/gui/e-week-view.c:3277
 # calendar/gui/e-week-view.c:3300
-#: calendar/gui/e-calendar-view.c:1247 calendar/gui/e-calendar-view.c:1335
+#: calendar/gui/e-calendar-view.c:1262 calendar/gui/e-calendar-view.c:1350
 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:1248 calendar/gui/e-calendar-view.c:1340
+#: calendar/gui/e-calendar-view.c:1263 calendar/gui/e-calendar-view.c:1355
 msgid "New All Day _Event"
 msgstr "新增全天事件(_E)"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: calendar/gui/e-calendar-view.c:1249 calendar/gui/e-calendar-view.c:1345
+#: calendar/gui/e-calendar-view.c:1264 calendar/gui/e-calendar-view.c:1360
 msgid "New Meeting"
 msgstr "新增會議"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/e-calendar-view.c:1250 calendar/gui/e-calendar-view.c:1350
+#: calendar/gui/e-calendar-view.c:1265 calendar/gui/e-calendar-view.c:1365
 msgid "New Task"
 msgstr "新增工作"
 
 # ui/evolution-mail.xml.h:77
-#: calendar/gui/e-calendar-view.c:1264 ui/evolution-calendar.xml.h:26
+#: calendar/gui/e-calendar-view.c:1279 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:1265
+#: calendar/gui/e-calendar-view.c:1280
 #, fuzzy
 msgid "_Select Date..."
 msgstr "刪除..."
 
 # mail/mail-config.glade.h:61
-#: calendar/gui/e-calendar-view.c:1269 ui/evolution-calendar.xml.h:45
+#: calendar/gui/e-calendar-view.c:1284 ui/evolution-calendar.xml.h:45
 msgid "_Publish Free/Busy Information"
 msgstr "發佈空閒/忙碌資訊(_P)"
 
 # mail/folder-browser.c:713
-#: calendar/gui/e-calendar-view.c:1288
+#: calendar/gui/e-calendar-view.c:1303
 #, fuzzy
 msgid "Cop_y to Calendar..."
 msgstr "複製至資料夾..."
 
 # mail/folder-browser.c:711
-#: calendar/gui/e-calendar-view.c:1289
+#: calendar/gui/e-calendar-view.c:1304
 #, fuzzy
 msgid "Mo_ve to Calendar..."
 msgstr "移至資料夾(_V)..."
 
 # ui/evolution-event-editor.xml.h:46
-#: calendar/gui/e-calendar-view.c:1290
+#: calendar/gui/e-calendar-view.c:1305
 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:1291
+#: calendar/gui/e-calendar-view.c:1306
 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:1296 calendar/gui/e-calendar-view.c:1328
+#: calendar/gui/e-calendar-view.c:1311 calendar/gui/e-calendar-view.c:1343
 msgid "Delete this _Occurrence"
 msgstr "刪除這個事件(_O)"
 
 # calendar/gui/e-week-view.c:3313
-#: calendar/gui/e-calendar-view.c:1297 calendar/gui/e-calendar-view.c:1329
+#: calendar/gui/e-calendar-view.c:1312 calendar/gui/e-calendar-view.c:1344
 msgid "Delete _All Occurrences"
 msgstr "刪除全部事件(_A)"
 
 # ui/evolution-calendar.xml.h:12
-#: calendar/gui/e-calendar-view.c:1331
+#: calendar/gui/e-calendar-view.c:1346
 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:1333
+#: calendar/gui/e-calendar-view.c:1348
 msgid "_Go to Date..."
 msgstr "到指定日期(_G)..."
 
 # ui/evolution-mail.xml.h:110
-#: calendar/gui/e-calendar-view.c:1363 ui/evolution.xml.h:33
+#: calendar/gui/e-calendar-view.c:1378 ui/evolution.xml.h:33
 msgid "_Settings..."
 msgstr "設定值(_S)..."
 
+# calendar/gui/e-calendar-table.c:153
+#: calendar/gui/e-cal-list-view.etspec.h:1
+msgid "End Date"
+msgstr "結束日期"
+
+# calendar/gui/e-calendar-table.c:154
+#: calendar/gui/e-cal-list-view.etspec.h:3
+msgid "Start Date"
+msgstr "開始日期"
+
+# calendar/gui/calendar-model.c:369
+# calendar/gui/event-editor.c:1601
+# calendar/gui/event-editor.c:1628
+# 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-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/calendar-model.c:1576
+#: calendar/gui/e-cal-model.c:911
+msgid "Recurring"
+msgstr "循環模式"
+
+# calendar/gui/calendar-model.c:1578
+#: calendar/gui/e-cal-model.c:913
+msgid "Assigned"
+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-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
+msgid "No"
+msgstr "否"
+
+# calendar/gui/calendar-model.c:457
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "N"
+msgstr "N"
+
+# calendar/gui/calendar-model.c:457
+#: calendar/gui/e-cal-model-tasks.c:302
+msgid "S"
+msgstr "S"
+
+# calendar/gui/calendar-model.c:459
+#: calendar/gui/e-cal-model-tasks.c:304 smime/lib/e-cert.c:629
+msgid "E"
+msgstr "E"
+
+# calendar/gui/calendar-model.c:459
+#: calendar/gui/e-cal-model-tasks.c:304
+msgid "W"
+msgstr "W"
+
+# calendar/gui/calendar-model.c:970
+#: 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/calendar-model.c:794
 # e-util/e-time-utils.c:278
 #. strftime format of a weekday, a date and a time, 24-hour.
@@ -7229,18 +7231,30 @@ msgstr ""
 "\n"
 "%s"
 
-# calendar/gui/e-day-view-time-item.c:519
-#: calendar/gui/e-day-view-time-item.c:532
-#, c-format
-msgid "%02i minute divisions"
-msgstr "間隔 %02i 分鐘"
+# calendar/gui/e-day-view.c:570
+# calendar/gui/e-week-view.c:300
+# calendar/gui/print.c:617
+#. 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:573
+# calendar/gui/e-week-view.c:303
+# calendar/gui/print.c:616
+#. 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-top-item.c:274
 # calendar/gui/e-day-view.c:1294
 # calendar/gui/e-week-view-main-item.c:325
 #. 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:690 calendar/gui/e-day-view.c:1572
+#: 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"
@@ -7250,28 +7264,16 @@ msgstr "%A %d %B"
 # calendar/gui/e-week-view-main-item.c:348
 #. strftime format %d = day of month, %b = abbreviated month name.
 #. Don't use any other specifiers.
-#: calendar/gui/e-day-view-top-item.c:698 calendar/gui/e-day-view.c:1605
+#: 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.c:570
-# calendar/gui/e-week-view.c:300
-# calendar/gui/print.c:617
-#. String to use in 12-hour time format for times in the morning.
-#: calendar/gui/e-day-view.c:818 calendar/gui/e-week-view.c:593
-#: calendar/gui/print.c:838
-msgid "am"
-msgstr "上午"
-
-# calendar/gui/e-day-view.c:573
-# calendar/gui/e-week-view.c:303
-# calendar/gui/print.c:616
-#. String to use in 12-hour time format for times in the afternoon.
-#: calendar/gui/e-day-view.c:821 calendar/gui/e-week-view.c:596
-#: calendar/gui/print.c:840
-msgid "pm"
-msgstr "下午"
+# calendar/gui/e-day-view-time-item.c:519
+#: calendar/gui/e-day-view-time-item.c:532
+#, c-format
+msgid "%02i minute divisions"
+msgstr "間隔 %02i 分鐘"
 
 # calendar/gui/event-editor-dialog.glade.h:26
 #: calendar/gui/e-itip-control.c:592
@@ -7394,11 +7396,6 @@ msgstr "<br> 請查閱下列資訊，然後在下面的選單中選擇一個動�
 msgid "<i>None</i>"
 msgstr "<i>無</i>"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:27
-#: calendar/gui/e-itip-control.c:950
-msgid "Status:"
-msgstr "狀態:"
-
 #: calendar/gui/e-itip-control.c:955 calendar/gui/e-meeting-list-view.c:180
 #: calendar/gui/e-meeting-store.c:179 calendar/gui/e-meeting-store.c:202
 #: calendar/gui/itip-utils.c:422
@@ -7432,7 +7429,7 @@ 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:1079 widgets/misc/e-cell-date-edit.c:265
+#: shell/e-shell.c:1099 widgets/misc/e-cell-date-edit.c:265
 msgid "OK"
 msgstr "確認"
 
@@ -7667,61 +7664,57 @@ msgstr "附件並未包含合法的行事曆訊息"
 msgid "The attachment has no viewable calendar items"
 msgstr "附件沒有可檢視的行事曆項目"
 
-#: calendar/gui/e-itip-control.c:1766
-msgid "Calendar file could not be updated!\n"
-msgstr "無法更新行事曆檔案！\n"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:8
-#: calendar/gui/e-itip-control.c:1768
+#: calendar/gui/e-itip-control.c:1769
 msgid "Update complete\n"
 msgstr "更新完成\n"
 
-#: calendar/gui/e-itip-control.c:1798 calendar/gui/e-itip-control.c:1870
+#: calendar/gui/e-itip-control.c:1799 calendar/gui/e-itip-control.c:1871
 msgid "Attendee status can not be updated because the item no longer exists"
 msgstr "到會者狀態不能更新，因為項目已經不存在"
 
-#: calendar/gui/e-itip-control.c:1814 calendar/gui/e-itip-control.c:1852
+#: calendar/gui/e-itip-control.c:1815 calendar/gui/e-itip-control.c:1853
 msgid "Object is invalid and cannot be updated\n"
 msgstr "物件是無效的而且不能更新\n"
 
-#: calendar/gui/e-itip-control.c:1824
+#: calendar/gui/e-itip-control.c:1825
 msgid "This response is not from a current attendee.  Add as an attendee?"
 msgstr "這個回覆並非來自目前的到會者。將他加入為到會者？"
 
-#: calendar/gui/e-itip-control.c:1836
+#: calendar/gui/e-itip-control.c:1837
 msgid "Attendee status could not be updated because of an invalid status!\n"
 msgstr "由於不合法的狀態使得到會者狀態無法更新！\n"
 
-#: calendar/gui/e-itip-control.c:1855
+#: calendar/gui/e-itip-control.c:1856
 msgid "There was an error on the CORBA system\n"
 msgstr "CORBA 系統發生錯誤\n"
 
-#: calendar/gui/e-itip-control.c:1858
+#: calendar/gui/e-itip-control.c:1859
 msgid "Object could not be found\n"
 msgstr "找不到物件\n"
 
-#: calendar/gui/e-itip-control.c:1861
+#: calendar/gui/e-itip-control.c:1862
 msgid "You don't have the right permissions to update the calendar\n"
 msgstr "您沒有正確的權限可以更新行事曆\n"
 
-#: calendar/gui/e-itip-control.c:1864
+#: calendar/gui/e-itip-control.c:1865
 msgid "Attendee status updated\n"
 msgstr "到會者狀態已更新\n"
 
-#: calendar/gui/e-itip-control.c:1867
+#: calendar/gui/e-itip-control.c:1868
 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:1898
+#: calendar/gui/e-itip-control.c:1899
 msgid "Removal Complete"
 msgstr "移除完成"
 
-#: calendar/gui/e-itip-control.c:1921 calendar/gui/e-itip-control.c:1969
+#: calendar/gui/e-itip-control.c:1922 calendar/gui/e-itip-control.c:1970
 msgid "Item sent!\n"
 msgstr "項目傳送！\n"
 
-#: calendar/gui/e-itip-control.c:1923 calendar/gui/e-itip-control.c:1973
+#: calendar/gui/e-itip-control.c:1924 calendar/gui/e-itip-control.c:1974
 msgid "The item could not be sent!\n"
 msgstr "無法傳送這個項目！\n"
 
@@ -7862,38 +7855,6 @@ msgstr "已委派"
 msgid "In Process"
 msgstr "進行中"
 
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
-#. 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:452
-#: calendar/gui/e-meeting-time-sel.c:2060
-msgid "%A, %B %d, %Y"
-msgstr "%A, %B %d, %Y"
-
-# e-util/e-time-utils.c:269
-# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
-# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
-#. 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:456
-#: calendar/gui/e-meeting-time-sel.c:2093 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"
-
-# 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
-#. 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"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:394
 #: calendar/gui/e-meeting-time-sel.c:400 designs/OOA/ooa.glade.h:11
 msgid "Out of Office"
@@ -7969,8 +7930,46 @@ msgstr "會議開始時間(_S):"
 msgid "Meeting _end time:"
 msgstr "會議結束時間(_E):"
 
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:469
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2477
+#. 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"
+
+# e-util/e-time-utils.c:269
+# widgets/meeting-time-sel/e-meeting-time-sel-item.c:473
+# widgets/meeting-time-sel/e-meeting-time-sel.c:2505
+#. 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"
+
+# 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
+#. 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"
+
+# camel/camel-smime-context.c:194
+#: calendar/gui/e-pub-utils.c:300
+#, fuzzy, c-format
+msgid "Enter the password for %s"
+msgstr "請輸入 %s 所需的密碼"
+
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:525 calendar/gui/gnome-cal.c:1912
+#: calendar/gui/e-tasks.c:584 calendar/gui/gnome-cal.c:2018
 #, c-format
 msgid ""
 "Error on %s:\n"
@@ -7979,23 +7978,21 @@ msgstr ""
 "發生於 %s 的錯誤：\n"
 " %s"
 
-#. FIXME: this doesn't remove the task list from the list or anything
-#: calendar/gui/e-tasks.c:544
+#: calendar/gui/e-tasks.c:612 calendar/gui/gnome-cal.c:2057
 #, c-format
-msgid ""
-"The task backend for\n"
-"%s\n"
-" has crashed."
+msgid "The task backend for '%s' has crashed."
 msgstr ""
 
 # mail/mail-ops.c:1262
-#: calendar/gui/e-tasks.c:624
+#. FIXME Loading should be async
+#. FIXME With no event handling here the status message never actually changes
+#: calendar/gui/e-tasks.c:686
 #, c-format
 msgid "Opening tasks at %s"
 msgstr "開啟在 %s 的工作"
 
 # mail/mail-mt.c:190
-#: calendar/gui/e-tasks.c:645
+#: calendar/gui/e-tasks.c:709
 #, fuzzy, c-format
 msgid ""
 "Error opening %s:\n"
@@ -8005,65 +8002,138 @@ msgstr ""
 " %s"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/e-tasks.c:664
+#: calendar/gui/e-tasks.c:730
 #, fuzzy
 msgid "Loading tasks"
 msgstr "載入影像"
 
 # calendar/gui/e-calendar-table.c:152
-#: calendar/gui/e-tasks.c:766
+#: calendar/gui/e-tasks.c:834
 msgid "Completing tasks..."
 msgstr "正在完成工作..."
 
 # calendar/gui/e-calendar-table.c:714
-#: calendar/gui/e-tasks.c:789
+#: calendar/gui/e-tasks.c:857
 msgid "Deleting selected objects..."
 msgstr "正在刪除選定的物件..."
 
 # mail/mail-ops.c:1449
-#: calendar/gui/e-tasks.c:816
+#: calendar/gui/e-tasks.c:884
 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/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/importers/icalendar-importer.c:79
+#: calendar/importers/icalendar-importer.c:705
+msgid "Tasks"
+msgstr "工作"
+
 # calendar/gui/e-day-view.c:3146
 # ui/evolution-calendar.xml.h:16
-#: calendar/gui/gnome-cal.c:1773
+#: calendar/gui/gnome-cal.c:1876
 #, fuzzy, c-format
 msgid "Loading appointments at %s"
 msgstr "無約會"
 
 # ui/evolution-mail.xml.h:46
-#: calendar/gui/gnome-cal.c:1792
+#: calendar/gui/gnome-cal.c:1895
 #, fuzzy, c-format
 msgid "Loading tasks at %s"
 msgstr "載入影像"
 
 # mail/mail-display.c:299
-#: calendar/gui/gnome-cal.c:1812
+#: calendar/gui/gnome-cal.c:1918
 #, fuzzy, c-format
 msgid "Opening %s"
 msgstr "在 %s 內開啟..."
 
-#: calendar/gui/gnome-cal.c:1941
+#: calendar/gui/gnome-cal.c:2048
 #, c-format
 msgid "The calendar backend for '%s' has crashed."
 msgstr ""
 
-#: calendar/gui/gnome-cal.c:1953
-#, c-format
-msgid "The task 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:2757
+#: calendar/gui/gnome-cal.c:2894
 #, fuzzy
 msgid "Purging"
 msgstr "杜林"
 
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:1
+msgid "*Control*F3"
+msgstr ""
+
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:2
+msgid "*Control*F4"
+msgstr ""
+
+# ui/evolution-mail.xml.h:110
+#: 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 "在這裡設定您的時區、行事曆與工作清單"
+
+# ui/evolution-mail.xml.h:110
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:6
+#, fuzzy
+msgid "Evolution Calendar and Tasks"
+msgstr "行事曆與工作"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:5
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Calendar configuration control"
+msgstr "Evolution 郵件資料夾元件工廠。"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:8
+#, fuzzy
+msgid "Evolution Calendar scheduling message viewer"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:9
+#, fuzzy
+msgid "Evolution Calendar/Task editor"
+msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:10
+#, fuzzy
+msgid "Evolution's Calendar component"
+msgstr "Evolution 郵件資料夾顯示元件。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:11
+#, fuzzy
+msgid "Evolution's Tasks component"
+msgstr "Evolution 測試元件。"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:13
+#, fuzzy
+msgid "_Calendars"
+msgstr "行事曆"
+
+# ui/evolution-tasks.xml.h:9
+#: calendar/gui/GNOME_Evolution_Calendar.server.in.in.h:14
+#: views/tasks/galview.xml.h:3
+msgid "_Tasks"
+msgstr "工作(_T)"
+
 # calendar/gui/goto-dialog.glade.h:1
 #: calendar/gui/goto-dialog.glade.h:1
 msgid "April"
@@ -8223,6 +8293,25 @@ msgstr ""
 msgid "On The Web"
 msgstr ""
 
+#. FIXME: set proper domain/code
+#: calendar/gui/migration.c:708 calendar/gui/migration.c:840
+msgid "Unable to migrate old settings from evolution/config.xmldb"
+msgstr ""
+
+# shell/e-storage.c:475
+#. FIXME: domain/code
+#: calendar/gui/migration.c:737
+#, fuzzy, c-format
+msgid "Unable to migrate calendar `%s'"
+msgstr "權限不足"
+
+# addressbook/gui/component/addressbook.c:438
+#. FIXME: domain/code
+#: calendar/gui/migration.c:869
+#, fuzzy, c-format
+msgid "Unable to migrate tasks `%s'"
+msgstr "無法開啟目錄服務"
+
 # calendar/gui/print.c:300
 #: calendar/gui/print.c:489
 msgid "1st"
@@ -8504,7 +8593,7 @@ msgstr "連絡人: "
 # ui/evolution-addressbook.xml.h:10
 # ui/evolution-calendar.xml.h:24
 #: calendar/gui/print.c:2559 calendar/gui/print.c:2645
-#: calendar/gui/print.c:2737 mail/em-format-html-print.c:173
+#: calendar/gui/print.c:2737 mail/em-format-html-print.c:174
 msgid "Print Preview"
 msgstr "預覽列印"
 
@@ -8521,7 +8610,7 @@ msgstr "列印項目"
 msgid "Print Setup"
 msgstr "列印設定"
 
-#: calendar/gui/tasks-component.c:299
+#: calendar/gui/tasks-component.c:303
 #, c-format
 msgid "Task List '%s' will be removed. Are you sure you want to continue?"
 msgstr ""
@@ -8529,43 +8618,64 @@ msgstr ""
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:357
+#: calendar/gui/tasks-component.c:361
 #, fuzzy
 msgid "New Task List"
 msgstr "工作清單"
 
-#: calendar/gui/tasks-component.c:464
+# ui/evolution-tasks.xml.h:3
+#: calendar/gui/tasks-component.c:398
+#, 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
+#, fuzzy, c-format
+msgid ", %d selected"
+msgid_plural ", %d selected"
+msgstr[0] "%d 已選擇"
+msgstr[1] "%d 已選擇"
+
+# ui/evolution-mail.xml.h:46
+#: calendar/gui/tasks-component.c:447
+#, fuzzy
+msgid "Failed upgrading tasks."
+msgstr "載入影像"
+
+#: calendar/gui/tasks-component.c:526
 #, c-format
 msgid "Unable to open the task list '%s' for creating events and meetings"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:476
+#: calendar/gui/tasks-component.c:538
 msgid "There is no calendar available for creating tasks"
 msgstr ""
 
-#: calendar/gui/tasks-component.c:514
+#: calendar/gui/tasks-component.c:576
 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:722
+#: calendar/gui/tasks-component.c:804
 msgid "New task"
 msgstr "新增工作"
 
 # ui/evolution-tasks.xml.h:9
-#: calendar/gui/tasks-component.c:723
+#: calendar/gui/tasks-component.c:805
 msgid "_Task"
 msgstr "工作(_T)"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:724
+#: calendar/gui/tasks-component.c:806
 msgid "Create a new task"
 msgstr "建立一個新的工作"
 
 # ui/evolution-tasks.xml.h:3
-#: calendar/gui/tasks-component.c:730
+#: calendar/gui/tasks-component.c:812
 #, fuzzy
 msgid "New tasks group"
 msgstr "新增工作"
@@ -8573,29 +8683,18 @@ msgstr "新增工作"
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
-#: calendar/gui/tasks-component.c:731
+#: calendar/gui/tasks-component.c:813
 #, fuzzy
 msgid "_Tasks Group"
 msgstr "工作清單"
 
 # ui/evolution-tasks.xml.h:2
-#: calendar/gui/tasks-component.c:732
+#: calendar/gui/tasks-component.c:814
 #, fuzzy
 msgid "Create a new tasks group"
 msgstr "建立一個新的工作"
 
-# calendar/gui/tasks-control.c:108
-#: calendar/gui/tasks-control.c:152
-msgid "The URI of the tasks folder to display"
-msgstr "工作資料夾顯示的 URI"
-
-# calendar/gui/e-tasks.c:298
-#: calendar/gui/tasks-control.c:211
-#, c-format
-msgid "Could not load the tasks in `%s'"
-msgstr "無法載入“%s”裡的工作"
-
-#: calendar/gui/tasks-control.c:478
+#: 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"
@@ -8610,12 +8709,12 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: calendar/gui/tasks-control.c:481
+#: calendar/gui/tasks-control.c:370
 msgid "Do not ask me again."
 msgstr "不要再顯示這個訊息。"
 
 # ui/evolution-calendar.xml.h:25
-#: calendar/gui/tasks-control.c:539
+#: calendar/gui/tasks-control.c:428
 msgid "Print Tasks"
 msgstr "列印工作"
 
@@ -10321,7 +10420,7 @@ msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: camel/camel-disco-folder.c:449
+#: camel/camel-disco-folder.c:466
 #, c-format
 msgid "Preparing folder '%s' for offline"
 msgstr "準備資料夾“%s”供離線使用"
@@ -10443,38 +10542,6 @@ msgstr "無效的參數給 (user-tag)"
 msgid "Error executing filter search: %s: %s"
 msgstr "執行過濾器搜尋發生錯誤： %s: %s"
 
-# camel/camel-folder-search.c:328
-#: camel/camel-folder-search.c:348
-#, c-format
-msgid ""
-"Cannot parse search expression: %s:\n"
-"%s"
-msgstr ""
-"不能分析搜尋詞句：%s:\n"
-"%s"
-
-# camel/camel-folder-search.c:338
-#: camel/camel-folder-search.c:358
-#, c-format
-msgid ""
-"Error executing search expression: %s:\n"
-"%s"
-msgstr ""
-"執行搜尋詞句時發生錯誤：%s:\n"
-"%s"
-
-# camel/camel-folder-search.c:485
-# camel/camel-folder-search.c:513
-#: camel/camel-folder-search.c:569 camel/camel-folder-search.c:598
-msgid "(match-all) requires a single bool result"
-msgstr "(符合-全部) 需要單一布林值結果"
-
-# camel/camel-folder-search.c:559
-#: camel/camel-folder-search.c:650
-#, c-format
-msgid "Performing query on unknown header: %s"
-msgstr "在不明的檔頭內執行查詢：%s"
-
 #: camel/camel-folder.c:653
 #, c-format
 msgid "Unsupported operation: append message: for %s"
@@ -10511,7 +10578,61 @@ msgstr ""
 msgid "Filtering new message(s)"
 msgstr "取回 %d 封郵件"
 
-#: camel/camel-gpg-context.c:712
+# camel/camel-folder-search.c:328
+#: camel/camel-folder-search.c:355 camel/camel-folder-search.c:476
+#, c-format
+msgid ""
+"Cannot parse search expression: %s:\n"
+"%s"
+msgstr ""
+"不能分析搜尋詞句：%s:\n"
+"%s"
+
+# camel/camel-folder-search.c:338
+#: camel/camel-folder-search.c:365 camel/camel-folder-search.c:486
+#, c-format
+msgid ""
+"Error executing search expression: %s:\n"
+"%s"
+msgstr ""
+"執行搜尋詞句時發生錯誤：%s:\n"
+"%s"
+
+# camel/camel-folder-search.c:485
+# camel/camel-folder-search.c:513
+#: 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:755
+msgid "(match-threads) not allowed inside match-all"
+msgstr ""
+
+#: 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:485
+# camel/camel-folder-search.c:513
+#: camel/camel-folder-search.c:785
+#, 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
+#, fuzzy
+msgid "(match-threads) requires the folder set"
+msgstr "(符合-全部) 需要單一布林值結果"
+
+# camel/camel-folder-search.c:559
+#: camel/camel-folder-search.c:880
+#, c-format
+msgid "Performing query on unknown header: %s"
+msgstr "在不明的檔頭內執行查詢：%s"
+
+#: camel/camel-gpg-context.c:720
 #, c-format
 msgid ""
 "Unexpected GnuPG status message encountered:\n"
@@ -10522,15 +10643,15 @@ msgstr ""
 "\n"
 "%s"
 
-#: camel/camel-gpg-context.c:726
+#: camel/camel-gpg-context.c:734
 msgid "Failed to parse gpg userid hint."
 msgstr "解析 gpg userid 提示時失敗。"
 
-#: camel/camel-gpg-context.c:750
+#: camel/camel-gpg-context.c:758
 msgid "Failed to parse gpg passphrase request."
 msgstr "解析 gpg passphrase 要求時失敗。"
 
-#: camel/camel-gpg-context.c:764
+#: camel/camel-gpg-context.c:772
 #, c-format
 msgid ""
 "You need a passphrase to unlock the key for\n"
@@ -10540,31 +10661,31 @@ msgstr ""
 "“%s”"
 
 # mail/mail-send-recv.c:471
-#: camel/camel-gpg-context.c:781 camel/camel-gpg-context.c:1267
-#: camel/camel-gpg-context.c:1425 camel/camel-gpg-context.c:1517
-#: camel/camel-gpg-context.c:1624 mail/mail-ops.c:695
+#: 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
 #: mail/mail-send-recv.c:611
 msgid "Cancelled."
 msgstr "已取消。"
 
-#: camel/camel-gpg-context.c:799
+#: camel/camel-gpg-context.c:807
 msgid "Failed to unlock secret key: 3 bad passphrases given."
 msgstr "解鎖私密金鑰時失敗：輸入了 3 次錯誤的 passhprase 。"
 
 # camel/providers/imap/camel-imap-command.c:232
-#: camel/camel-gpg-context.c:805
+#: camel/camel-gpg-context.c:813
 #, c-format
 msgid "Unexpected response from GnuPG: %s"
 msgstr "從 GnuPG 傳回意外的回應： %s"
 
 # camel/providers/smtp/camel-smtp-transport.c:582
-#: camel/camel-gpg-context.c:851
+#: camel/camel-gpg-context.c:864
 msgid "Failed to encrypt: No valid recipients specified."
 msgstr "不能加密郵件：沒有提供有效的收件者。"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1128
+#: camel/camel-gpg-context.c:1141
 #, fuzzy, c-format
 msgid ""
 "Failed to GPG %s: %s\n"
@@ -10577,96 +10698,74 @@ msgstr ""
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1133
+#: camel/camel-gpg-context.c:1146
 #, c-format
 msgid "Failed to GPG %s: %s\n"
 msgstr "無法 GPG %s： %s\n"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1246 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"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1260 camel/camel-gpg-context.c:1673
-#: camel/camel-gpg-context.c:1724
+#: 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 失敗： %s"
 
 # camel/camel-filter-driver.c:670
 # camel/camel-filter-driver.c:679
-#: camel/camel-gpg-context.c:1284 camel/camel-gpg-context.c:1417
-#: camel/camel-gpg-context.c:1510 camel/camel-gpg-context.c:1533
-#: camel/camel-gpg-context.c:1617 camel/camel-gpg-context.c:1641
-#: camel/camel-gpg-context.c:1695 camel/camel-gpg-context.c:1746
+#: 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 失敗。"
 
-#: camel/camel-gpg-context.c:1303
+#: camel/camel-gpg-context.c:1316
 msgid "This is a digitally signed message part"
 msgstr "這是數位加簽的郵件"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1384 camel/camel-gpg-context.c:1393
-#: camel/camel-smime-context.c:717 camel/camel-smime-context.c:728
-#: camel/camel-smime-context.c:735
+#: 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"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # camel/camel-pgp-context.c:890
-#: camel/camel-gpg-context.c:1400
+#: camel/camel-gpg-context.c:1413
 #, c-format
 msgid "Cannot verify message signature: could not create temp file: %s"
 msgstr "不能驗證此郵件的簽章：無法建立暫存檔案：%s"
 
 # mail/mail-ops.c:1872
-#: camel/camel-gpg-context.c:1493
+#: camel/camel-gpg-context.c:1506
 #, fuzzy, c-format
 msgid "Could not generate encrypting data: %s"
 msgstr "無法寫入資料：%s"
 
-#: camel/camel-gpg-context.c:1551
+#: camel/camel-gpg-context.c:1564
 #, fuzzy
 msgid "This is a digitally encrypted message part"
 msgstr "這是數位加簽的郵件"
 
-#: camel/camel-gpg-context.c:1648 camel/camel-smime-context.c:990
+#: camel/camel-gpg-context.c:1661 camel/camel-smime-context.c:994
 #, fuzzy
 msgid "Encrypted content"
 msgstr "索引內文包含"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/camel-gpg-context.c:1652
+#: camel/camel-gpg-context.c:1680
 #, fuzzy
 msgid "Unable to parse message content"
 msgstr "無法從編輯器取得郵件"
 
-# camel/camel-movemail.c:306
-#: camel/camel-lock-client.c:100
-#, c-format
-msgid "Cannot build locking helper pipe: %s"
-msgstr "不能建立鎖定 helper 導管：%s"
-
-#: camel/camel-lock-client.c:113
-#, c-format
-msgid "Cannot fork locking helper: %s"
-msgstr "不能分叉鎖定 helper ： %s"
-
-#: 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 "無法鎖定“%s”： lock-helper 協定錯誤"
-
-# camel/camel-movemail.c:318
-#: camel/camel-lock-client.c:204
-#, c-format
-msgid "Could not lock '%s'"
-msgstr "無法鎖定“%s”"
-
 # camel/camel-lock.c:92
 # camel/camel-lock.c:111
 # camel/camel-movemail.c:138
@@ -10695,6 +10794,28 @@ msgstr "使用 fcntl(2) 取得鎖失敗： %s"
 msgid "Failed to get lock using flock(2): %s"
 msgstr "使用 flock(2) 取得鎖失敗： %s"
 
+# camel/camel-movemail.c:306
+#: camel/camel-lock-client.c:100
+#, c-format
+msgid "Cannot build locking helper pipe: %s"
+msgstr "不能建立鎖定 helper 導管：%s"
+
+#: camel/camel-lock-client.c:113
+#, c-format
+msgid "Cannot fork locking helper: %s"
+msgstr "不能分叉鎖定 helper ： %s"
+
+#: 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 "無法鎖定“%s”： lock-helper 協定錯誤"
+
+# camel/camel-movemail.c:318
+#: camel/camel-lock-client.c:204
+#, c-format
+msgid "Could not lock '%s'"
+msgstr "無法鎖定“%s”"
+
 # camel/camel-movemail.c:101
 #: camel/camel-movemail.c:107
 #, c-format
@@ -10977,7 +11098,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:1196
+#: camel/providers/imap/camel-imap-store.c:1212
 msgid "Bad authentication response from server."
 msgstr "來自伺服器的不良許可回應。"
 
@@ -11209,7 +11330,7 @@ msgstr ""
 
 #: camel/camel-smime-context.c:354
 #, fuzzy
-msgid "Cannot add add encryption certificate"
+msgid "Cannot add encryption certificate"
 msgstr "憑證 ID(_C):"
 
 #: camel/camel-smime-context.c:360
@@ -11228,7 +11349,7 @@ msgstr "無法建立一個 S/MIME 解密文本。"
 msgid "Failed to add data to CMS encoder"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:890
+#: camel/camel-smime-context.c:441 camel/camel-smime-context.c:894
 #, fuzzy
 msgid "Failed to encode data"
 msgstr "驗證憑證失敗。\n"
@@ -11316,107 +11437,107 @@ msgid "Cannot set message digests"
 msgstr "無法取得郵件 %s： %s"
 
 # mail/mail-crypto.c:59
-#: camel/camel-smime-context.c:614
+#: camel/camel-smime-context.c:614 camel/camel-smime-context.c:619
 #, fuzzy
 msgid "Certificate import failed"
 msgstr "憑證簽章失敗"
 
-#: camel/camel-smime-context.c:624
-msgid "Certficate only message, cannot verify certificates"
+#: camel/camel-smime-context.c:628
+msgid "Certificate only message, cannot verify certificates"
 msgstr ""
 
-#: camel/camel-smime-context.c:627
-msgid "Certficate only message, certificates imported and verified"
+#: camel/camel-smime-context.c:631
+msgid "Certificate only message, certificates imported and verified"
 msgstr ""
 
 # mail/mail-config.glade.h:74
-#: camel/camel-smime-context.c:631
+#: camel/camel-smime-context.c:635
 #, fuzzy
 msgid "Can't find signature digests"
 msgstr "儲存簽名檔"
 
 # mail/mail-config.glade.h:72
-#: camel/camel-smime-context.c:647
+#: camel/camel-smime-context.c:651
 #, fuzzy, c-format
 msgid "Signer: %s <%s>: %s\n"
 msgstr "伺服器： %s，類型： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
-#: camel/camel-smime-context.c:748
+#: camel/camel-smime-context.c:752
 #, fuzzy
 msgid "Decoder failed"
 msgstr "IMAP 指令失敗： %s"
 
 # camel/camel-smime-context.c:327
-#: camel/camel-smime-context.c:800
+#: camel/camel-smime-context.c:804
 #, fuzzy, c-format
 msgid "Can't find certificate for `%s'"
 msgstr "無法找到“%s”的憑證。"
 
-#: camel/camel-smime-context.c:807
+#: camel/camel-smime-context.c:811
 #, fuzzy
 msgid "Can't find common bulk encryption algorithm"
 msgstr "無法找到通用分散運算法。"
 
 #. PORT_GetError(); ??
-#: camel/camel-smime-context.c:816
+#: camel/camel-smime-context.c:820
 msgid "Can't allocate slot for encryption bulk key"
 msgstr ""
 
 # mail/folder-browser.c:731
-#: camel/camel-smime-context.c:827
+#: camel/camel-smime-context.c:831
 #, fuzzy
 msgid "Can't create CMS Message"
 msgstr "從郵件建立規則(_T)"
 
-#: camel/camel-smime-context.c:833
+#: camel/camel-smime-context.c:837
 msgid "Can't create CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:839
+#: camel/camel-smime-context.c:843
 msgid "Can't attach CMS EnvelopedData"
 msgstr ""
 
-#: camel/camel-smime-context.c:845
+#: camel/camel-smime-context.c:849
 msgid "Can't attach CMS data object"
 msgstr ""
 
-#: camel/camel-smime-context.c:854
+#: camel/camel-smime-context.c:858
 msgid "Can't create CMS RecipientInfo"
 msgstr ""
 
-#: camel/camel-smime-context.c:859
+#: camel/camel-smime-context.c:863
 msgid "Can't add CMS RecipientInfo"
 msgstr ""
 
 # mail/mail-crypto.c:251
-#: camel/camel-smime-context.c:873
+#: camel/camel-smime-context.c:877
 #, fuzzy
 msgid "Can't create encoder context"
 msgstr "無法建立一個 S/MIME 解密文本。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/camel-smime-context.c:884
+#: camel/camel-smime-context.c:888
 #, fuzzy
 msgid "Failed to add data to encoder"
 msgstr "無法連線至 LDAP 伺服器"
 
-#: camel/camel-smime-context.c:970
+#: camel/camel-smime-context.c:974
 #, c-format
 msgid "Decoder failed, error %d"
 msgstr ""
 
-#: camel/camel-smime-context.c:977
+#: camel/camel-smime-context.c:981
 msgid "S/MIME Decrypt: No encrypted content found"
 msgstr ""
 
 # camel/providers/smtp/camel-smtp-transport.c:172
-#: camel/camel-smime-context.c:1004
+#: camel/camel-smime-context.c:1008
 #, fuzzy
 msgid "import keys: unimplemented"
 msgstr "指令沒有實作"
 
-#: camel/camel-smime-context.c:1012
+#: camel/camel-smime-context.c:1016
 msgid "export keys: unimplemented"
 msgstr ""
 
@@ -11437,24 +11558,37 @@ msgstr "不能取得資料夾：%s：%s"
 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
+#, 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:379 camel/camel-vee-store.c:354
+#: camel/camel-store.c:387 camel/camel-vee-store.c:354
 #, 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
+#, c-format
+msgid "Cannot rename folder: %s: Invalid operation"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
 # 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
-#: camel/camel-store.c:793
+#: camel/camel-store.c:811
 msgid "Trash"
 msgstr "垃圾桶"
 
 # calendar/gui/goto-dialog.glade.h:9
-#: camel/camel-store.c:795 filter/libfilter-i18n.h:35
+#: camel/camel-store.c:813 filter/libfilter-i18n.h:35
 #: mail/mail-config.glade.h:92 ui/evolution-mail-message.xml.h:48
 #, fuzzy
 msgid "Junk"
@@ -11581,7 +11715,7 @@ msgstr "金鑰的用途並不支援憑證加簽"
 msgid "Error in application verification"
 msgstr "應用程式驗證時錯誤"
 
-#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:831
+#: camel/camel-tcp-stream-openssl.c:696 camel/camel-tcp-stream-ssl.c:825
 #, c-format
 msgid ""
 "Issuer:            %s\n"
@@ -11594,11 +11728,11 @@ msgstr ""
 "指紋:              %s\n"
 "簽章:              %s"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "GOOD"
 msgstr "良好"
 
-#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:837
+#: camel/camel-tcp-stream-openssl.c:702 camel/camel-tcp-stream-ssl.c:831
 msgid "BAD"
 msgstr "不良"
 
@@ -11624,7 +11758,7 @@ msgstr ""
 # camel/camel-tcp-stream-openssl.c:428
 # camel/camel-tcp-stream-ssl.c:364
 #. construct our user prompt
-#: camel/camel-tcp-stream-ssl.c:841
+#: camel/camel-tcp-stream-ssl.c:835
 #, c-format
 msgid ""
 "SSL Certificate check for %s:\n"
@@ -11639,7 +11773,7 @@ msgstr ""
 "\n"
 "您想要接受嗎？"
 
-#: camel/camel-tcp-stream-ssl.c:885
+#: camel/camel-tcp-stream-ssl.c:879
 #, c-format
 msgid ""
 "Certificate problem: %s\n"
@@ -11648,7 +11782,7 @@ msgstr ""
 "憑證問題： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:937
+#: camel/camel-tcp-stream-ssl.c:931
 #, c-format
 msgid ""
 "Bad certificate domain: %s\n"
@@ -11657,7 +11791,7 @@ msgstr ""
 "不正確的憑證網域： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:955
+#: camel/camel-tcp-stream-ssl.c:949
 #, c-format
 msgid ""
 "Certificate expired: %s\n"
@@ -11666,7 +11800,7 @@ msgstr ""
 "憑證已逾期： %s\n"
 "發照者： %s"
 
-#: camel/camel-tcp-stream-ssl.c:972
+#: camel/camel-tcp-stream-ssl.c:966
 #, c-format
 msgid ""
 "Certificate revocation list expired: %s\n"
@@ -11682,19 +11816,19 @@ msgid "Could not parse URL `%s'"
 msgstr "無法分析 URL“%s”"
 
 # shell/e-shell-importer.c:384
-#: camel/camel-vee-folder.c:614
+#: camel/camel-vee-folder.c:633
 #, c-format
 msgid "Error storing `%s': %s"
 msgstr "儲存“%s”時發生錯誤： %s"
 
 # camel/camel-vee-folder.c:451
-#: camel/camel-vee-folder.c:654
+#: camel/camel-vee-folder.c:675
 #, c-format
 msgid "No such message %s in %s"
 msgstr "沒有 %s 這類郵件在 %s 中"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: camel/camel-vee-folder.c:820 camel/camel-vee-folder.c:826
+#: camel/camel-vee-folder.c:841 camel/camel-vee-folder.c:847
 msgid "Cannot copy or move messages into a Virtual Folder"
 msgstr "不能複製或移動郵件到虛擬資料夾中"
 
@@ -11705,12 +11839,6 @@ msgstr "不能複製或移動郵件到虛擬資料夾中"
 msgid "Cannot delete folder: %s: No such folder"
 msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: camel/camel-vee-store.c:390
-#, c-format
-msgid "Cannot rename folder: %s: Invalid operation"
-msgstr "不能重新命名資料夾： %s ：無效的操作"
-
 # camel/providers/local/camel-local-store.c:237
 #: camel/camel-vee-store.c:398
 #, c-format
@@ -11732,11 +11860,13 @@ msgstr "無法關閉暫存資料夾： %s"
 # camel/providers/imap/camel-imap-provider.c:43
 # mail/mail-config.glade.h:13
 #: camel/providers/groupwise/camel-groupwise-provider.c:53
+#: camel/providers/imap4/camel-imap4-provider.c:35
 msgid "Checking for new mail"
 msgstr "檢查新郵件"
 
 # camel/providers/imap/camel-imap-provider.c:45
 #: 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 "檢查所有資料夾裡的新郵件"
@@ -11779,6 +11909,7 @@ msgstr ""
 # camel/providers/pop3/camel-pop3-provider.c:67
 # mail/mail-config.glade.h:52
 #: camel/providers/groupwise/camel-groupwise-provider.c:97
+#: 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
@@ -11799,6 +11930,385 @@ msgstr "這個選項將會使用簡易的密碼連線至 IMAP 伺服器。"
 msgid "Checklist"
 msgstr "濃靄"
 
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-command.c:629
+#, fuzzy, c-format
+msgid "Unexpected response from IMAP4 server %s: %s"
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-engine.c:415
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-engine.c:421
+#, fuzzy, c-format
+msgid "Cannot select folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/camel-remote-store.c:476
+#: 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/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:335
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:341
+#, fuzzy, c-format
+msgid "Cannot sync flags to folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:476
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Unknown"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-folder.c:481
+#, fuzzy, c-format
+msgid "Cannot expunge folder `%s': Bad command"
+msgstr "不能取得資料夾：%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/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/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: 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/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: 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/local/camel-mh-folder.c:149
+# camel/providers/local/camel-mh-folder.c:157
+#: 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/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: 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/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: 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/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: 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/local/camel-mbox-folder.c:335
+# camel/providers/local/camel-mbox-folder.c:367
+# camel/providers/local/camel-mbox-folder.c:380
+#: 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/imap/camel-imap-provider.c:48
+# shell/e-shell-view.c:552
+#: 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/imap/camel-imap-provider.c:50
+#: camel/providers/imap4/camel-imap4-provider.c:42
+#: camel/providers/imap/camel-imap-provider.c:57
+msgid "Show only subscribed folders"
+msgstr "只顯示已訂閱的資料夾"
+
+# camel/providers/imap/camel-imap-provider.c:52
+#: 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/imap/camel-imap-provider.c:54
+#: camel/providers/imap4/camel-imap4-provider.c:46
+#: camel/providers/imap/camel-imap-provider.c:61
+msgid "Namespace"
+msgstr "命名空間"
+
+# mail/mail-config.glade.h:34
+#: camel/providers/imap4/camel-imap4-provider.c:53
+#, fuzzy
+msgid "IMAPv4rev1"
+msgstr "IMAPv4 "
+
+# camel/providers/imap/camel-imap-provider.c:65
+#: camel/providers/imap4/camel-imap4-provider.c:55
+#, fuzzy
+msgid "For reading and storing mail on IMAPv4rev1 servers. EXPERIMENTAL !!"
+msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
+
+# camel/providers/imap/camel-imap-provider.c:82
+#: 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/smtp/camel-smtp-transport.c:534
+#: camel/providers/imap4/camel-imap4-store.c:165
+#: camel/providers/imap/camel-imap-store.c:429
+#, 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
+#, c-format
+msgid "IMAP service for %s on %s"
+msgstr "%s 的 IMAP 服務於 %s"
+
+# camel/camel-remote-store.c:255
+# camel/providers/smtp/camel-smtp-transport.c:269
+#: 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:140
+#: 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
+#, fuzzy
+msgid "SSL unavailable"
+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/imapp/camel-imapp-store.c:228
+#: camel/providers/nntp/camel-nntp-store.c:137
+#: camel/providers/nntp/camel-nntp-store.c:155
+#: camel/providers/pop3/camel-pop3-store.c:192
+msgid "Connection cancelled"
+msgstr "連線已取消"
+
+# camel/providers/pop3/camel-pop3-store.c:379
+#: 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"
+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
+#, c-format
+msgid "Failed to connect to IMAP server %s in secure mode: %s"
+msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: 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:1109
+msgid "Unknown error"
+msgstr "不明的錯誤"
+
+# camel/providers/pop3/camel-pop3-store.c:409
+#: camel/providers/imap4/camel-imap4-store.c:373
+#, fuzzy, c-format
+msgid ""
+"Cannot authenticate to IMAP server %s using the %s authentication mechanism"
+msgstr "無法連線到 POP 伺服器 %s：不支援所要求的驗證機制。"
+
+# camel/providers/smtp/camel-smtp-transport.c:395
+#: camel/providers/imap4/camel-imap4-store.c:418
+#, fuzzy, c-format
+msgid "%sPlease enter the IMAP password for %s on host %s"
+msgstr "%s 請輸入 %s@%s 的 SMTP 密碼"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: camel/providers/imap4/camel-imap4-store.c:492
+#, fuzzy, c-format
+msgid "Cannot authenticate to IMAP server %s using %s"
+msgstr "無法驗證 POP 伺服器 %s：%s"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: 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:1857
+#: camel/providers/imap/camel-imap-store.c:2235
+#, fuzzy, c-format
+msgid ""
+"The folder name \"%s\" is invalid because it contains the character \"%c\""
+msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:826
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:831
+#, fuzzy, c-format
+msgid "Cannot create folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:859
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Special folder"
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:891
+#, fuzzy, c-format
+msgid "Cannot delete folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: 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 get %s information for pattern `%s' on IMAP server %s: %s"
+msgstr ""
+
+# addressbook/contact-editor/e-contact-editor.c:1248
+#: camel/providers/imap4/camel-imap4-store.c:1039
+#, fuzzy
+msgid "Bad command"
+msgstr "公司電話"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#: camel/providers/imap4/camel-imap4-store.c:1100
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Invalid mailbox name"
+msgstr "不能刪除資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1105
+#, fuzzy, c-format
+msgid "Cannot subscribe to folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/local/camel-mbox-summary.c:655
+#: camel/providers/imap4/camel-imap4-store.c:1149
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Invalid mailbox name"
+msgstr "不能重新命名資料夾： %s ：無效的操作"
+
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: camel/providers/imap4/camel-imap4-store.c:1154
+#, fuzzy, c-format
+msgid "Cannot unsubscribe from folder `%s': Bad command"
+msgstr "不能取得資料夾：%s：%s"
+
+# camel/providers/imap/camel-imap-command.c:232
+#: camel/providers/imap4/camel-imap4-utils.c:85
+#, fuzzy, c-format
+msgid "Unexpected token in response from IMAP server %s: "
+msgstr "從 IMAP 伺服器傳回不當的回應： %s"
+
+# ui/evolution-tasks.xml.h:3
+#: camel/providers/imap4/camel-imap4-utils.c:108
+#, fuzzy
+msgid "No data"
+msgstr "無工作"
+
+# camel/camel-remote-store.c:476
+#: camel/providers/imap4/camel-imap4-utils.c:291
+#, fuzzy, c-format
+msgid "IMAP server %s unexpectedly disconnected: %s"
+msgstr "伺服器突然中斷連線： %s"
+
 # camel/camel-remote-store.c:337
 # camel/camel-remote-store.c:399
 # camel/camel-remote-store.c:470
@@ -11806,26 +12316,17 @@ 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:3118
+#: camel/providers/imap/camel-imap-store.c:3168
 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:3121
+#: camel/providers/imap/camel-imap-store.c:3171
 #, c-format
 msgid "Server unexpectedly disconnected: %s"
 msgstr "伺服器突然中斷連線： %s"
 
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: 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:1089
-msgid "Unknown error"
-msgstr "不明的錯誤"
-
 # camel/providers/imap/camel-imap-command.c:232
 #. for imap ALERT codes, account user@host
 #: camel/providers/imap/camel-imap-command.c:320
@@ -11878,18 +12379,18 @@ msgstr "無法建立目錄 %s： %s"
 msgid "Could not load summary for %s"
 msgstr "無法載入給 %s 的摘要"
 
-#: camel/providers/imap/camel-imap-folder.c:326
+#: camel/providers/imap/camel-imap-folder.c:330
 msgid "Folder was destroyed and recreated on server."
 msgstr "資料夾已破壞並在伺服器上重建。"
 
 # mail/mail-ops.c:1649
 #. Check UIDs and flags of all messages we already know of.
-#: camel/providers/imap/camel-imap-folder.c:569
+#: camel/providers/imap/camel-imap-folder.c:573
 msgid "Scanning for changed messages"
 msgstr "掃描變更過的郵件"
 
 # camel/providers/pop3/camel-pop3-folder.c:320
-#: camel/providers/imap/camel-imap-folder.c:1963
+#: camel/providers/imap/camel-imap-folder.c:1940
 #, c-format
 msgid "Unable to retrieve message: %s"
 msgstr "無法從取回郵件： %s"
@@ -11901,7 +12402,7 @@ msgstr "無法從取回郵件： %s"
 # 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/imap/camel-imap-folder.c:2010
+#: 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
@@ -11920,7 +12421,7 @@ msgstr ""
 # camel/providers/local/camel-maildir-folder.c:197
 # camel/providers/local/camel-mbox-folder.c:319
 # camel/providers/local/camel-mh-folder.c:185
-#: camel/providers/imap/camel-imap-folder.c:2010
+#: 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
@@ -11929,20 +12430,20 @@ msgstr "沒有這封郵件"
 
 # camel/providers/imap/camel-imap-folder.c:1047
 # camel/providers/imap/camel-imap-folder.c:1281
-#: camel/providers/imap/camel-imap-folder.c:2044
-#: camel/providers/imap/camel-imap-folder.c:2646
-#: camel/providers/nntp/camel-nntp-folder.c:233
+#: camel/providers/imap/camel-imap-folder.c:2019
+#: camel/providers/imap/camel-imap-folder.c:2621
+#: camel/providers/nntp/camel-nntp-folder.c:238
 msgid "This message is not currently available"
 msgstr "這封郵件目前仍未可用"
 
-#: camel/providers/imap/camel-imap-folder.c:2310
-#: camel/providers/imap/camel-imap-folder.c:2380
+#: 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:1075
 # camel/providers/imap/camel-imap-folder.c:1314
-#: camel/providers/imap/camel-imap-folder.c:2684
+#: camel/providers/imap/camel-imap-folder.c:2659
 msgid "Could not find message body in FETCH response."
 msgstr "在 FETCH 的回應內找不到郵件的內文。"
 
@@ -11995,28 +12496,6 @@ msgstr "無法連線至 LDAP 伺服器"
 msgid "Command:"
 msgstr "公司電話"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: camel/providers/imap/camel-imap-provider.c:55
-#: camel/providers/nntp/camel-nntp-provider.c:41
-msgid "Folders"
-msgstr "資料夾"
-
-# camel/providers/imap/camel-imap-provider.c:50
-#: camel/providers/imap/camel-imap-provider.c:57
-msgid "Show only subscribed folders"
-msgstr "只顯示已訂閱的資料夾"
-
-# camel/providers/imap/camel-imap-provider.c:52
-#: camel/providers/imap/camel-imap-provider.c:59
-msgid "Override server-supplied folder namespace"
-msgstr "覆蓋伺服器提供之資料夾的命名空間"
-
-# camel/providers/imap/camel-imap-provider.c:54
-#: camel/providers/imap/camel-imap-provider.c:61
-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"
@@ -12044,91 +12523,42 @@ msgstr "IMAP"
 msgid "For reading and storing mail on IMAP servers."
 msgstr "用作讀取及儲存郵件於 IMAP 伺服器。"
 
-# camel/providers/smtp/camel-smtp-transport.c:534
-#: camel/providers/imap/camel-imap-store.c:424
-#, c-format
-msgid "IMAP server %s"
-msgstr "IMAP 伺服器 %s"
-
-# camel/camel-remote-store.c:195
-#: camel/providers/imap/camel-imap-store.c:426
-#, c-format
-msgid "IMAP service for %s on %s"
-msgstr "%s 的 IMAP 服務於 %s"
-
-# camel/camel-remote-store.c:255
-# camel/providers/smtp/camel-smtp-transport.c:269
-#: camel/providers/imap/camel-imap-store.c:545
-#: camel/providers/imap/camel-imap-store.c:565
-#: camel/providers/imapp/camel-imapp-store.c:231
-#: camel/providers/nntp/camel-nntp-store.c:140
-#: 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/imap/camel-imap-store.c:547
-#: camel/providers/pop3/camel-pop3-store.c:177
-#: camel/providers/smtp/camel-smtp-transport.c:271
-#, fuzzy
-msgid "SSL unavailable"
-msgstr "TLS 無法使用"
-
-# camel/camel-remote-store.c:252
-#: camel/providers/imap/camel-imap-store.c:562
-#: camel/providers/imap/camel-imap-store.c:799
-#: 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/pop3/camel-pop3-store.c:192
-msgid "Connection cancelled"
-msgstr "連線已取消"
-
-# camel/providers/pop3/camel-pop3-store.c:379
-#: camel/providers/imap/camel-imap-store.c:633
-#: camel/providers/imap/camel-imap-store.c:664
-#, c-format
-msgid "Failed to connect to IMAP server %s in secure mode: %s"
-msgstr "以安全模式連線到 IMAP 伺服器 %s 時失敗了： %s"
-
 # shell/e-storage.c:477
-#: camel/providers/imap/camel-imap-store.c:634
+#: camel/providers/imap/camel-imap-store.c:650
 #: 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:665
+#: camel/providers/imap/camel-imap-store.c:681
 #: 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:802
+#: camel/providers/imap/camel-imap-store.c:818
 #, 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:1226
+#: camel/providers/imap/camel-imap-store.c:1242
 #, 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:1236
+#: camel/providers/imap/camel-imap-store.c:1252
 #: 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:1259
+#: camel/providers/imap/camel-imap-store.c:1275
 #: camel/providers/imapp/camel-imapp-store.c:344
 #, c-format
 msgid "%sPlease enter the IMAP password for %s@%s"
@@ -12136,12 +12566,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:1273
+#: camel/providers/imap/camel-imap-store.c:1289
 msgid "You didn't enter a password."
 msgstr "您沒有輸入密碼。"
 
 # camel/providers/imap/camel-imap-store.c:531
-#: camel/providers/imap/camel-imap-store.c:1302
+#: camel/providers/imap/camel-imap-store.c:1318
 #, c-format
 msgid ""
 "Unable to authenticate to IMAP server.\n"
@@ -12154,27 +12584,20 @@ msgstr ""
 
 # camel/providers/imap/camel-imap-store.c:803
 # mail/mail-local.c:334
-#: camel/providers/imap/camel-imap-store.c:1789
-#: camel/providers/imap/camel-imap-store.c:1979
+#: camel/providers/imap/camel-imap-store.c:1839
+#: camel/providers/imap/camel-imap-store.c:2029
 #, c-format
 msgid "No such folder %s"
 msgstr "沒有這個資料夾 %s"
 
-#: camel/providers/imap/camel-imap-store.c:1807
-#: camel/providers/imap/camel-imap-store.c:2185
-#, fuzzy, c-format
-msgid ""
-"The folder name \"%s\" is invalid because it contains the character \"%c\""
-msgstr "資料夾名稱“%s”無效，因為它包含字元“%c”"
-
-#: camel/providers/imap/camel-imap-store.c:1865
-#: camel/providers/imap/camel-imap-store.c:2246
+#: camel/providers/imap/camel-imap-store.c:1915
+#: camel/providers/imap/camel-imap-store.c:2296
 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:1920
+#: camel/providers/imap/camel-imap-store.c:1970
 #: camel/providers/local/camel-maildir-store.c:137
 #: camel/providers/local/camel-mbox-store.c:212
 #: camel/providers/local/camel-mh-store.c:236
@@ -12183,7 +12606,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:2196
+#: camel/providers/imap/camel-imap-store.c:2246
 #, c-format
 msgid "Unknown parent folder: %s"
 msgstr "不明的母資料夾： %s"
@@ -12300,8 +12723,8 @@ msgstr ""
 "也可以用來讀 Elm 、 Pine 或 Mutt 形式資料夾的樹狀結構。"
 
 # camel/providers/local/camel-local-store.c:127
-#: camel/providers/local/camel-local-store.c:138
-#: camel/providers/local/camel-local-store.c:215
+#: 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-spool-store.c:116
 #, c-format
@@ -12309,59 +12732,59 @@ msgid "Store root %s is not an absolute path"
 msgstr "儲存根目錄 %s 不是絕對路徑"
 
 # camel/providers/local/camel-local-store.c:134
-#: camel/providers/local/camel-local-store.c:145
+#: camel/providers/local/camel-local-store.c:149
 #, c-format
 msgid "Store root %s is not a regular directory"
 msgstr "儲存根目錄 %s 不是合法的目錄"
 
 # camel/providers/local/camel-local-store.c:142
 # camel/providers/local/camel-local-store.c:158
-#: camel/providers/local/camel-local-store.c:154
-#: camel/providers/local/camel-local-store.c:162
-#: camel/providers/local/camel-local-store.c:226
+#: 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:173
-#: camel/providers/local/camel-local-store.c:174
+#: camel/providers/local/camel-local-store.c:178
 msgid "Local stores do not have an inbox"
 msgstr "本地端的存儲沒有收件匣"
 
 # camel/providers/local/camel-local-store.c:183
-#: camel/providers/local/camel-local-store.c:186
+#: camel/providers/local/camel-local-store.c:224
 #, c-format
 msgid "Local mail file %s"
 msgstr "本地端郵件檔案 %s"
 
 # camel/providers/local/camel-local-store.c:237
-#: camel/providers/local/camel-local-store.c:295
+#: 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-mbox-summary.c:655
-#: camel/providers/local/camel-local-store.c:360
+#: 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:279
-#: camel/providers/local/camel-local-store.c:385
+#: 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:289
-#: camel/providers/local/camel-local-store.c:395
+#: 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-store.c:279
-#: camel/providers/local/camel-local-store.c:418
+#: 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"
@@ -12450,7 +12873,7 @@ 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:336
+#: camel/providers/local/camel-maildir-store.c:341
 #: camel/providers/local/camel-spool-store.c:286
 #: camel/providers/local/camel-spool-store.c:316
 #, c-format
@@ -12869,7 +13292,7 @@ msgstr ""
 # 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:258
+#: 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
@@ -12885,8 +13308,8 @@ msgstr "使用者已取消"
 # 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:254
-#: camel/providers/nntp/camel-nntp-folder.c:260
+#: camel/providers/nntp/camel-nntp-folder.c:259
+#: camel/providers/nntp/camel-nntp-folder.c:265
 #: camel/providers/pop3/camel-pop3-folder.c:433
 #: camel/providers/pop3/camel-pop3-folder.c:494
 #: camel/providers/pop3/camel-pop3-folder.c:501
@@ -12895,51 +13318,51 @@ msgstr "使用者已取消"
 msgid "Cannot get message %s: %s"
 msgstr "無法取得郵件 %s： %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:185
-#: camel/providers/nntp/camel-nntp-folder.c:223
+#: 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/camel-movemail.c:306
-#: camel/providers/nntp/camel-nntp-folder.c:198
+#: 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:381
+#: camel/providers/nntp/camel-nntp-folder.c:362
 msgid "Posting not allowed by news server"
 msgstr ""
 
-#: camel/providers/nntp/camel-nntp-folder.c:392
+#: 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:432
-#: camel/providers/nntp/camel-nntp-folder.c:445
+#: 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:457
+#: 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:460
+#: camel/providers/nntp/camel-nntp-folder.c:441
 #, fuzzy, c-format
 msgid "Error posting message: %s: message not posted"
 msgstr ""
 "自動儲存郵件時發生錯誤： %s\n"
 " %s"
 
-#: camel/providers/nntp/camel-nntp-folder.c:476
+#: camel/providers/nntp/camel-nntp-folder.c:457
 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:487
+#: camel/providers/nntp/camel-nntp-folder.c:468
 #, fuzzy
 msgid "You cannot copy messages from a NNTP folder!"
 msgstr "無法關閉暫存資料夾： %s"
@@ -13078,7 +13501,7 @@ msgstr "無法取得群組：%s"
 # camel/providers/sendmail/camel-sendmail-transport.c:150
 #: camel/providers/nntp/camel-nntp-summary.c:333
 #, fuzzy
-msgid "Could not get messages: unspecificed error"
+msgid "Could not get messages: unspecified error"
 msgstr "郵件無法傳送： %s"
 
 # camel/providers/imap/camel-imap-command.c:240
@@ -13146,8 +13569,8 @@ msgid "Retrieving POP message %d"
 msgstr "接收 POP 郵件 %d"
 
 # camel/camel-sasl-login.c:127
-#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1215
-#: composer/e-msg-composer.c:1236
+#: camel/providers/pop3/camel-pop3-folder.c:501 composer/e-msg-composer.c:1225
+#: composer/e-msg-composer.c:1246
 msgid "Unknown reason"
 msgstr "不明的原因"
 
@@ -13689,7 +14112,7 @@ 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:1478
+#: composer/e-msg-composer-attachment-bar.c:295 mail/em-utils.c:408
 msgid "attachment"
 msgstr "附件"
 
@@ -13744,6 +14167,108 @@ msgstr "MIME 類型:"
 msgid "Suggest automatic display of attachment"
 msgstr "建議自動顯示附件"
 
+#: composer/e-msg-composer.c:704
+#, fuzzy
+msgid ""
+"Cannot sign outgoing message: No signing certificate set for this account"
+msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
+
+#: composer/e-msg-composer.c:711
+#, fuzzy
+msgid ""
+"Cannot encrypt outgoing message: No encryption certificate set for this "
+"account"
+msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
+
+# camel/camel-filter-driver.c:671
+#: composer/e-msg-composer.c:1283
+#, fuzzy
+msgid "Could not open file"
+msgstr "不能開啟郵件"
+
+# camel/providers/pop3/camel-pop3-folder.c:320
+#: composer/e-msg-composer.c:1291
+msgid "Unable to retrieve message from editor"
+msgstr "無法從編輯器取得郵件"
+
+# mail/mail-search.c:138
+#: composer/e-msg-composer.c:1561
+#, fuzzy
+msgid "Untitled Message"
+msgstr "(未命名的郵件)"
+
+# composer/e-msg-composer.c:966
+#: composer/e-msg-composer.c:1591
+msgid "Open file"
+msgstr "開啟檔案"
+
+#: composer/e-msg-composer.c:1998 mail/mail-account-gui.c:1479
+msgid "Autogenerated"
+msgstr "自動產生的"
+
+# mail/mail-config.glade.h:74
+#: 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.c:2330 composer/e-msg-composer.c:3234
+msgid "Show _Attachment Bar (drop attachments here)"
+msgstr ""
+
+# composer/e-msg-composer.c:1526
+# composer/e-msg-composer.c:1871
+#: 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 ""
+"無法建立郵件編輯視窗：\n"
+"無法作用位址選擇器控制元。"
+
+# composer/evolution-composer.c:355
+#: 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 ""
+"無法建立郵件編輯視窗：\n"
+"無法作用 HTML 編輯器元件。\n"
+"請確定您已經安裝了正確版本\n"
+"的 gtkhtml 與 libgtkhtml 。\n"
+
+# composer/evolution-composer.c:355
+#: composer/e-msg-composer.c:3279
+msgid ""
+"Could not create composer window:\n"
+"Unable to activate HTML editor component."
+msgstr ""
+"無法建立郵件編輯視窗：\n"
+"無法作用 HTML 編輯器元件。"
+
+#: composer/e-msg-composer.c:4284
+msgid ""
+"<b>(The composer contains a non-text message body, which cannot be edited.)"
+"<b>"
+msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
+
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -13841,233 +14366,151 @@ msgstr "<按這裏選擇資料夾>"
 msgid "Attach file(s)"
 msgstr "附加檔案"
 
-#: composer/e-msg-composer.c:695
-#, fuzzy
-msgid ""
-"Cannot sign outgoing message: No signing certificate set for from account"
-msgstr "當使用這個帳號時永遠在寄送的郵件上加簽(_A)"
-
-#: composer/e-msg-composer.c:701
-msgid ""
-"Cannot encrypt outgoing message: No encryption certificate set for from "
-"account"
-msgstr ""
-
-# camel/camel-filter-driver.c:671
-#: composer/e-msg-composer.c:1273
-#, fuzzy
-msgid "Could not open file"
-msgstr "不能開啟郵件"
-
-# camel/providers/pop3/camel-pop3-folder.c:320
-#: composer/e-msg-composer.c:1281
-msgid "Unable to retrieve message from editor"
-msgstr "無法從編輯器取得郵件"
-
-# mail/mail-search.c:138
-#: composer/e-msg-composer.c:1551
+# composer/e-msg-composer-attachment-bar.c:501
+#. mail-composer:no-attach primary
+#: composer/mail-composer-errors.xml.h:2
 #, fuzzy
-msgid "Untitled Message"
-msgstr "(未命名的郵件)"
-
-# composer/e-msg-composer.c:966
-#: composer/e-msg-composer.c:1581
-msgid "Open file"
-msgstr "開啟檔案"
-
-#: composer/e-msg-composer.c:1988 mail/mail-account-gui.c:1461
-msgid "Autogenerated"
-msgstr "自動產生的"
-
-# mail/mail-config.glade.h:74
-#: composer/e-msg-composer.c:2087
-msgid "Signature:"
-msgstr "簽名檔:"
-
-#: composer/e-msg-composer.c:2288
-#, c-format
-msgid "<b>%d</b> File Attached"
-msgid_plural "<b>%d</b> Files Attached"
-msgstr[0] ""
-msgstr[1] ""
-
-#: composer/e-msg-composer.c:2317
-msgid "Hide _Attachment Bar (drop attachments here)"
-msgstr ""
-
-#: composer/e-msg-composer.c:2320 composer/e-msg-composer.c:3224
-msgid "Show _Attachment Bar (drop attachments here)"
-msgstr ""
-
-# composer/e-msg-composer.c:1526
-# composer/e-msg-composer.c:1871
-#: composer/e-msg-composer.c:2337 composer/e-msg-composer.c:3103
-#: composer/e-msg-composer.c:3104
-msgid "Compose a message"
-msgstr "編輯郵件"
+msgid "You cannot attach the file `${0}' to this message."
+msgstr "附加檔案至郵件"
 
-#: composer/e-msg-composer.c:3137
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate address selector control."
+#. mail-composer:no-attach secondary
+#: composer/mail-composer-errors.xml.h:4
+msgid "${1}"
 msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用位址選擇器控制元。"
 
-# composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3165
-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: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 ""
-"無法建立郵件編輯視窗：\n"
-"無法作用 HTML 編輯器元件。\n"
-"請確定您已經安裝了正確版本\n"
-"的 gtkhtml 與 libgtkhtml 。\n"
 
-# composer/evolution-composer.c:355
-#: composer/e-msg-composer.c:3269
-msgid ""
-"Could not create composer window:\n"
-"Unable to activate HTML editor component."
+#. mail-composer:attach-directory primary
+#: composer/mail-composer-errors.xml.h:8
+msgid "Directories can not be attached to Messages."
 msgstr ""
-"無法建立郵件編輯視窗：\n"
-"無法作用 HTML 編輯器元件。"
 
-#: composer/e-msg-composer.c:4274
+#. mail-composer:attach-directory secondary
+#: composer/mail-composer-errors.xml.h:10
 msgid ""
-"<b>(The composer contains a non-text message body, which cannot be edited.)"
-"<b>"
-msgstr "<b>（郵件編輯器包含不能編輯的非文字的郵件內文。）<b>"
-
-#: composer/mail-composer-errors.xml.in.h:1
-msgid "${1}"
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:2
-msgid "All accounts have been removed."
+"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 ""
 
-# calendar/gui/dialogs/delete-comp.c:87
-#: composer/mail-composer-errors.xml.in.h:3
+# mail/mail-search.c:138
+#. mail-composer:recover-autosave title
+#: composer/mail-composer-errors.xml.h:12
 #, fuzzy
-msgid ""
-"Are you sure you want to discard the message, titled '{0}', you are "
-"composing?"
-msgstr "您確定要刪除這個未命名的約會？"
-
-#: composer/mail-composer-errors.xml.in.h:4
-msgid "Because \"${0}\", you may need to select different mail options."
-msgstr ""
+msgid "Unfinished messages found"
+msgstr "下一封未閱讀的郵件(_U)"
 
-#: composer/mail-composer-errors.xml.in.h:5
-msgid "Because \"${1}\"."
-msgstr ""
+# calendar/gui/dialogs/save-comp.c:51
+#. mail-composer:recover-autosave primary
+#: composer/mail-composer-errors.xml.h:14
+#, fuzzy
+msgid "Do you want to recover unfinished messages?"
+msgstr "您是否須要儲存變更？"
 
-#: composer/mail-composer-errors.xml.in.h:6
+#. mail-composer:recover-autosave secondary
+#: composer/mail-composer-errors.xml.h:16
 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."
+"Evolution quit unexpectedly while you were composing a new message. "
+"Recovering the message will allow you to continue where you left off."
 msgstr ""
 
-# camel/camel-movemail.c:306
-#: composer/mail-composer-errors.xml.in.h:7
+# shell/e-shortcuts-view.c:265
+#: composer/mail-composer-errors.xml.h:17
 #, fuzzy
-msgid "Could not create message."
-msgstr "無法建立導管：%s"
+msgid "Don't Recover"
+msgstr "不要移除"
 
-# mail/mail-crypto.c:59
-#: composer/mail-composer-errors.xml.in.h:8
+# 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
+#: composer/mail-composer-errors.xml.h:18
 #, fuzzy
-msgid "Could not read signature file \"{0}\"."
-msgstr "無法儲存簽名檔： %s"
+msgid "Recover"
+msgstr "移除"
 
 # mail/mail-crypto.c:59
-#: composer/mail-composer-errors.xml.in.h:9
+#. mail-composer:no-autosave primary
+#: composer/mail-composer-errors.xml.h:20
 #, fuzzy
 msgid "Could not save to autosave file \"{0}\"."
 msgstr "無法儲存簽名檔： %s"
 
-#: composer/mail-composer-errors.xml.in.h:10
-msgid "Directories can not be attached to Messages."
-msgstr ""
-
-#: composer/mail-composer-errors.xml.in.h:11
-#, fuzzy
-msgid "Discard Changes"
-msgstr "放棄變更(_D)"
-
-# calendar/gui/dialogs/save-comp.c:51
-#: composer/mail-composer-errors.xml.in.h:12
-#, fuzzy
-msgid "Do you want to recover unfinished messages?"
-msgstr "您是否須要儲存變更？"
-
-# shell/e-shortcuts-view.c:265
-#: composer/mail-composer-errors.xml.in.h:13
-#, fuzzy
-msgid "Don't Recover"
-msgstr "不要移除"
-
 # shell/e-shortcuts.c:381
-#: composer/mail-composer-errors.xml.in.h:14
+#. mail-composer:no-autosave secondary
+#: composer/mail-composer-errors.xml.h:22
 #, fuzzy
 msgid "Error saving to autosave because \"{1}\"."
 msgstr "儲存功能項目時發生錯誤。"
 
-#: composer/mail-composer-errors.xml.in.h:15
+# mail/mail-ops.c:1154
+#. mail-composer:exit-unsaved title
+#: composer/mail-composer-errors.xml.h:24
+msgid "Warning: Modified Message"
+msgstr "警告：編輯過的郵件"
+
+# calendar/gui/dialogs/delete-comp.c:87
+#. mail-composer:exit-unsaved primary
+#: composer/mail-composer-errors.xml.h:26
+#, fuzzy
 msgid ""
-"Evolution quit unexpectedly while you were composing a new message. "
-"Recovering the message will allow you to continue where you left off."
+"Are you sure you want to discard the message, titled '{0}', you are "
+"composing?"
+msgstr "您確定要刪除這個未命名的約會？"
+
+#. 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 ""
 
-# 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
-#: composer/mail-composer-errors.xml.in.h:16
+#: composer/mail-composer-errors.xml.h:29
 #, fuzzy
-msgid "Recover"
-msgstr "移除"
+msgid "Discard Changes"
+msgstr "放棄變更(_D)"
 
 # mail/mail-callbacks.c:1188
-#: composer/mail-composer-errors.xml.in.h:17
+#: composer/mail-composer-errors.xml.h:30
 #, fuzzy
 msgid "Save Message"
 msgstr "另存郵件..."
 
-#: composer/mail-composer-errors.xml.in.h:18
-msgid "The file `${0}' is not a regular file and cannot be sent in a message."
-msgstr ""
+# camel/camel-movemail.c:306
+#. mail-composer:no-build-message primary
+#: composer/mail-composer-errors.xml.h:32
+#, fuzzy
+msgid "Could not create message."
+msgstr "無法建立導管：%s"
 
-#: composer/mail-composer-errors.xml.in.h:19
-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."
+#. 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 ""
 
-# mail/mail-search.c:138
-#: composer/mail-composer-errors.xml.in.h:20
+# mail/mail-crypto.c:59
+#. mail-composer:no-sig-file primary
+#: composer/mail-composer-errors.xml.h:36
 #, fuzzy
-msgid "Unfinished messages found"
-msgstr "下一封未閱讀的郵件(_U)"
+msgid "Could not read signature file \"{0}\"."
+msgstr "無法儲存簽名檔： %s"
 
-# mail/mail-ops.c:1154
-#: composer/mail-composer-errors.xml.in.h:21
-msgid "Warning: Modified Message"
-msgstr "警告：編輯過的郵件"
+#. mail-composer:no-sig-file secondary
+#: composer/mail-composer-errors.xml.h:38
+msgid "Because \"${1}\"."
+msgstr ""
 
-# composer/e-msg-composer-attachment-bar.c:501
-#: composer/mail-composer-errors.xml.in.h:22
-#, fuzzy
-msgid "You cannot attach the file `${0}' to this message."
-msgstr "附加檔案至郵件"
+#. mail-composer:all-accounts-deleted primary
+#: composer/mail-composer-errors.xml.h:40
+msgid "All accounts have been removed."
+msgstr ""
 
 # mail/mail-callbacks.c:146
-#: composer/mail-composer-errors.xml.in.h:23
+#. mail-composer:all-accounts-deleted secondary
+#: composer/mail-composer-errors.xml.h:42
 #, fuzzy
 msgid "You need to configure an account before you can compose mail."
 msgstr ""
@@ -14215,7 +14658,8 @@ msgstr ""
 
 # mail/mail-callbacks.c:1140
 # mail/mail-display.c:92
-#: e-util/e-dialog-utils.c:251
+#. 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 "覆蓋檔案？"
 
@@ -14431,91 +14875,107 @@ msgstr "選擇要比對的時間"
 msgid "_Filter Rules"
 msgstr "過濾器規則"
 
-#: filter/filter-errors.xml.in.h:1
-#, fuzzy
-msgid "Bad regular expression \"{0}\"."
-msgstr ""
-"正規表示式內有錯誤“%s”：\n"
-"%s"
-
-#: filter/filter-errors.xml.in.h:2
-msgid "Could not compile regular expression \"{1}\"."
-msgstr ""
-
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: filter/filter-errors.xml.in.h:3
-#, fuzzy
-msgid "File \"{0}\" does not exist or is not a regular file."
-msgstr "排程器“%s”不存在或不是一個合法的檔案。"
-
 # widgets/meeting-time-sel/e-meeting-time-sel.c:631
-#: filter/filter-errors.xml.in.h:4
+#. filter:no-date primary
+#: filter/filter-errors.xml.h:2
 #, fuzzy
 msgid "Missing date."
 msgstr "會議更新"
 
-#: filter/filter-errors.xml.in.h:5
+#. 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
 #, fuzzy
 msgid "Missing file name."
 msgstr "'辨別的名稱(_N):"
 
+# ui/evolution.xml.h:3
+#. filter:no-file secondary
+#: filter/filter-errors.xml.h:8 filter/filter-errors.xml.h:12
+msgid "You must specify a file name."
+msgstr "您必須指定一個檔案名稱。"
+
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#. filter:bad-file primary
+#: filter/filter-errors.xml.h:10
+#, fuzzy
+msgid "File \"{0}\" does not exist or is not a regular file."
+msgstr "排程器“%s”不存在或不是一個合法的檔案。"
+
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: filter/filter-errors.xml.in.h:6
+#. filter:no-folder primary
+#: filter/filter-errors.xml.h:14
 #, fuzzy
 msgid "Missing folder."
 msgstr "移除資料夾 %s"
 
-# calendar/gui/calendar-model.c:1578
-#: filter/filter-errors.xml.in.h:7
-#, fuzzy
-msgid "Missing name."
-msgstr "指派工作"
-
-#: filter/filter-errors.xml.in.h:8
-msgid "Name \"{0}\" already used."
-msgstr ""
+# ui/evolution.xml.h:3
+#. filter:no-folder secondary
+#: filter/filter-errors.xml.h:16
+msgid "You must specify a folder."
+msgstr "您必須指定一個資料夾。"
 
-#: filter/filter-errors.xml.in.h:9
+#. filter:bad-regexp primary
+#: filter/filter-errors.xml.h:18
 #, fuzzy
-msgid "No sources selected."
-msgstr "尚未選擇伺服器"
+msgid "Bad regular expression \"{0}\"."
+msgstr ""
+"正規表示式內有錯誤“%s”：\n"
+"%s"
 
-#: filter/filter-errors.xml.in.h:10
-msgid "Please choose another name."
+#. filter:bad-regexp secondary
+#: filter/filter-errors.xml.h:20
+msgid "Could not compile regular expression \"{1}\"."
 msgstr ""
 
-#: filter/filter-errors.xml.in.h:11
-msgid "You must choose a date."
-msgstr "您必須選取日期。"
+# calendar/gui/calendar-model.c:1578
+#. filter:no-name primary
+#: filter/filter-errors.xml.h:22 filter/filter-errors.xml.h:26
+#, fuzzy
+msgid "Missing name."
+msgstr "指派工作"
 
 # ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:12
+#. filter:no-name secondary
+#: filter/filter-errors.xml.h:24
 msgid "You must name this filter."
 msgstr "您必須為這個過濾器命名。"
 
 # ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:13
+#. filter:no-name-vfolder secondary
+#: filter/filter-errors.xml.h:28
 #, fuzzy
 msgid "You must name this vFolder."
 msgstr "您必須為這個虛擬資料夾命名。"
 
-# ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:14
-msgid "You must specify a file name."
-msgstr "您必須指定一個檔案名稱。"
+#. filter:bad-name-notunique primary
+#: filter/filter-errors.xml.h:30
+msgid "Name \"{0}\" already used."
+msgstr ""
 
-# ui/evolution.xml.h:3
-#: filter/filter-errors.xml.in.h:15
-msgid "You must specify a folder."
-msgstr "您必須指定一個資料夾。"
+#. filter:bad-name-notunique secondary
+#: filter/filter-errors.xml.h:32
+msgid "Please choose another name."
+msgstr ""
 
-#: filter/filter-errors.xml.in.h:16
+#. filter:vfolder-no-source primary
+#: filter/filter-errors.xml.h:34
+#, fuzzy
+msgid "No sources selected."
+msgstr "尚未選擇伺服器"
+
+#. filter:vfolder-no-source secondary
+#: filter/filter-errors.xml.h:36
 msgid ""
-"You must specify at least one folder as a source. Either by selecting the "
-"folders individually, and/or by selecting all local folders, all remote "
-"folders, or both."
+"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 ""
 
 # ui/evolution-message-composer.xml.h:12
@@ -14530,69 +14990,11 @@ msgid "<b>Then</b>"
 msgstr "<b>逾期:</b>"
 
 # mail/mail-account-gui.c:682
-#: filter/filter-folder.c:237 filter/vfolder-rule.c:492
-#: mail/mail-account-gui.c:1327
+#: filter/filter-folder.c:238 filter/vfolder-rule.c:493
+#: mail/mail-account-gui.c:1335
 msgid "Select Folder"
 msgstr "選擇資料夾"
 
-#: filter/filter-label.c:121 filter/libfilter-i18n.h:26 mail/em-migrate.c:922
-#: mail/mail-config.c:65 mail/mail-config.glade.h:90
-msgid "Important"
-msgstr "重要"
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#. forest green
-#: filter/filter-label.c:124 mail/em-migrate.c:925 mail/mail-config.c:68
-#: mail/mail-config.glade.h:145
-msgid "To Do"
-msgstr "待辦"
-
-# calendar/gui/event-editor-dialog.glade.h:33
-#. blue
-#: filter/filter-label.c:125 mail/em-migrate.c:926 mail/mail-config.c:69
-#: mail/mail-config.glade.h:94
-msgid "Later"
-msgstr "稍後"
-
-#: filter/filter-part.c:532 shell/GNOME_Evolution_Test.server.in.in.h:3
-msgid "Test"
-msgstr "測試"
-
-#: filter/filter-rule.c:746
-#, fuzzy
-msgid "Rule name:"
-msgstr "規則名稱:"
-
-#: filter/filter-rule.c:750
-msgid "Untitled"
-msgstr "未命名"
-
-#: filter/filter-rule.c:773
-#, fuzzy
-msgid "<b>If</b>"
-msgstr "<b>逾期:</b>"
-
-#: filter/filter-rule.c:804
-msgid "Execute actions"
-msgstr "執行動作"
-
-#: filter/filter-rule.c:808
-msgid "if all criteria are met"
-msgstr "如果全部條件符合"
-
-#: filter/filter-rule.c:813
-msgid "if any criteria are met"
-msgstr "如果任何條件符合"
-
-#: filter/filter-rule.c:904
-msgid "incoming"
-msgstr "內送"
-
-#: filter/filter-rule.c:904
-msgid "outgoing"
-msgstr "外寄"
-
 #: filter/filter.glade.h:1
 msgid "    "
 msgstr ""
@@ -14683,6 +15085,81 @@ 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
+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
+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
+msgid "Later"
+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/filter-rule.c:817
+#, fuzzy
+msgid "<b>If</b>"
+msgstr "<b>逾期:</b>"
+
+#: filter/filter-rule.c:854
+msgid "if all criteria are met"
+msgstr "如果全部條件符合"
+
+#: filter/filter-rule.c:854
+msgid "if any criteria are met"
+msgstr "如果任何條件符合"
+
+#: filter/filter-rule.c:856
+msgid "Execute actions"
+msgstr "執行動作"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "All related"
+msgstr "已委派"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies"
+msgstr "收件者"
+
+#: filter/filter-rule.c:877
+#, fuzzy
+msgid "Replies and parents"
+msgstr "回覆"
+
+# addressbook/printing/e-contact-print.glade.h:17
+#: filter/filter-rule.c:879
+#, fuzzy
+msgid "Include threads"
+msgstr "包含:"
+
+#: filter/filter-rule.c:974
+msgid "incoming"
+msgstr "內送"
+
+#: filter/filter-rule.c:974
+msgid "outgoing"
+msgstr "外寄"
+
 #. Automatically generated. Do not edit.
 #: filter/libfilter-i18n.h:2
 msgid "Adjust Score"
@@ -14817,7 +15294,7 @@ 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:803
+#: filter/libfilter-i18n.h:37 mail/em-folder-view.c:927
 #: widgets/misc/e-expander.c:189
 msgid "Label"
 msgstr "標籤"
@@ -14862,7 +15339,7 @@ msgstr "離開這個程式"
 msgid "Play Sound"
 msgstr "播放音效"
 
-#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:68
+#: filter/libfilter-i18n.h:46 mail/message-tag-followup.c:79
 msgid "Read"
 msgstr "閱讀"
 
@@ -14939,9 +15416,9 @@ msgstr "停止處理"
 
 # mail/mail-format.c:767
 # mail/message-list.c:1082
-#: filter/libfilter-i18n.h:64 mail/em-format-html.c:1542
-#: mail/em-format-quote.c:301 mail/em-format.c:747 mail/em-mailer-prefs.c:72
-#: mail/message-list.etspec.h:13 mail/message-tag-followup.c:318
+#: 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 "主旨"
@@ -15008,130 +15485,74 @@ msgstr "主旨不包含"
 msgid "Virtual _Folders"
 msgstr "虛擬資料夾"
 
-#: filter/vfolder-rule.c:572
+# addressbook/contact-editor/contact-editor.glade.h:17
+# mail/mail-config.glade.h:84
+#: filter/vfolder-rule.c:493
+msgid "_Add"
+msgstr "新增(_A)"
+
+#: filter/vfolder-rule.c:573
 msgid "VFolder source"
 msgstr "虛擬資料夾來源"
 
-#: mail/GNOME_Evolution_Mail.server.in.in.h:1
-msgid "Composer Preferences"
-msgstr "郵件編輯器偏好設定"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:2
-msgid ""
-"Configure mail preferences, including security and message display, here"
-msgstr "在此設定郵件的偏好設定，包含安全性與訊息的顯示"
-
-#: mail/GNOME_Evolution_Mail.server.in.in.h:3
-msgid "Configure spell-checking, signatures, and the message composer here"
-msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
-
-# ui/evolution-mail.xml.h:19
-#: mail/GNOME_Evolution_Mail.server.in.in.h:4
-msgid "Configure your email accounts here"
-msgstr "在此設定您的郵件帳號"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: mail/GNOME_Evolution_Mail.server.in.in.h:5
-#, fuzzy
-msgid "Evolution Mail"
-msgstr "Evolution"
-
-# mail/mail-account-editor.c:173
-#: mail/GNOME_Evolution_Mail.server.in.in.h:6
-#, fuzzy
-msgid "Evolution Mail accounts configuration control"
-msgstr "Evolution 帳號編輯器"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:7
-#, fuzzy
-msgid "Evolution Mail component"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:8
-#, fuzzy
-msgid "Evolution Mail composer"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/GNOME_Evolution_Mail.server.in.in.h:9
-#, fuzzy
-msgid "Evolution Mail composer configuration control"
-msgstr "Evolution 郵件編輯器。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:4
-#: mail/GNOME_Evolution_Mail.server.in.in.h:10
-#, fuzzy
-msgid "Evolution Mail folder viewer"
-msgstr "Evolution 郵件資料夾顯示元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:3
-#: mail/GNOME_Evolution_Mail.server.in.in.h:11
-#, fuzzy
-msgid "Evolution Mail preferences control"
-msgstr "Evolution 郵件執行摘要元件。"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#: mail/GNOME_Evolution_Mail.server.in.in.h:12 mail/em-folder-browser.c:829
-#: mail/importers/elm-importer.c:418 mail/importers/netscape-importer.c:1872
-#: mail/importers/pine-importer.c:474 mail/mail-component.c:539
-#: mail/mail-component.c:582
-msgid "Mail"
-msgstr "郵件"
-
-# mail/mail-config.glade.h:6
-#: 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:96
-msgid "Mail Preferences"
-msgstr "郵件偏好設定"
-
 # mail/mail-config.glade.h:21
 #. translators: default account indicator
-#: mail/em-account-prefs.c:415
+#: mail/em-account-prefs.c:418
 msgid "[Default]"
 msgstr "[預設值]"
 
 # mail/mail-config.glade.h:5
-#: mail/em-account-prefs.c:469
+#: mail/em-account-prefs.c:472
 msgid "Account name"
 msgstr "帳號名稱"
 
-#: mail/em-account-prefs.c:471
+#: mail/em-account-prefs.c:474
 msgid "Protocol"
 msgstr "通訊協定"
 
 # addressbook/gui/component/addressbook-storage.c:99
-#: mail/em-composer-prefs.c:292 mail/em-composer-prefs.c:411
-#: mail/mail-config.c:1038
+#: mail/em-composer-prefs.c:305 mail/em-composer-prefs.c:424
+#: mail/mail-config.c:1045
 msgid "Unnamed"
 msgstr "未命名的"
 
 # addressbook/gui/widgets/e-addressbook-view.c:732
-#: mail/em-composer-prefs.c:895
+#: mail/em-composer-prefs.c:909
 msgid "Language(s)"
 msgstr "語言"
 
 # mail/mail-config.glade.h:74
-#: mail/em-composer-prefs.c:941
+#: mail/em-composer-prefs.c:955
 #, fuzzy
 msgid "Add signature script"
 msgstr "加入簽名檔(_A)"
 
 # mail/mail-config.glade.h:74
-#: mail/em-composer-prefs.c:961
+#: mail/em-composer-prefs.c:975
 msgid "Signature(s)"
 msgstr "簽名檔"
 
+# mail/mail-ops.c:1154
+#: mail/em-composer-utils.c:888
+#, fuzzy
+msgid "-------- Forwarded Message --------"
+msgstr "轉寄的郵件"
+
+# camel/providers/imap/camel-imap-command.c:241
+# shell/e-storage.c:481
+#: mail/em-composer-utils.c:1499
+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
+#, fuzzy
+msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
+msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
+
 # ui/evolution-mail.xml.h:10
-#: mail/em-folder-browser.c:139
+#: mail/em-folder-browser.c:129
 msgid "Create _Virtual Folder From Search..."
 msgstr "從搜尋建立虛擬資料夾(_V)..."
 
@@ -15180,103 +15601,119 @@ 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:2266
-#: mail/mail-component.c:731
+#: mail/em-folder-selector.c:166 mail/em-folder-tree.c:2282
+#: mail/mail-component.c:701
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:4
 msgid "Specify where to create the folder:"
 msgstr "指定建立資料夾的位置："
 
+# calendar/gui/event-editor-dialog.glade.h:15
+#: mail/em-folder-selector.c:299
+#, fuzzy
+msgid "Create"
+msgstr "克里斯由"
+
 # shell/glade/e-shell-folder-creation-dialog.glade.h:1
 #: mail/em-folder-selector.c:303
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:2
 #, fuzzy
 msgid "Folder _name:"
 msgstr "資料夾名稱:"
 
-# camel/providers/imap/camel-imap-provider.c:48
-# shell/e-shell-view.c:552
-#: mail/em-folder-tree-model.c:196 mail/em-folder-tree-model.c:198
-#: mail/mail-vfolder.c:852
-msgid "VFolders"
-msgstr "虛擬資料夾"
-
-#. UNMATCHED is always last
-#: mail/em-folder-tree-model.c:202 mail/em-folder-tree-model.c:204
-msgid "UNMATCHED"
-msgstr ""
-
-# mail/local-config.glade.h:8
-#. Inbox is always first
-#: mail/em-folder-tree-model.c:208 mail/em-folder-tree-model.c:210
-msgid "Inbox"
-msgstr "收件匣"
-
-# mail/mail-send-recv.c:287
-# mail/mail-send-recv.c:333
-#: mail/em-folder-tree-model.c:465 mail/em-folder-tree-model.c:774
-msgid "Loading..."
-msgstr "載入中..."
-
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:924
+#: mail/em-folder-tree.c:839
 #, fuzzy, c-format
 msgid "Moving folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:926
+#: mail/em-folder-tree.c:841
 #, fuzzy, c-format
 msgid "Copying folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:933
+#: mail/em-folder-tree.c:848 mail/message-list.c:1555
 #, fuzzy, c-format
 msgid "Moving messages into folder %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/em-folder-tree.c:935
+#: mail/em-folder-tree.c:850 mail/message-list.c:1557
 #, fuzzy, c-format
 msgid "Copying messages into folder %s"
 msgstr "將郵件複製到 %s"
 
 # camel/providers/imap/camel-imap-provider.c:45
-#: mail/em-folder-tree.c:951
+#: mail/em-folder-tree.c:866
 #, 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
+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
+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
+#, fuzzy
+msgid "_Move"
+msgstr "移動"
+
+# ui/evolution-mail.xml.h:2
+#: mail/em-folder-tree.c:961 mail/message-list.c:1647
+#, fuzzy
+msgid "Cancel _Drag"
+msgstr "取消工作"
+
 # shell/e-shell-importer.c:601
-#: mail/em-folder-tree.c:2040 mail/em-folder-tree.c:2053
-#: mail/em-folder-view.c:672 mail/em-folder-view.c:686
+#: 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/importers/evolution-mbox-importer.c:119
 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
+#, fuzzy
+msgid "C_opy"
+msgstr "複製"
+
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2080
+#: mail/em-folder-tree.c:2096
 #, fuzzy, c-format
 msgid "Creating folder `%s'"
 msgstr "貯藏資料夾“%s”"
 
 # ui/evolution.xml.h:10
-#: mail/em-folder-tree.c:2266 mail/mail-component.c:731
+#: mail/em-folder-tree.c:2282 mail/mail-component.c:701
 #, fuzzy
 msgid "Create folder"
 msgstr "新增一個資料夾"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/em-folder-tree.c:2458
+#: mail/em-folder-tree.c:2474
 #, 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:2460
+#: mail/em-folder-tree.c:2476
 #, fuzzy
 msgid "Rename Folder"
 msgstr "重新命名資料夾"
@@ -15285,33 +15722,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:2529 ui/evolution-addressbook.xml.h:44
+#: mail/em-folder-tree.c:2545 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
 msgid "_View"
 msgstr "檢視(_V)"
 
 # ui/evolution.xml.h:24
-#: mail/em-folder-tree.c:2530
+#: mail/em-folder-tree.c:2546
 #, fuzzy
 msgid "Open in _New Window"
 msgstr "在新視窗開啟"
 
-# ui/evolution-mail.xml.h:55
-#: mail/em-folder-tree.c:2535
-#, fuzzy
-msgid "_Move"
-msgstr "移動"
-
 # ui/evolution.xml.h:59
 #. FIXME: need to disable for nochildren folders
-#: mail/em-folder-tree.c:2539
+#: mail/em-folder-tree.c:2555
 #, fuzzy
 msgid "_New Folder..."
 msgstr "新增資料夾(_N)"
 
 # ui/evolution.xml.h:61
-#: mail/em-folder-tree.c:2542
+#: mail/em-folder-tree.c:2558
 msgid "_Rename"
 msgstr "重新命名(_R)"
 
@@ -15319,13 +15750,48 @@ 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:2545 ui/evolution-mail-list.xml.h:27
+#: mail/em-folder-tree.c:2561 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
+msgid "VFolders"
+msgstr "虛擬資料夾"
+
+#. UNMATCHED is always last
+#: mail/em-folder-tree-model.c:205 mail/em-folder-tree-model.c:207
+msgid "UNMATCHED"
+msgstr ""
+
+# mail/local-config.glade.h:8
+#. Inbox is always first
+#: mail/em-folder-tree-model.c:211 mail/em-folder-tree-model.c:213
+msgid "Inbox"
+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
+msgid "Loading..."
+msgstr "載入中..."
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: 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
+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:771 mail/em-popup.c:689
+#: mail/em-folder-view.c:895 mail/em-popup.c:689
+#: ui/evolution-mail-message.xml.h:113
 msgid "_Edit as New Message..."
 msgstr "編輯為新郵件(_E)..."
 
@@ -15333,37 +15799,37 @@ msgstr "編輯為新郵件(_E)..."
 # ui/evolution-event-editor.xml.h:69
 # ui/evolution-task-editor-dialog.xml.h:82
 # ui/evolution-tasks.xml.h:7
-#: mail/em-folder-view.c:773
+#: mail/em-folder-view.c:897
 msgid "_Print"
 msgstr "列印(_P)"
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-folder-view.c:776 ui/evolution-mail-message.xml.h:126
+#: mail/em-folder-view.c:900 ui/evolution-mail-message.xml.h:127
 msgid "_Reply to Sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/folder-browser.c:699
 # ui/evolution-mail.xml.h:72
-#: mail/em-folder-view.c:777 mail/em-popup.c:809
+#: mail/em-folder-view.c:901 mail/em-popup.c:810
 #: 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:778 mail/em-popup.c:810
+#: mail/em-folder-view.c:902 mail/em-popup.c:811
 #: ui/evolution-mail-message.xml.h:87
 msgid "Reply to _All"
 msgstr "回覆所有人(_A)"
 
 # mail/folder-browser.c:701
-#: mail/em-folder-view.c:779 mail/em-popup.c:812
-#: ui/evolution-mail-message.xml.h:113
+#: mail/em-folder-view.c:903 mail/em-popup.c:813
+#: ui/evolution-mail-message.xml.h:114
 msgid "_Forward"
 msgstr "轉寄(_F)"
 
-#: mail/em-folder-view.c:782
+#: mail/em-folder-view.c:906
 msgid "Follo_w Up..."
 msgstr "跟隨(_W)..."
 
@@ -15371,485 +15837,471 @@ msgstr "跟隨(_W)..."
 # calendar/gui/calendar-model.c:1180
 # calendar/gui/dialogs/task-editor-dialog.glade.h:6
 # calendar/gui/e-calendar-table.c:421
-#: mail/em-folder-view.c:783
+#: mail/em-folder-view.c:907
 msgid "Fla_g Completed"
 msgstr "標幟已完成(_G)"
 
 # calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
 # ui/evolution-calendar.xml.h:3
-#: mail/em-folder-view.c:784
+#: mail/em-folder-view.c:908
 msgid "Cl_ear Flag"
 msgstr "清除標幟(_E)"
 
 # mail/folder-browser.c:704
-#: mail/em-folder-view.c:787 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 "標示成已閱讀(_K)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:788
+#: mail/em-folder-view.c:912
 msgid "Mark as _Unread"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:789
+#: mail/em-folder-view.c:913
 msgid "Mark as _Important"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:790
+#: mail/em-folder-view.c:914
 msgid "_Mark as Unimportant"
 msgstr "標示成不重要(_M)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:791 ui/evolution-mail-message.xml.h:54
+#: mail/em-folder-view.c:915 ui/evolution-mail-message.xml.h:54
 #, fuzzy
 msgid "Mark as _Junk"
 msgstr "標示成未閱讀(_U)"
 
 # mail/folder-browser.c:706
-#: mail/em-folder-view.c:792 ui/evolution-mail-message.xml.h:55
+#: mail/em-folder-view.c:916 ui/evolution-mail-message.xml.h:55
 #, fuzzy
 msgid "Mark as _Not Junk"
 msgstr "標示成重要(_I)"
 
 # mail/folder-browser.c:717
 # ui/evolution-mail.xml.h:121
-#: mail/em-folder-view.c:796
+#: mail/em-folder-view.c:920
 msgid "U_ndelete"
 msgstr "復原(_N)"
 
 # mail/folder-browser.c:711
-#: mail/em-folder-view.c:799
+#: mail/em-folder-view.c:923
 msgid "Mo_ve to Folder..."
 msgstr "移至資料夾(_V)..."
 
 # mail/folder-browser.c:713
-#: mail/em-folder-view.c:800 ui/evolution-addressbook.xml.h:32
+#: mail/em-folder-view.c:924 ui/evolution-addressbook.xml.h:32
 msgid "_Copy to Folder..."
 msgstr "複製至資料夾(_C)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-folder-view.c:808
+#: mail/em-folder-view.c:932
 msgid "Add Sender to Address_book"
 msgstr "新增寄件者到目錄服務(_B)"
 
 # mail/folder-browser.c:727
-#: mail/em-folder-view.c:811
+#: mail/em-folder-view.c:935
 msgid "Appl_y Filters"
 msgstr "套用過濾器(_Y)"
 
-#: mail/em-folder-view.c:812
+#: mail/em-folder-view.c:936
 #, fuzzy
 msgid "F_ilter Junk"
 msgstr "過濾器規則"
 
 # mail/folder-browser.c:731
-#: mail/em-folder-view.c:815
+#: mail/em-folder-view.c:939
 msgid "Crea_te Rule From Message"
 msgstr "從郵件建立規則(_T)"
 
 # mail/folder-browser.c:653
-#: mail/em-folder-view.c:816
+#: mail/em-folder-view.c:940
 msgid "VFolder on _Subject"
 msgstr "從主旨建立虛擬資料夾(_S)"
 
 # mail/folder-browser.c:656
-#: mail/em-folder-view.c:817
+#: mail/em-folder-view.c:941
 msgid "VFolder on Se_nder"
 msgstr "從寄件者建立虛擬資料夾(_N)"
 
 # mail/folder-browser.c:659
-#: mail/em-folder-view.c:818
+#: mail/em-folder-view.c:942
 msgid "VFolder on _Recipients"
 msgstr "從收件者建立虛擬資料夾(_R)"
 
 # mail/folder-browser.c:662
-#: mail/em-folder-view.c:819
+#: mail/em-folder-view.c:943
 msgid "VFolder on Mailing _List"
 msgstr "從郵件清單建立虛擬資料夾(_L)"
 
-# mail/folder-browser.c:656
-#: mail/em-folder-view.c:821
-#, fuzzy
-msgid "VFolder on Thread"
-msgstr "從寄件者建立虛擬資料夾(_N)"
-
 # mail/folder-browser.c:668
-#: mail/em-folder-view.c:825
+#: mail/em-folder-view.c:947
 msgid "Filter on Sub_ject"
 msgstr "從主旨建立過濾器(_J)"
 
 # mail/folder-browser.c:671
-#: mail/em-folder-view.c:826
+#: mail/em-folder-view.c:948
 msgid "Filter on Sen_der"
 msgstr "從寄件者建立過濾器(_D)"
 
 # mail/folder-browser.c:674
-#: mail/em-folder-view.c:827
+#: mail/em-folder-view.c:949
 msgid "Filter on Re_cipients"
 msgstr "收件者過濾器(_C)"
 
 # mail/folder-browser.c:677
-#: mail/em-folder-view.c:828
+#: mail/em-folder-view.c:950
 msgid "Filter on _Mailing List"
 msgstr "從郵件清單建立過濾器(_M)"
 
-# mail/folder-browser.c:671
-#: mail/em-folder-view.c:830
-#, fuzzy
-msgid "Filter on Thread"
-msgstr "從寄件者建立過濾器(_D)"
-
 # mail/mail-config.glade.h:21
 #. default charset used in mail view
-#: mail/em-folder-view.c:1613 mail/em-folder-view.c:1651
+#: mail/em-folder-view.c:1710 mail/em-folder-view.c:1750
 #: mail/mail-config.glade.h:66
 msgid "Default"
 msgstr "預設值"
 
 # mail/mail-callbacks.c:1407
-#: mail/em-folder-view.c:1687
+#: mail/em-folder-view.c:1800
 msgid "Print Message"
 msgstr "列印郵件"
 
 # ui/evolution-event-editor.xml.h:14
 # ui/evolution-task-editor-dialog.xml.h:15
-#: mail/em-folder-view.c:1950
+#: mail/em-folder-view.c:2076
 #, fuzzy
 msgid "_Copy Link Location"
 msgstr "複製連結位址"
 
 # calendar/gui/e-calendar-table.c:163
-#: mail/em-folder-view.c:2209
+#: mail/em-folder-view.c:2341
 #, fuzzy, c-format
 msgid "Click to mail %s"
 msgstr "請按這裡增加新的工作"
 
-# calendar/gui/e-calendar-table.c:163
-#: mail/em-folder-view.c:2214
-#, fuzzy, c-format
-msgid "Click to open %s"
-msgstr "請按這裡增加新的工作"
+# mail/mail-format.c:756
+# mail/message-list.c:1082
+#: 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/mail-search.c:319
-#. message-search popup match count string
-#: mail/em-format-html-display.c:410
+# mail/mail-format.c:759
+#: 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/mail-format.c:762
+# mail/message-list.c:1083
+#: 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/mail-format.c:765
+#: 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 "副本"
+
+# composer/e-msg-composer-hdrs.c:394
+#: 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 "密件副本"
+
+# 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
+#: 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
+msgid "Newsgroups"
+msgstr ""
+
+# mail/mail-format.c:527
+#: mail/em-format.c:993
+#, c-format
+msgid "%s attachment"
+msgstr "%s 附加檔案"
+
+# mail/mail-format.c:573
+#: 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 ""
+
+# mail/mail-format.c:573
+#: mail/em-format.c:1279
+msgid "Could not parse MIME message. Displaying as source."
+msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+
+#: mail/em-format.c:1298
+#, fuzzy
+msgid "Unsupported signature format"
+msgstr "不支援的基模"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
+
+#: mail/em-format.c:1306
+#, fuzzy
+msgid "Unknown error verifying signature"
+msgstr "驗證 leaf 憑證失敗。"
+
+# mail/mail-ops.c:1498
+#: mail/em-format-html.c:452 mail/em-format-html.c:454
 #, fuzzy, c-format
-msgid "Matches: %d"
-msgstr "符合的資料:"
+msgid "Retrieving `%s'"
+msgstr "取回郵件 %s"
 
 # calendar/gui/calendar-model.c:1578
-#: mail/em-format-html-display.c:646 mail/em-format-html.c:569
+#: mail/em-format-html.c:559 mail/em-format-html-display.c:644
 #, fuzzy
 msgid "Unsigned"
 msgstr "已指定"
 
-# mail/mail-format.c:1161
-#: mail/em-format-html-display.c:646
-#, fuzzy
-msgid ""
-"This message is not signed. There is no guarantee that this message is "
-"authentic."
-msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
-
 # mail/mail-config.glade.h:74
-#: mail/em-format-html-display.c:647 mail/em-format-html.c:570
+#: mail/em-format-html.c:560 mail/em-format-html-display.c:645
 #, fuzzy
 msgid "Valid signature"
 msgstr "儲存簽名檔"
 
-# mail/mail-format.c:1161
-#: mail/em-format-html-display.c:647
-#, fuzzy
-msgid ""
-"This message is signed and is valid meaning that it is very likely that this "
-"message is authentic."
-msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
-
 # mail/mail-config.glade.h:74
-#: mail/em-format-html-display.c:648 mail/em-format-html.c:571
+#: mail/em-format-html.c:561 mail/em-format-html-display.c:646
 #, fuzzy
 msgid "Invalid signature"
 msgstr "儲存簽名檔"
 
-#: mail/em-format-html-display.c:648
-msgid ""
-"The signature of this message cannot be verified, it may have been altered "
-"in transit."
-msgstr ""
-
-#: mail/em-format-html-display.c:649 mail/em-format-html.c:572
-msgid "Valid signature, cannot verify sender"
+#: mail/em-format-html.c:562
+msgid "Valid signature but cannot verify sender"
 msgstr ""
 
-#: mail/em-format-html-display.c:649
-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:655 mail/em-format-html.c:578
+#: mail/em-format-html.c:568 mail/em-format-html-display.c:653
 #, fuzzy
 msgid "Unencrypted"
 msgstr "已中斷"
 
-#: mail/em-format-html-display.c:655
-msgid ""
-"This message is not encrypted.  Its content may be viewed in transit across "
-"The Internet."
-msgstr ""
-
-#: mail/em-format-html-display.c:656 mail/em-format-html.c:579
+#: mail/em-format-html.c:569 mail/em-format-html-display.c:654
 msgid "Encrypted, weak"
 msgstr ""
 
-#: mail/em-format-html-display.c:656
-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 ""
-
 # ui/evolution-message-composer.xml.h:13
-#: mail/em-format-html-display.c:657 mail/em-format-html.c:580
+#: mail/em-format-html.c:570 mail/em-format-html-display.c:655
 #, fuzzy
 msgid "Encrypted"
 msgstr "PGP 加密"
 
-#: mail/em-format-html-display.c:657
-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:658 mail/em-format-html.c:581
+#: mail/em-format-html.c:571 mail/em-format-html-display.c:656
 msgid "Encrypted, strong"
 msgstr ""
 
-#: mail/em-format-html-display.c:658
-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:755
-#, fuzzy
-msgid "_View Certificate"
-msgstr "憑證 ID(_C):"
-
-#: mail/em-format-html-display.c:770
-#, fuzzy
-msgid "This certificate is not viewable"
-msgstr "憑證尚未生效"
-
-# mail/message-list.c:977
-#: mail/em-format-html-display.c:1002
-#, fuzzy
-msgid "Completed on %B %d, %Y, %l:%M %p"
-msgstr "by %B %d, %Y, %l:%M %P"
-
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
-#: mail/em-format-html-display.c:1010
-msgid "Overdue:"
-msgstr "逾期:"
-
-# mail/message-list.c:977
-#: mail/em-format-html-display.c:1013
-#, fuzzy
-msgid "by %B %d, %Y, %l:%M %p"
-msgstr "by %B %d, %Y, %l:%M %P"
-
-# mail/mail-display.c:301
-#: mail/em-format-html-display.c:1083
-#, fuzzy
-msgid "_View Inline"
-msgstr "檢視行內"
-
-# mail/mail-display.c:363
-#: mail/em-format-html-display.c:1084
-#, fuzzy
-msgid "_Hide"
-msgstr "隱藏"
-
-# camel/camel-filter-driver.c:748
-#: mail/em-format-html-print.c:125
-#, c-format
-msgid "Page %d of %d"
-msgstr "第 %d / %d 頁"
-
-# mail/mail-ops.c:1498
-#: mail/em-format-html.c:462 mail/em-format-html.c:464
-#, fuzzy, c-format
-msgid "Retrieving `%s'"
-msgstr "取回郵件 %s"
-
 # mail/mail-format.c:1842
-#: mail/em-format-html.c:843
+#: mail/em-format-html.c:820
 msgid "Malformed external-body part."
 msgstr "格式不良的外加本文部分。"
 
 # mail/mail-format.c:1787
-#: mail/em-format-html.c:873
+#: mail/em-format-html.c:850
 #, c-format
 msgid "Pointer to FTP site (%s)"
 msgstr "FTP 站指示 (%s)"
 
 # mail/mail-format.c:1799
-#: mail/em-format-html.c:884
+#: mail/em-format-html.c:861
 #, c-format
 msgid "Pointer to local file (%s) valid at site \"%s\""
 msgstr "本地端檔案 (%s) 於 “%s”有效的指示"
 
 # mail/mail-format.c:1803
-#: mail/em-format-html.c:886
+#: mail/em-format-html.c:863
 #, c-format
 msgid "Pointer to local file (%s)"
 msgstr "本地檔案指示 (%s)"
 
-#: mail/em-format-html.c:907
+#: mail/em-format-html.c:884
 #, c-format
 msgid "Pointer to remote data (%s)"
 msgstr "遠端資料指示 (%s)"
 
 # mail/mail-format.c:1837
-#: mail/em-format-html.c:918
+#: mail/em-format-html.c:895
 #, c-format
 msgid "Pointer to unknown external data (\"%s\" type)"
 msgstr "不明的外部檔案指示 (“%s”類型)"
 
 # mail/mail-ops.c:898
-#: mail/em-format-html.c:1160
+#: mail/em-format-html.c:1137
 #, fuzzy
 msgid "Formatting message"
 msgstr "移動郵件"
 
-# mail/mail-format.c:756
-# mail/message-list.c:1082
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:742
-#: mail/em-mailer-prefs.c:67 mail/message-list.etspec.h:7
-#: mail/message-tag-followup.c:314
-msgid "From"
-msgstr "寄件者"
-
-# mail/mail-format.c:759
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:743
-#: mail/em-mailer-prefs.c:68
-msgid "Reply-To"
-msgstr "回覆"
-
-# mail/mail-format.c:762
-# mail/message-list.c:1083
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:744
-#: mail/em-mailer-prefs.c:69 mail/message-list.etspec.h:14
-msgid "To"
-msgstr "收件者"
-
-# mail/mail-format.c:765
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:745
-#: mail/em-mailer-prefs.c:70
-msgid "Cc"
-msgstr "副本"
-
-# composer/e-msg-composer-hdrs.c:394
-#: mail/em-format-html.c:1436 mail/em-format-quote.c:191 mail/em-format.c:746
-#: mail/em-mailer-prefs.c:71
-msgid "Bcc"
-msgstr "密件副本"
-
 # addressbook/backend/ebook/e-card.c:3428
 #. pseudo-header
-#: mail/em-format-html.c:1546 mail/em-format-quote.c:308
-#: mail/em-mailer-prefs.c:918
+#: 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:1573
+#: mail/em-format-html.c:1550
 msgid "<I> (%a, %R %Z)</I>"
 msgstr ""
 
 #. translators: strftime format for local time equivalent in Date header display, without day
-#: mail/em-format-html.c:1576
+#: mail/em-format-html.c:1553
 msgid "<I> (%R %Z)</I>"
 msgstr ""
 
-# mail/mail-format.c:640
-# mail/message-list.c:1082
-#: mail/em-format-html.c:1586 mail/em-format-quote.c:315 mail/em-format.c:748
-#: mail/em-mailer-prefs.c:73 mail/message-list.etspec.h:2
-msgid "Date"
-msgstr "日期"
+# mail/mail-search.c:319
+#. message-search popup match count string
+#: mail/em-format-html-display.c:410
+#, fuzzy, c-format
+msgid "Matches: %d"
+msgstr "符合的資料:"
 
-#: mail/em-format-html.c:1607 mail/em-format.c:749 mail/em-mailer-prefs.c:74
-msgid "Newsgroups"
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:644
+#, fuzzy
+msgid ""
+"This message is not signed. There is no guarantee that this message is "
+"authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
+# mail/mail-format.c:1161
+#: mail/em-format-html-display.c:645
+#, fuzzy
+msgid ""
+"This message is signed and is valid meaning that it is very likely that this "
+"message is authentic."
+msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
+
+#: mail/em-format-html-display.c:646
+msgid ""
+"The signature of this message cannot be verified, it may have been altered "
+"in transit."
 msgstr ""
 
-# mail/mail-format.c:527
-#: mail/em-format.c:986
-#, c-format
-msgid "%s attachment"
-msgstr "%s 附加檔案"
+#: mail/em-format-html-display.c:647
+msgid "Valid signature, cannot verify sender"
+msgstr ""
 
-# mail/mail-format.c:573
-#: mail/em-format.c:1065 mail/em-format.c:1184
-#, fuzzy
-msgid "Could not parse S/MIME message: Unknown error"
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+#: 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."
+msgstr ""
 
-#: mail/em-format.c:1174
-msgid "Unsupported encryption type for multipart/encrypted"
+#: mail/em-format-html-display.c:653
+msgid ""
+"This message is not encrypted.  Its content may be viewed in transit across "
+"The Internet."
 msgstr ""
 
-# mail/mail-format.c:573
-#: mail/em-format.c:1320
-msgid "Could not parse MIME message. Displaying as source."
-msgstr "無法解析 MIME 格式的郵件。只好顯示原始檔。"
+#: 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."
+msgstr ""
 
-#: mail/em-format.c:1339
+#: 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 ""
+
+#: 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 ""
+
+#: mail/em-format-html-display.c:757
 #, fuzzy
-msgid "Unsupported signature format"
-msgstr "不支援的基模"
+msgid "_View Certificate"
+msgstr "憑證 ID(_C):"
 
-#: mail/em-format.c:1347
+#: mail/em-format-html-display.c:772
 #, fuzzy
-msgid "Error verifying signature"
-msgstr "驗證 leaf 憑證失敗。"
+msgid "This certificate is not viewable"
+msgstr "憑證尚未生效"
 
-#: mail/em-format.c:1347
+# mail/message-list.c:977
+#: mail/em-format-html-display.c:1007
 #, fuzzy
-msgid "Unknown error verifying signature"
-msgstr "驗證 leaf 憑證失敗。"
+msgid "Completed on %B %d, %Y, %l:%M %p"
+msgstr "by %B %d, %Y, %l:%M %P"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:31
+#: mail/em-format-html-display.c:1015
+msgid "Overdue:"
+msgstr "逾期:"
 
-#: mail/em-junk-filter.c:82
+# mail/message-list.c:977
+#: mail/em-format-html-display.c:1018
+#, fuzzy
+msgid "by %B %d, %Y, %l:%M %p"
+msgstr "by %B %d, %Y, %l:%M %P"
+
+# mail/mail-display.c:301
+#: mail/em-format-html-display.c:1088
+#, fuzzy
+msgid "_View Inline"
+msgstr "檢視行內"
+
+# mail/mail-display.c:363
+#: mail/em-format-html-display.c:1089
+#, fuzzy
+msgid "_Hide"
+msgstr "隱藏"
+
+# camel/camel-filter-driver.c:748
+#: mail/em-format-html-print.c:126
+#, c-format
+msgid "Page %d of %d"
+msgstr "第 %d / %d 頁"
+
+#: mail/em-junk-filter.c:86
 msgid "Spamassassin (built-in)"
 msgstr ""
 
 # calendar/gui/event-editor-dialog.glade.h:10
-#: mail/em-mailer-prefs.c:85
+#: mail/em-mailer-prefs.c:100
 #, fuzzy
 msgid "Every time"
 msgstr "每"
 
 # calendar/gui/event-editor.c:1545
-#: mail/em-mailer-prefs.c:86
+#: mail/em-mailer-prefs.c:101
 #, fuzzy
 msgid "Once per day"
 msgstr "一天(_O)"
 
 # calendar/gui/event-editor.c:1550
-#: mail/em-mailer-prefs.c:87
+#: mail/em-mailer-prefs.c:102
 #, fuzzy
 msgid "Once per week"
 msgstr "一週(_E)"
 
-#: mail/em-mailer-prefs.c:88
+#: mail/em-mailer-prefs.c:103
 #, fuzzy
 msgid "Once per month"
 msgstr "一個月(_H)"
 
-#: mail/em-migrate.c:1078
+#: mail/em-migrate.c:1072
 msgid ""
 "The location and hierarchy of the Evolution mailbox folders has changed "
 "since Evolution 1.x.\n"
@@ -15857,34 +16309,68 @@ msgid ""
 "Please be patient while Evolution migrates your folders..."
 msgstr ""
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:1933 mail/em-migrate.c:1948
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#: mail/em-migrate.c:1506
 #, fuzzy, c-format
-msgid "Failed to migrate pop3 uid caches: %s"
-msgstr "快取 %s 失敗： %s"
+msgid "Unable to create new folder `%s': %s"
+msgstr "不能取得資料夾：%s：%s"
 
-# camel/camel-filter-driver.c:670
-# camel/camel-filter-driver.c:679
-#: mail/em-migrate.c:2036 mail/em-migrate.c:2137
+# mail/mail-ops.c:1728
+#: mail/em-migrate.c:1532
 #, fuzzy, c-format
-msgid "Failed to migrate folder expand state: %s"
-msgstr "快取 %s 失敗： %s"
+msgid "Unable to copy folder `%s' to `%s': %s"
+msgstr ""
+"無法複製檔案描述項： %s\n"
+"%s"
+
+# mail/mail-ops.c:1728
+#: mail/em-migrate.c:1715
+#, fuzzy, c-format
+msgid "Unable to scan for existing mailboxes at `%s': %s"
+msgstr ""
+"無法建立輸出檔案：%s\n"
+" %s"
+
+# camel/providers/pop3/camel-pop3-store.c:199
+#: mail/em-migrate.c:1919
+#, 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:2338 mail/em-migrate.c:2512
+#: mail/em-migrate.c:1933
 #, fuzzy, c-format
-msgid "Failed to create directory `%s': %s"
+msgid "Unable to create POP3 keep-on-server data directory `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
+#: mail/em-migrate.c:1962
+#, 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:2350
+#: mail/em-migrate.c:2317 mail/em-migrate.c:2329
 #, fuzzy, c-format
-msgid "Failed to open store for `%s': %s"
+msgid "Failed to create local mail storage `%s': %s"
 msgstr "建立到“%s”的導管失敗： %s"
 
+# mail/mail-ops.c:1728
+#: mail/em-migrate.c:2480
+#, fuzzy, c-format
+msgid "Unable to create local mail folders at `%s': %s"
+msgstr ""
+"無法建立輸出檔案：%s\n"
+" %s"
+
+#: mail/em-migrate.c:2498
+msgid ""
+"Unable to read settings from previous Evolution install, `evolution/config."
+"xmldb' does not exist or is corrupt."
+msgstr ""
+
 # widgets/misc/e-filter-bar.h:94
 # widgets/misc/e-filter-bar.h:101
 #: mail/em-popup.c:699
@@ -15897,118 +16383,99 @@ msgstr "另存新檔..."
 msgid "untitled_image.%s"
 msgstr "未命名的郵件"
 
-#: mail/em-popup.c:806
+#: mail/em-popup.c:807
 msgid "Set as _Background"
 msgstr ""
 
 # mail/folder-browser.c:697
 # ui/evolution-mail.xml.h:117
-#: mail/em-popup.c:808
+#: mail/em-popup.c:809
 #, fuzzy
 msgid "_Reply to sender"
 msgstr "回覆寄件者(_R)"
 
 # mail/mail-display.c:1256
-#: mail/em-popup.c:856
+#: mail/em-popup.c:858
 #, fuzzy
 msgid "_Open Link in Browser"
 msgstr "在瀏覽器內開啟連結"
 
 # ui/evolution-contact-editor.xml.h:13
-#: mail/em-popup.c:857
+#: mail/em-popup.c:859
 #, fuzzy
 msgid "Se_nd message to..."
 msgstr "傳送郵件給清單(_M)..."
 
 # addressbook/gui/component/addressbook-config.c:662
-#: mail/em-popup.c:858
+#: mail/em-popup.c:860
 #, fuzzy
 msgid "_Add to Addressbook"
 msgstr "新增寄件者到目錄服務"
 
 # mail/mail-display.c:299
-#: mail/em-popup.c:964
+#: mail/em-popup.c:966
 #, c-format
 msgid "Open in %s..."
 msgstr "在 %s 內開啟..."
 
-#: mail/em-subscribe-editor.c:604
+#: mail/em-subscribe-editor.c:606
 #, fuzzy
 msgid "This store does not support subscriptions, or they are not enabled."
 msgstr "這個伺服器不支援 LDAPv3 模式的資訊"
 
 # ui/evolution-subscribe.xml.h:8
-#: mail/em-subscribe-editor.c:633
+#: mail/em-subscribe-editor.c:635
 #, fuzzy
 msgid "Subscribed"
 msgstr "訂閱"
 
 # mail/subscribe-dialog.c:76
 # shell/e-storage-set-view.c:48
-#: mail/em-subscribe-editor.c:637 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 "資料夾"
 
 #. FIXME: This is just to get the shadow, is there a better way?
-#: mail/em-subscribe-editor.c:850
+#: mail/em-subscribe-editor.c:852
 msgid "Please select a server."
 msgstr "請選擇一個伺服器。"
 
-#: mail/em-subscribe-editor.c:871
+#: mail/em-subscribe-editor.c:873
 msgid "No server has been selected"
 msgstr "尚未選擇伺服器"
 
 # widgets/misc/e-messagebox.c:224
-#: mail/em-utils.c:95
+#: mail/em-utils.c:102
 msgid "Don't show this message again."
 msgstr "不要再顯示這個訊息。"
 
 # importers/netscape-importer.c:795
 # mail/mail-callbacks.c:1359
-#: mail/em-utils.c:285
+#: mail/em-utils.c:292
 msgid "Filters"
 msgstr "過濾器"
 
-# mail/mail-ops.c:1154
-#: mail/em-utils.c:530
-#, fuzzy
-msgid "-------- Forwarded Message --------"
-msgstr "轉寄的郵件"
-
-# camel/providers/imap/camel-imap-command.c:241
-# shell/e-storage.c:481
-#: mail/em-utils.c:1137
-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-utils.c:1147
-#, fuzzy
-msgid "On %a, %Y-%m-%d at %H:%M %%+05d, %%s wrote:"
-msgstr "在 %a, %Y-%m-%d %H:%M, %%s 寫道："
-
 # widgets/misc/e-messagebox.c:180
-#: mail/em-utils.c:1476
+#: mail/em-utils.c:406
 #, fuzzy
 msgid "message"
 msgstr "訊息"
 
 # mail/mail-callbacks.c:1188
-#: mail/em-utils.c:1579
+#: mail/em-utils.c:509
 #, fuzzy
 msgid "Save Message..."
 msgstr "另存郵件..."
 
 # addressbook/backend/ebook/e-card.c:3346
-#: mail/em-utils.c:1628
+#: mail/em-utils.c:558
 #, fuzzy
 msgid "Add address"
 msgstr "地址"
 
 # mail/mail-autofilter.c:229
 #. Drop filename for messages from a mailbox
-#: mail/em-utils.c:2063
+#: mail/em-utils.c:1016
 #, fuzzy, c-format
 msgid "Messages from %s"
 msgstr "郵件來自 %s "
@@ -16030,11 +16497,11 @@ msgid "Check incoming mail being junk"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:4
-msgid "Citation highlight colour"
+msgid "Citation highlight color"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:5
-msgid "Citation highlight colour."
+msgid "Citation highlight color."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:6
@@ -16156,136 +16623,146 @@ msgid "Last time empty trash was run"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:29
-msgid "List of Labels and their associated colours"
+msgid "List of Labels and their associated colors"
 msgstr ""
 
 # mail/mail-config.glade.h:6
 #: mail/evolution-mail.schemas.in.in.h:30
 #, fuzzy
-msgid "List of accounts"
+msgid "List of accepted licenses"
 msgstr "郵件帳號"
 
+# mail/mail-config.glade.h:6
 #: mail/evolution-mail.schemas.in.in.h:31
+#, fuzzy
+msgid "List of accounts"
+msgstr "郵件帳號"
+
+#: 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/evolution-mail.schemas.in.in.h:32
+#: mail/evolution-mail.schemas.in.in.h:33
 msgid "List of custom headers and whether they are enabled."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:33
+#: 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:colour where colour uses the HTML hex encoding."
+"strings containing name:color where color uses the HTML hex encoding."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:34
+#: mail/evolution-mail.schemas.in.in.h:35
 msgid "List of mime types to check for bonobo component viewers"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:35
+#: mail/evolution-mail.schemas.in.in.h:36
+msgid "List of protocol names whose license has been accepted."
+msgstr ""
+
+#: mail/evolution-mail.schemas.in.in.h:37
 msgid "Load images for HTML messages over http"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:36
+#: 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/evolution-mail.schemas.in.in.h:37
+#: mail/evolution-mail.schemas.in.in.h:39
 #, fuzzy
 msgid "Log filter actions"
 msgstr "執行動作"
 
-#: mail/evolution-mail.schemas.in.in.h:38
+#: mail/evolution-mail.schemas.in.in.h:40
 msgid "Log filter actions to the specified log file."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:39
+#: mail/evolution-mail.schemas.in.in.h:41
 msgid "Logfile to log filter actions"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:40
+#: mail/evolution-mail.schemas.in.in.h:42
 msgid "Logfile to log filter actions."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:41
+#: mail/evolution-mail.schemas.in.in.h:43
 msgid "Mark as Seen after specified timeout"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:42
+#: mail/evolution-mail.schemas.in.in.h:44
 msgid "Mark as Seen after specified timeout."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:43
+#: mail/evolution-mail.schemas.in.in.h:45
 msgid "Mark citations in the message \"Preview\""
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:44
+#: mail/evolution-mail.schemas.in.in.h:46
 msgid "Mark citations in the message \"Preview\"."
 msgstr ""
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: mail/evolution-mail.schemas.in.in.h:45
+#: mail/evolution-mail.schemas.in.in.h:47
 #, fuzzy
 msgid "Message Window default height"
 msgstr "預設優先順序:"
 
-#: mail/evolution-mail.schemas.in.in.h:46
+#: mail/evolution-mail.schemas.in.in.h:48
 msgid "Message Window default width"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:47
+#: mail/evolution-mail.schemas.in.in.h:49
 msgid "Message-display style (normal, full headers, source)"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:48
+#: mail/evolution-mail.schemas.in.in.h:50
 msgid "Minimum days between emptying the trash on exit"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:49
+#: mail/evolution-mail.schemas.in.in.h:51
 msgid "Minimum time between emptying the trash on exit, in days."
 msgstr ""
 
 # mail/mail-config.glade.h:40
-#: mail/evolution-mail.schemas.in.in.h:50
+#: mail/evolution-mail.schemas.in.in.h:52
 #, fuzzy
 msgid "New Mail Notify sound file"
 msgstr "新郵件通知"
 
 # mail/mail-config.glade.h:40
-#: mail/evolution-mail.schemas.in.in.h:51
+#: mail/evolution-mail.schemas.in.in.h:53
 #, fuzzy
 msgid "New Mail Notify type"
 msgstr "新郵件通知"
 
-#: mail/evolution-mail.schemas.in.in.h:52
+#: mail/evolution-mail.schemas.in.in.h:54
 msgid "Prompt on empty subject"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:53
+#: mail/evolution-mail.schemas.in.in.h:55
 msgid "Prompt the user when he or she tries to expunge a folder."
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:54
+#: 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/evolution-mail.schemas.in.in.h:55
+#: mail/evolution-mail.schemas.in.in.h:57
 msgid "Prompt when user expunges"
 msgstr ""
 
-#: mail/evolution-mail.schemas.in.in.h:56
+#: mail/evolution-mail.schemas.in.in.h:58
 msgid "Prompt when user only fills Bcc"
 msgstr ""
 
 # ui/evolution-mail.xml.h:14
-#: mail/evolution-mail.schemas.in.in.h:57
+#: 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 "
@@ -16293,33 +16770,25 @@ msgid ""
 msgstr "當傳送 HTML 郵件給不想收到 HTML 郵件的連絡人時顯示提示(_P)"
 
 # ui/evolution-mail.xml.h:14
-#: mail/evolution-mail.schemas.in.in.h:58
+#: 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 "當傳送的郵件只有指定密件副本收件者時顯示提示(_O)"
 
-#: mail/evolution-mail.schemas.in.in.h:59
-msgid "Prompt when user tries to send unwanted HTML"
-msgstr ""
-
-#: mail/evolution-mail.schemas.in.in.h:60
-msgid "Recognize links in text and replace them."
-msgstr ""
-
 #: mail/evolution-mail.schemas.in.in.h:61
-msgid "Recognize smileys in text and replace them with images."
+msgid "Prompt when user tries to send unwanted HTML"
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:62
-msgid "Run junk test on incoming mail"
+msgid "Recognize links in text and replace them."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:63
-msgid "S3kr3t 0pt10n"
+msgid "Recognize smileys in text and replace them with images."
 msgstr ""
 
 #: mail/evolution-mail.schemas.in.in.h:64
-msgid "S3kr3t 0pt10n."
+msgid "Run junk test on incoming mail"
 msgstr ""
 
 # addressbook/gui/component/select-names/e-select-names-popup.c:200
@@ -16380,9 +16849,11 @@ msgstr ""
 msgid "Spell check inline"
 msgstr "拼字檢查(_C)"
 
+# calendar/gui/dialogs/task-editor-dialog.glade.h:26
 #: mail/evolution-mail.schemas.in.in.h:76
-msgid "Subscribe dialog default hight"
-msgstr ""
+#, fuzzy
+msgid "Subscribe dialog default height"
+msgstr "預設優先順序:"
 
 #: mail/evolution-mail.schemas.in.in.h:77
 msgid "Subscribe dialog default width"
@@ -16535,41 +17006,81 @@ msgstr ""
 msgid "spamd port"
 msgstr "匯入"
 
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#: mail/GNOME_Evolution_Mail.server.in.in.h:1
+msgid "*Control*F1"
+msgstr ""
+
+#: 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/GNOME_Evolution_Mail.server.in.in.h:4
+msgid "Configure spell-checking, signatures, and the message composer here"
+msgstr "在此設定拼字檢查、簽名檔與郵件編輯器"
+
+# ui/evolution-mail.xml.h:19
+#: mail/GNOME_Evolution_Mail.server.in.in.h:5
+msgid "Configure your email accounts here"
+msgstr "在此設定您的郵件帳號"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: mail/GNOME_Evolution_Mail.server.in.in.h:6
 #, fuzzy
-msgid "Evolution Elm importer"
-msgstr "Evolution 郵件編輯器。"
+msgid "Evolution Mail"
+msgstr "Evolution"
+
+# mail/mail-account-editor.c:173
+#: mail/GNOME_Evolution_Mail.server.in.in.h:7
+#, fuzzy
+msgid "Evolution Mail accounts configuration control"
+msgstr "Evolution 帳號編輯器"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#: mail/GNOME_Evolution_Mail.server.in.in.h:8
 #, fuzzy
-msgid "Evolution Netscape Mail importer"
+msgid "Evolution Mail component"
 msgstr "Evolution 郵件編輯器。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
-msgid "Evolution Outlook Express 4 importer"
-msgstr ""
-
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#: mail/GNOME_Evolution_Mail.server.in.in.h:9
 #, fuzzy
-msgid "Evolution Pine importer"
+msgid "Evolution Mail composer"
 msgstr "Evolution 郵件編輯器。"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#: mail/GNOME_Evolution_Mail.server.in.in.h:10
 #, fuzzy
-msgid "Evolution mbox importer"
+msgid "Evolution Mail composer configuration control"
 msgstr "Evolution 郵件編輯器。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
-msgid "MBox (mbox)"
-msgstr ""
+# mail/GNOME_Evolution_Mail.oaf.in.h:3
+#: mail/GNOME_Evolution_Mail.server.in.in.h:11
+#, fuzzy
+msgid "Evolution Mail preferences control"
+msgstr "Evolution 郵件執行摘要元件。"
 
-#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
-msgid "Outlook Express 4 (.mbx)"
-msgstr ""
+# mail/mail-config.glade.h:6
+#: 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:96
+msgid "Mail Preferences"
+msgstr "郵件偏好設定"
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: mail/GNOME_Evolution_Mail.server.in.in.h:15
+msgid "_Mail"
+msgstr "郵件(_M)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:1
 #: mail/importers/elm-importer.c:88
@@ -16579,15 +17090,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:225
-#: mail/importers/netscape-importer.c:1221 mail/importers/pine-importer.c:117
+#: mail/importers/evolution-outlook-importer.c:226
+#: 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:227
-#: mail/importers/netscape-importer.c:1223 mail/importers/pine-importer.c:119
+#: mail/importers/evolution-outlook-importer.c:228
+#: mail/importers/netscape-importer.c:1253 mail/importers/pine-importer.c:119
 msgid "Please wait"
 msgstr "請稍候"
 
@@ -16624,21 +17135,57 @@ msgstr "選擇匯入服務"
 
 # shell/e-shell-importer.c:363
 #: mail/importers/evolution-mbox-importer.c:219
-#: mail/importers/evolution-outlook-importer.c:224
-#: mail/importers/mail-importer.c:220
+#: mail/importers/evolution-outlook-importer.c:225
+#: 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:271
-#: mail/importers/mail-importer.c:134
+#: mail/importers/evolution-outlook-importer.c:272
+#: mail/importers/mail-importer.c:140
 #, fuzzy
 msgid "Importing mailbox"
 msgstr "匯入檔案中"
 
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Elm importer"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Netscape Mail importer"
+msgstr "Evolution 郵件編輯器。"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:3
+msgid "Evolution Outlook Express 4 importer"
+msgstr ""
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:4
+#, fuzzy
+msgid "Evolution Pine importer"
+msgstr "Evolution 郵件編輯器。"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:5
+#, fuzzy
+msgid "Evolution mbox importer"
+msgstr "Evolution 郵件編輯器。"
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:6
+msgid "MBox (mbox)"
+msgstr ""
+
+#: mail/importers/GNOME_Evolution_Mail_Importers.server.in.in.h:7
+msgid "Outlook Express 4 (.mbx)"
+msgstr ""
+
 # mail/mail-ops.c:599
-#: mail/importers/mail-importer.c:354
+#: mail/importers/mail-importer.c:360
 #, c-format
 msgid "Scanning %s"
 msgstr "掃描 %s"
@@ -16649,7 +17196,7 @@ msgstr "掃描 %s"
 msgid "Priority Filter \"%s\""
 msgstr "優先順序過濾器“%s”"
 
-#: mail/importers/netscape-importer.c:651
+#: 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"
@@ -16675,7 +17222,7 @@ msgstr ""
 "代替優先權。請檢查匯入的過濾器以確定一切仍然\n"
 "照您想要的方式運作。"
 
-#: mail/importers/netscape-importer.c:675
+#: mail/importers/netscape-importer.c:686
 msgid ""
 "Some of your Netscape email filters use\n"
 "the \"Ignore Thread\" or \"Watch Thread\"\n"
@@ -16687,7 +17234,7 @@ msgstr ""
 "功能，而 Evolution 並不支援它。\n"
 "這些過濾器則會被丟棄。"
 
-#: mail/importers/netscape-importer.c:692
+#: 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"
@@ -16701,27 +17248,27 @@ msgstr ""
 "會被修改成測試郵件的內文是否包含\n"
 "該字串。"
 
-#: mail/importers/netscape-importer.c:1220
+#: mail/importers/netscape-importer.c:1250
 msgid "Evolution is importing your old Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
-#: mail/importers/netscape-importer.c:1677
+#: mail/importers/netscape-importer.c:1707
 #, fuzzy
 msgid "Importing Netscape data"
 msgstr "Evolution 正在匯入您舊有的 Netscape 資料"
 
 # importers/netscape-importer.c:790
 # importers/pine-importer.c:656
-#: mail/importers/netscape-importer.c:1877
+#: mail/importers/netscape-importer.c:1907
 msgid "Settings"
 msgstr "設定"
 
-#: mail/importers/netscape-importer.c:1882
+#: mail/importers/netscape-importer.c:1912
 msgid "Mail Filters"
 msgstr "郵件規則"
 
 # importers/netscape-importer.c:847
-#: mail/importers/netscape-importer.c:1903
+#: mail/importers/netscape-importer.c:1933
 msgid ""
 "Evolution has found Netscape mail files.\n"
 "Would you like them to be imported into Evolution?"
@@ -16766,153 +17313,165 @@ msgstr "Pine"
 
 # mail/mail-account-editor.c:173
 #. give our dialog an OK button and title
-#: mail/mail-account-editor.c:153
+#: mail/mail-account-editor.c:155
 msgid "Evolution Account Editor"
 msgstr "Evolution 帳號編輯器"
 
+#: mail/mail-account-gui.c:246
+#, c-format
+msgid ""
+"\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-account-gui.c:252
+#, c-format
+msgid "%s License Agreement"
+msgstr ""
+
 # addressbook/gui/component/addressbook-config.c:401
 # mail/mail-config.glade.h:33
-#: mail/mail-account-gui.c:946 mail/mail-config.glade.h:165
+#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:165
 msgid "_Host:"
 msgstr "主機(_H):"
 
 # mail/mail-config.glade.h:80
-#: mail/mail-account-gui.c:950 mail/mail-config.glade.h:149
+#: mail/mail-account-gui.c:958 mail/mail-config.glade.h:149
 msgid "User_name:"
 msgstr "使用者名稱(_N):"
 
 # addressbook/gui/component/addressbook-config.c:520
 # mail/mail-config.glade.h:53
-#: mail/mail-account-gui.c:954 mail/mail-config.glade.h:172
+#: mail/mail-account-gui.c:962 mail/mail-config.glade.h:172
 msgid "_Path:"
 msgstr "路徑(_P):"
 
 # mail/mail-autofilter.c:70
-#: mail/mail-autofilter.c:75
+#: mail/mail-autofilter.c:74
 #, c-format
 msgid "Mail to %s"
 msgstr "郵件送到 %s"
 
 # mail/mail-autofilter.c:213
-#: mail/mail-autofilter.c:261
+#: mail/mail-autofilter.c:238
 #, c-format
 msgid "Subject is %s"
 msgstr "主旨是 %s"
 
 # mail/mail-autofilter.c:229
-#: mail/mail-autofilter.c:277
+#: mail/mail-autofilter.c:254
 #, c-format
 msgid "Mail from %s"
 msgstr "郵件來自 %s "
 
 # mail/mail-autofilter.c:285
-#: mail/mail-autofilter.c:294
+#: mail/mail-autofilter.c:271
 #, c-format
 msgid "%s mailing list"
 msgstr "%s 郵件列表"
 
-#: mail/mail-autofilter.c:318
-#, fuzzy, c-format
-msgid "Replies to %s"
-msgstr "回覆"
-
 # mail/mail-autofilter.c:335
 # mail/mail-autofilter.c:356
-#: mail/mail-autofilter.c:373
+#: mail/mail-autofilter.c:326
 msgid "Add Filter Rule"
 msgstr "新增過濾器規則"
 
-#: mail/mail-component.c:492
+#: mail/mail-component.c:461
 #, fuzzy, c-format
 msgid "%d deleted"
 msgstr "%d 已選擇"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:494
+#: mail/mail-component.c:463
 #, fuzzy, c-format
 msgid "%d junk"
 msgstr "%d 未傳送"
 
 # mail/mail-config.glade.h:26
-#: mail/mail-component.c:517
+#: mail/mail-component.c:486
 #, fuzzy, c-format
 msgid "%d drafts"
 msgstr "草稿"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:519
+#: mail/mail-component.c:488
 #, c-format
 msgid "%d sent"
 msgstr "%d 已傳送"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:521
+#: mail/mail-component.c:490
 #, c-format
 msgid "%d unsent"
 msgstr "%d 未傳送"
 
-#: mail/mail-component.c:525
+#: mail/mail-component.c:494
 #, c-format
 msgid "%d total"
 msgstr "%d 全部"
 
 # calendar/gui/event-editor.c:1558
-#: mail/mail-component.c:527
+#: mail/mail-component.c:496
 #, fuzzy, c-format
 msgid ", %d unread"
 msgstr "%d 未傳送"
 
-#: mail/mail-component.c:531
-#, fuzzy, c-format
-msgid ", %d selected"
-msgstr "%d 已選擇"
-
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:683
+#: mail/mail-component.c:653
 msgid "New Mail Message"
 msgstr "新增郵件"
 
 # ui/evolution-mail.xml.h:109
-#: mail/mail-component.c:684
+#: mail/mail-component.c:654
 msgid "_Mail Message"
 msgstr "郵件訊息(_M)"
 
 # composer/e-msg-composer.c:1526
 # composer/e-msg-composer.c:1871
-#: mail/mail-component.c:685
+#: mail/mail-component.c:655
 msgid "Compose a new mail message"
 msgstr "編輯新的郵件訊息"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-component.c:691
+#: mail/mail-component.c:661
 #, fuzzy
 msgid "New Mail Folder"
 msgstr "新增虛擬資料夾"
 
-#: mail/mail-component.c:692
+#: mail/mail-component.c:662
 #, fuzzy
 msgid "Mail _Folder"
 msgstr "郵件規則"
 
 # ui/evolution.xml.h:10
-#: mail/mail-component.c:693
+#: mail/mail-component.c:663
 #, fuzzy
 msgid "Create a new mail folder"
 msgstr "新增一個資料夾"
 
-# calendar/gui/control-factory.c:126
-#: mail/mail-component.c:871
-#, fuzzy
-msgid "URI of the mail source that the view will display"
-msgstr "行事曆將顯示的 URI "
+#: mail/mail-component.c:795
+msgid "Failed upgrading Mail settings or folders."
+msgstr ""
+
+#: mail/mail-config.c:895
+msgid "Checking Service"
+msgstr "檢查服務"
+
+# mail/mail-config.c:1213
+# mail/mail-config.c:1216
+#: mail/mail-config.c:973 mail/mail-config.c:977
+msgid "Connecting to server..."
+msgstr "正在連線至伺服器..."
 
 # mail/mail-config.glade.h:35
-#: mail/mail-config-druid.c:364 mail/mail-config.glade.h:89
+#: mail/mail-config-druid.c:362 mail/mail-config.glade.h:89
 msgid "Identity"
 msgstr "身分"
 
 # mail/mail-config-druid.c:99
-#: mail/mail-config-druid.c:366
+#: 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 "
@@ -16922,14 +17481,14 @@ msgstr ""
 "郵件內包含這些資訊。"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-config-druid.c:372 mail/mail-config-druid.c:379
+#: mail/mail-config-druid.c:370 mail/mail-config-druid.c:377
 #: mail/mail-config.glade.h:116
 #, fuzzy
 msgid "Receiving Mail"
 msgstr "接收郵件(_R)"
 
 # mail/mail-config-druid.c:101
-#: mail/mail-config-druid.c:374
+#: 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."
@@ -16937,18 +17496,18 @@ msgstr ""
 "請輸入以下關於您的收件伺服器的資訊。如果您不清楚，請聯絡您的系統管理員或網路"
 "服務供應商。"
 
-#: mail/mail-config-druid.c:381
+#: mail/mail-config-druid.c:379
 msgid "Please select among the following options"
 msgstr "請在下列選項中選擇"
 
 # mail/mail-config.glade.h:66
-#: mail/mail-config-druid.c:384 mail/mail-config.glade.h:128
+#: mail/mail-config-druid.c:382 mail/mail-config.glade.h:128
 #, fuzzy
 msgid "Sending Mail"
 msgstr "傳送郵件(_S)"
 
 # mail/mail-config-druid.c:105
-#: mail/mail-config-druid.c:386
+#: 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."
@@ -16957,12 +17516,12 @@ msgstr ""
 "服務供應商。"
 
 # mail/mail-config.glade.h:5
-#: mail/mail-config-druid.c:391 mail/mail-config.glade.h:35
+#: mail/mail-config-druid.c:389 mail/mail-config.glade.h:35
 msgid "Account Management"
 msgstr "帳號總管"
 
 # mail/mail-config-druid.c:107
-#: mail/mail-config-druid.c:393
+#: 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 "
@@ -16974,16 +17533,6 @@ msgstr ""
 "理為一個 Evolution 郵件帳號。現請在下面的空白處為這個帳號輸入一個名稱。這個名"
 "稱僅用作顯示用途。"
 
-#: mail/mail-config.c:888
-msgid "Checking Service"
-msgstr "檢查服務"
-
-# mail/mail-config.c:1213
-# mail/mail-config.c:1216
-#: mail/mail-config.c:966 mail/mail-config.c:970
-msgid "Connecting to server..."
-msgstr "正在連線至伺服器..."
-
 # mail/mail-config.glade.h:1
 #: mail/mail-config.glade.h:1
 #, fuzzy
@@ -17340,7 +17889,8 @@ msgid "Execute Command..."
 msgstr "執行指令..."
 
 #: mail/mail-config.glade.h:81
-msgid "Fi_xed -width:"
+#, fuzzy
+msgid "Fi_xed-width:"
 msgstr "固定寬度(_X):"
 
 # mail/folder-browser-factory.c:198
@@ -17723,170 +18273,269 @@ msgstr "顏色"
 msgid "description"
 msgstr "描述"
 
-#: mail/mail-errors.xml.in.h:1
-msgid "A folder named \"{1}\" already exists. Please use a different name."
-msgstr ""
+# mail/mail-config.glade.h:10
+#. mail:camel-service-auth-invalid primary
+#: mail/mail-errors.xml.h:2
+#, fuzzy
+msgid "Invalid authentication"
+msgstr "驗證"
 
-#: mail/mail-errors.xml.in.h:2
+# camel/providers/smtp/camel-smtp-transport.c:356
+#. mail:camel-service-auth-invalid secondary
+#: mail/mail-errors.xml.h:4
+#, fuzzy
 msgid ""
-"Adding a meaningful Subject line to your messages will give your recipients "
-"an idea of what your mail is about."
+"This server does not support this type of authentication and may not support "
+"authentication at all."
+msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
+
+#. 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-accounts.c:280
-# mail/mail-accounts.c:284
-#: mail/mail-errors.xml.in.h:3
-msgid "Are you sure you want to delete this account?"
-msgstr "您確定要刪除這個帳號？"
+#. 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-callbacks.c:1549
-#: mail/mail-errors.xml.in.h:4
+# mail/mail-callbacks.c:1085
+#. mail:ask-send-html primary
+#: mail/mail-errors.xml.h:10
 #, fuzzy
-msgid ""
-"Are you sure you want to permanently remove all the deleted message in "
-"folder \"{0}\"?"
-msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
+msgid "Are you sure you want to send a message in HTML format?"
+msgstr "您確定要重新傳送全部 %d 封郵件？"
 
-# ui/evolution-mail.xml.h:61
-#: mail/mail-errors.xml.in.h:5
+#. mail:ask-send-html secondary
+#: mail/mail-errors.xml.h:12
 #, fuzzy
 msgid ""
-"Are you sure you want to permanently remove all the deleted messages in all "
-"folders?"
-msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
+"Please make sure the following recipients are willing and able to receive "
+"HTML email:\n"
+"{0}\n"
+"Send anyway?"
+msgstr ""
+"您正要傳送一封 HTML 格式的郵件。請確定\n"
+"下列收件者願意並且能夠接收 HTML 郵件：\n"
 
-# mail/mail-callbacks.c:1085
-#: mail/mail-errors.xml.in.h:6
+# ui/evolution-message-composer.xml.h:26
+#: 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 "Are you sure you want to send a message in HTML format?"
-msgstr "您確定要重新傳送全部 %d 封郵件？"
+msgid "_Send"
+msgstr "傳送"
 
 # mail/mail-callbacks.c:1085
-#: mail/mail-errors.xml.in.h:7
+#. mail:ask-send-no-subject primary
+#: mail/mail-errors.xml.h:17
 #, fuzzy
-msgid "Are you sure you want to send a message with only BCC recipients?"
+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-callbacks.c:1085
-#: mail/mail-errors.xml.in.h:8
+#. 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 without a subject?"
+msgid "Are you sure you want to send a message with only BCC recipients?"
 msgstr "您確定要重新傳送全部 %d 封郵件？"
 
-#: mail/mail-errors.xml.in.h:9
-msgid "Because \"{0}\"."
+#. 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-errors.xml.in.h:10
-msgid "Because \"{1}\"."
+#. 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-errors.xml.in.h:11
-msgid "Because \"{2}\"."
+#. 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-errors.xml.in.h:12
-msgid "Cannot add vFolder \"{0}\"."
+#. 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 ""
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: mail/mail-errors.xml.in.h:13
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#. mail:ask-default-drafts primary
+#: mail/mail-errors.xml.h:38
 #, fuzzy
-msgid "Cannot copy folder \"{0}\" to \"{1}\"."
-msgstr "不能複製資料夾：%s"
+msgid "Use default drafts folder?"
+msgstr "開啟預設工作資料夾"
 
-# camel/providers/local/camel-local-store.c:142
-# camel/providers/local/camel-local-store.c:158
-#: mail/mail-errors.xml.in.h:14
+# composer/e-msg-composer.c:877
+#. mail:ask-default-drafts secondary
+#: mail/mail-errors.xml.h:40
 #, fuzzy
-msgid "Cannot create folder \"{0}\"."
-msgstr "不能取得資料夾：%s：%s"
+msgid ""
+"Unable to open the drafts folder for this account.  Use the system drafts "
+"folder instead?"
+msgstr ""
+"無法開啟這個帳號的草稿資料夾。\n"
+"是否使用預設的草稿資料夾？"
 
-# mail/mail-display.c:236
-#: mail/mail-errors.xml.in.h:15
+# mail/mail-config.glade.h:21
+#: mail/mail-errors.xml.h:41
 #, fuzzy
-msgid "Cannot create temporary save directory."
-msgstr "無法建立暫存目錄： %s"
+msgid "Use _Default"
+msgstr "預設值"
 
-# shell/e-setup.c:215
-#: mail/mail-errors.xml.in.h:16
+# mail/mail-callbacks.c:1549
+#. mail:ask-expunge primary
+#: mail/mail-errors.xml.h:43
 #, fuzzy
-msgid "Cannot create the save directory, because \"{1}\""
-msgstr ""
-"不能建立目錄\n"
-"%s\n"
-"錯誤：%s"
+msgid ""
+"Are you sure you want to permanently remove all the deleted message in "
+"folder \"{0}\"?"
+msgstr "您確定要用新視窗開啟全部 %d 封郵件？"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:17
-#, fuzzy
-msgid "Cannot delete folder \"{0}\"."
+#. 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 ""
-"不能刪除資料夾：\n"
-"%s"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:18
+# ui/evolution-mail.xml.h:104
+#: mail/mail-errors.xml.h:46
 #, fuzzy
-msgid "Cannot delete system folder \"{0}\"."
-msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+msgid "_Expunge"
+msgstr "刪除(_E)"
 
-# camel/providers/local/camel-maildir-store.c:100
-# camel/providers/local/camel-mbox-store.c:101
-# camel/providers/local/camel-mh-store.c:97
-#: mail/mail-errors.xml.in.h:19
+# ui/evolution-mail.xml.h:61
+#. mail:ask-empty-trash primary
+#: mail/mail-errors.xml.h:48
 #, fuzzy
-msgid "Cannot edit vFolder \"{0}\" as it does not exist."
-msgstr "資料夾“%s”不存在。"
+msgid ""
+"Are you sure you want to permanently remove all the deleted messages in all "
+"folders?"
+msgstr "永久移除在所有資料夾內的全部已刪除的郵件"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:20
+# ui/evolution-mail.xml.h:25
+#: mail/mail-errors.xml.h:51
 #, fuzzy
-msgid "Cannot move folder \"{0}\" to \"{1}\"."
-msgstr "不能移動資料夾：%s"
+msgid "_Empty Trash"
+msgstr "清空垃圾桶(_T)"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: mail/mail-errors.xml.in.h:21
-#, fuzzy
-msgid "Cannot open source \"{1}\""
-msgstr "無法開啟共用的資料夾：%s。"
+#. mail:exit-unsaved primary
+#: mail/mail-errors.xml.h:53
+msgid "You have unsent messages, do you wish to quit anyway?"
+msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
 
-# camel/providers/local/camel-mbox-summary.c:655
-#: mail/mail-errors.xml.in.h:22
+#. 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:camel-exception primary
+#: mail/mail-errors.xml.h:57
+msgid "Your message 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."
+msgstr ""
+
+# mail/mail-mt.c:190
+#. mail:async-error primary
+#: mail/mail-errors.xml.h:62
 #, fuzzy
-msgid "Cannot open source \"{2}\"."
-msgstr "無法開啟共用的資料夾：%s。"
+msgid "Error while {0}."
+msgstr ""
+"當“%s”時發生錯誤：\n"
+"%s"
 
-# camel/camel-filter-driver.c:671
-#: mail/mail-errors.xml.in.h:23
+#. mail:async-error secondary
+#: mail/mail-errors.xml.h:64
+msgid "{1}."
+msgstr ""
+
+# mail/mail-mt.c:193
+#. mail:async-error-nodescribe primary
+#: mail/mail-errors.xml.h:66
 #, fuzzy
-msgid "Cannot open target \"{2}\"."
-msgstr "不能開啟郵件"
+msgid "Error while performing operation."
+msgstr ""
+"當執行這個動作時發生錯誤：\n"
+"%s"
 
-#: mail/mail-errors.xml.in.h:24
-msgid "Cannot rename \"{0}\" to \"{1}\"."
+#. mail:async-error-nodescribe secondary
+#: mail/mail-errors.xml.h:68
+msgid "{0}."
 msgstr ""
 
-# camel/providers/local/camel-local-store.c:237
-#: mail/mail-errors.xml.in.h:25
+#. 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 ""
+
+# addressbook/gui/component/addressbook-config.c:165
+# camel/camel-sasl-plain.c:32
+# camel/providers/imap/camel-imap-provider.c:80
+# camel/providers/nntp/camel-nntp-store.c:291
+# camel/providers/pop3/camel-pop3-provider.c:67
+# mail/mail-config.glade.h:52
+#. mail:ask-session-password primary
+#: mail/mail-errors.xml.h:82
 #, fuzzy
-msgid "Cannot rename or move system folder \"{0}\"."
-msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
+msgid "Enter password."
+msgstr "輸入密碼"
 
-#: mail/mail-errors.xml.in.h:26
-msgid "Cannot save changes to account."
+# mail/mail-callbacks.c:1349
+#. mail:filter-load-error primary
+#: mail/mail-errors.xml.h:86
+#, fuzzy
+msgid "Error loading filter definitions."
 msgstr ""
+"載入過濾器資訊時發生錯誤：\n"
+"%s"
 
 # camel/providers/imap/camel-imap-folder.c:172
-#: mail/mail-errors.xml.in.h:27
+#. mail:no-save-path primary
+#: mail/mail-errors.xml.h:90
 #, fuzzy
 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
@@ -17894,30 +18543,83 @@ msgstr "無法建立目錄 %s： %s"
 # camel/providers/local/camel-mh-folder.c:185
 # camel/providers/local/camel-mh-folder.c:194
 # camel/providers/local/camel-mh-folder.c:202
-#: mail/mail-errors.xml.in.h:28
+#. mail:no-create-path primary
+#: mail/mail-errors.xml.h:94 mail/mail-errors.xml.h:102
+#: mail/mail-errors.xml.h:106
 #, fuzzy
 msgid "Cannot save to file \"{0}\"."
 msgstr ""
 "無法儲存到“%s”\n"
 " %s"
 
-# mail/mail-config.glade.h:74
-#: mail/mail-errors.xml.in.h:29
+# shell/e-setup.c:215
+#. mail:no-create-path secondary
+#: mail/mail-errors.xml.h:96
 #, fuzzy
-msgid "Cannot set signature script \"{0}\"."
-msgstr "加入簽名檔(_A)"
+msgid "Cannot create the save directory, because \"{1}\""
+msgstr ""
+"不能建立目錄\n"
+"%s\n"
+"錯誤：%s"
+
+# mail/mail-display.c:236
+#. mail:no-create-tmp-path primary
+#: mail/mail-errors.xml.h:98
+#, fuzzy
+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
+msgid "File exists but cannot overwrite it."
+msgstr "檔案已存在，覆蓋它？"
 
-#: mail/mail-errors.xml.in.h:30
+# camel/providers/local/camel-mbox-store.c:119
+# camel/providers/local/camel-mbox-store.c:146
+#. mail:no-write-path-notfile secondary
+#: mail/mail-errors.xml.h:108
+#, fuzzy
+msgid "File exists but is not a regular file."
+msgstr "排程器“%s”不存在或不是一個合法的檔案。"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:no-delete-folder primary
+#: mail/mail-errors.xml.h:110
+#, fuzzy
+msgid "Cannot delete folder \"{0}\"."
+msgstr ""
+"不能刪除資料夾：\n"
+"%s"
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:no-delete-spethal-folder primary
+#: mail/mail-errors.xml.h:114
+#, fuzzy
+msgid "Cannot delete system folder \"{0}\"."
+msgstr "不能刪除資料夾： %s ：沒有這個資料夾"
+
+#. mail:no-delete-spethal-folder secondary
+#: mail/mail-errors.xml.h:116 mail/mail-errors.xml.h:120
 msgid ""
-"Check to make sure your password is spelled correctly. Remember that many "
-"passwords are case sensitive; your caps lock might be on."
+"System folders are required for Ximian Evolution to function correctly and "
+"cannot be renamed, moved, or deleted."
 msgstr ""
 
-# mail/mail-crypto.c:59
-#: mail/mail-errors.xml.in.h:31
+# camel/providers/local/camel-local-store.c:237
+#. mail:no-rename-spethal-folder primary
+#: mail/mail-errors.xml.h:118
 #, fuzzy
-msgid "Could not save signature file."
-msgstr "無法儲存簽名檔： %s"
+msgid "Cannot rename or move system folder \"{0}\"."
+msgstr "不能重新命名資料夾： %s ：沒有這個資料夾"
 
 # addressbook/gui/component/addressbook-config.glade.h:3
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:235
@@ -17930,304 +18632,275 @@ msgstr "無法儲存簽名檔： %s"
 # ui/evolution-event-editor.xml.h:17
 # ui/evolution-mail.xml.h:22
 # ui/evolution-task-editor-dialog.xml.h:18
-#: mail/mail-errors.xml.in.h:32
+#. mail:ask-delete-folder title
+#: mail/mail-errors.xml.h:122
 #, fuzzy
 msgid "Delete \"{0}\"?"
 msgstr "刪除“%s”"
 
-# calendar/gui/e-calendar-table.c:714
-#: mail/mail-errors.xml.in.h:33
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:ask-delete-folder primary
+#: mail/mail-errors.xml.h:124
 #, fuzzy
-msgid "Delete account?"
-msgstr "刪除選定的連絡人"
+msgid "Really delete folder \"{0}\" and all of its subfolders?"
+msgstr "確定要刪除資料夾“%s”？"
 
-#: mail/mail-errors.xml.in.h:34
-#, fuzzy
-msgid "Discard changed?"
-msgstr "放棄變更(_D)"
+#. 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 ""
 
-# calendar/gui/dialogs/save-comp.c:51
-#: mail/mail-errors.xml.in.h:35
-#, fuzzy
-msgid "Do you wish to save your changes?"
-msgstr "您是否須要儲存變更？"
+#. 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 ""
 
-# shell/e-shortcuts-view.c:265
-#: mail/mail-errors.xml.in.h:36
-msgid "Don't delete"
-msgstr "不要刪除"
+#. mail:no-rename-folder-exists 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 ""
 
-# addressbook/gui/component/addressbook-config.c:165
-# camel/camel-sasl-plain.c:32
-# camel/providers/imap/camel-imap-provider.c:80
-# camel/providers/nntp/camel-nntp-store.c:291
-# camel/providers/pop3/camel-pop3-provider.c:67
-# mail/mail-config.glade.h:52
-#: mail/mail-errors.xml.in.h:37
+#. mail:no-rename-folder secondary
+#: mail/mail-errors.xml.h:134
+msgid "Because \"{2}\"."
+msgstr ""
+
+# camel/providers/local/camel-mbox-store.c:138
+# camel/providers/local/camel-mbox-store.c:161
+#. mail:no-move-folder-nostore primary
+#: mail/mail-errors.xml.h:136 mail/mail-errors.xml.h:140
 #, fuzzy
-msgid "Enter password."
-msgstr "輸入密碼"
+msgid "Cannot move folder \"{0}\" to \"{1}\"."
+msgstr "不能移動資料夾：%s"
 
-# mail/mail-callbacks.c:1349
-#: mail/mail-errors.xml.in.h:38
+# camel/providers/local/camel-mbox-summary.c:655
+#. mail:no-move-folder-nostore secondary
+#: mail/mail-errors.xml.h:138 mail/mail-errors.xml.h:146
 #, fuzzy
-msgid "Error loading filter definitions."
-msgstr ""
-"載入過濾器資訊時發生錯誤：\n"
-"%s"
+msgid "Cannot open source \"{2}\"."
+msgstr "無法開啟共用的資料夾：%s。"
 
-# mail/mail-mt.c:193
-#: mail/mail-errors.xml.in.h:39
+# camel/camel-filter-driver.c:671
+#. mail:no-move-folder-to-nostore secondary
+#: mail/mail-errors.xml.h:142 mail/mail-errors.xml.h:150
 #, fuzzy
-msgid "Error while performing operation."
-msgstr ""
-"當執行這個動作時發生錯誤：\n"
-"%s"
+msgid "Cannot open target \"{2}\"."
+msgstr "不能開啟郵件"
 
-# mail/mail-mt.c:190
-#: mail/mail-errors.xml.in.h:40
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#. mail:no-copy-folder-nostore primary
+#: mail/mail-errors.xml.h:144 mail/mail-errors.xml.h:148
 #, fuzzy
-msgid "Error while {0}."
-msgstr ""
-"當“%s”時發生錯誤：\n"
-"%s"
+msgid "Cannot copy folder \"{0}\" to \"{1}\"."
+msgstr "不能複製資料夾：%s"
 
-#: mail/mail-errors.xml.in.h:41
+# camel/providers/local/camel-local-store.c:142
+# camel/providers/local/camel-local-store.c:158
+#. mail:no-create-folder-nostore primary
+#: mail/mail-errors.xml.h:152
 #, fuzzy
-msgid "File exists but cannot overwrite it."
-msgstr "檔案已存在，覆蓋它？"
+msgid "Cannot create folder \"{0}\"."
+msgstr "不能取得資料夾：%s：%s"
 
-# camel/providers/local/camel-mbox-store.c:119
-# camel/providers/local/camel-mbox-store.c:146
-#: mail/mail-errors.xml.in.h:42
+# camel/providers/local/camel-mbox-summary.c:655
+#. mail:no-create-folder-nostore secondary
+#: mail/mail-errors.xml.h:154
 #, fuzzy
-msgid "File exists but is not a regular file."
-msgstr "排程器“%s”不存在或不是一個合法的檔案。"
+msgid "Cannot open source \"{1}\""
+msgstr "無法開啟共用的資料夾：%s。"
 
-#: mail/mail-errors.xml.in.h:43
-msgid "If you continue, you will not be able to recover these messages."
+#. 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-errors.xml.in.h:44
-msgid ""
-"If you delete the folder, all of its contents and its subfolders contents "
-"will be deleted permanently."
-msgstr ""
+# mail/mail-account-editor.c:105
+#. 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 "您不能用相同的名稱建立兩個帳號。"
+
+# calendar/gui/e-calendar-table.c:714
+#. mail:ask-delete-account title
+#: mail/mail-errors.xml.h:164
+#, fuzzy
+msgid "Delete account?"
+msgstr "刪除選定的連絡人"
+
+# mail/mail-accounts.c:280
+# mail/mail-accounts.c:284
+#. mail:ask-delete-account primary
+#: mail/mail-errors.xml.h:166
+msgid "Are you sure you want to delete this account?"
+msgstr "您確定要刪除這個帳號？"
 
-#: mail/mail-errors.xml.in.h:45
+#. 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-errors.xml.in.h:46
-msgid ""
-"If you quit, these messages will not be sent until Evolution is started "
-"again."
-msgstr ""
+# shell/e-shortcuts-view.c:265
+#: mail/mail-errors.xml.h:169
+msgid "Don't delete"
+msgstr "不要刪除"
 
-# mail/mail-config.glade.h:10
-#: mail/mail-errors.xml.in.h:47
+# mail/mail-crypto.c:59
+#. mail:no-save-signature primary
+#: mail/mail-errors.xml.h:171
 #, fuzzy
-msgid "Invalid authentication"
-msgstr "驗證"
+msgid "Could not save signature file."
+msgstr "無法儲存簽名檔： %s"
 
-#: mail/mail-errors.xml.in.h:48
-msgid "Mail filters automatically updated."
+#. mail:no-save-signature secondary
+#: mail/mail-errors.xml.h:173
+msgid "Because \"{0}\"."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:49
-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-config.glade.h:74
+#. mail:signature-notscript primary
+#: mail/mail-errors.xml.h:175
+#, fuzzy
+msgid "Cannot set signature script \"{0}\"."
+msgstr "加入簽名檔(_A)"
 
-#: mail/mail-errors.xml.in.h:50
-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."
+#. mail:signature-notscript secondary
+#: mail/mail-errors.xml.h:177
+msgid "The script file must exist and be executable."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:51
+#. mail:ask-signature-changed title
+#: mail/mail-errors.xml.h:179
 #, fuzzy
-msgid ""
-"Please make sure the following recipients are willing and able to receive "
-"HTML email: {0} Send anyway?"
+msgid "Discard changed?"
+msgstr "放棄變更(_D)"
+
+# calendar/gui/dialogs/save-comp.c:51
+#. mail:ask-signature-changed primary
+#: mail/mail-errors.xml.h:181
+#, fuzzy
+msgid "Do you wish to save your changes?"
+msgstr "您是否須要儲存變更？"
+
+# composer/e-msg-composer.c:941
+#. mail:ask-signature-changed secondary
+#: mail/mail-errors.xml.h:183
+#, fuzzy
+msgid "This signature has been changed, but has not been saved."
 msgstr ""
-"您正要傳送一封 HTML 格式的郵件。請確定\n"
-"下列收件者願意並且能夠接收 HTML 郵件：\n"
+"這個簽名檔已變更但仍未儲存。\n"
+"\n"
+"您是否要儲存變更？"
 
-# camel/providers/local/camel-mbox-store.c:138
-# camel/providers/local/camel-mbox-store.c:161
-#: mail/mail-errors.xml.in.h:52
+#: mail/mail-errors.xml.h:184
+msgid "_Discard changes"
+msgstr "放棄變更(_D)"
+
+# camel/providers/local/camel-maildir-store.c:100
+# camel/providers/local/camel-mbox-store.c:101
+# camel/providers/local/camel-mh-store.c:97
+#. mail:vfolder-notexist primary
+#: mail/mail-errors.xml.h:186
 #, fuzzy
-msgid "Really delete folder \"{0}\" and all of its subfolders?"
-msgstr "確定要刪除資料夾“%s”？"
+msgid "Cannot edit vFolder \"{0}\" as it does not exist."
+msgstr "資料夾“%s”不存在。"
 
-#: mail/mail-errors.xml.in.h:53
+#. mail:vfolder-notexist secondary
+#: mail/mail-errors.xml.h:188
 msgid ""
-"System folders are required for Ximian Evolution to function correctly and "
-"cannot be renamed, moved, or deleted."
+"This folder may have been added implictly, go to the virtual folder editor "
+"to add it explictly, if required."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:54
-msgid ""
-"The contact list you are sending to is configured to hide list recipients. "
-"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."
+#. mail:vfolder-notunique primary
+#: mail/mail-errors.xml.h:190
+msgid "Cannot add vFolder \"{0}\"."
+msgstr ""
+
+#. mail:vfolder-updated primary
+#: mail/mail-errors.xml.h:194
+msgid "vFolders automatically updated."
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:55
+#. mail:vfolder-updated secondary
+#: mail/mail-errors.xml.h:196
 #, fuzzy
 msgid ""
-"The following filter rule(s): {0} Used the now removed folder: \"{1}\" And "
-"have been updated."
+"The following vFolder(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "下列虛擬資料夾：\n"
 "%s使用刪除的資料夾：\n"
 "   “%s”\n"
 "已經更新。"
 
-#: mail/mail-errors.xml.in.h:56
+#. 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
 #, fuzzy
 msgid ""
-"The following vFolder(s): {0} Used the now removed folder: \"{1}\" And have "
-"been updated."
+"The following filter rule(s):\n"
+"{0}\n"
+"Used the now removed folder:\n"
+"    \"{1}\"\n"
+"And have been updated."
 msgstr ""
 "下列虛擬資料夾：\n"
 "%s使用刪除的資料夾：\n"
 "   “%s”\n"
 "已經更新。"
 
-#: mail/mail-errors.xml.in.h:57
-msgid ""
-"The message was sent via the \"sendmail\" external application. Sendmail "
-"reports the following error: status 67: mail not sent. The message is stored "
-"in the Outbox folder. Check the message for errors and resend."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:58
-msgid "The script file must exist and be executable."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:59
-msgid ""
-"This folder may have been added implictly, go to the virtual folder editor "
-"to add it explictly, if required."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:60
-msgid ""
-"This message cannot be sent because you have not specified any Recipients"
+#. mail:ask-migrate-existing primary
+#: mail/mail-errors.xml.h:210
+msgid "Problem migrating old mail folder \"{0}\"."
 msgstr ""
 
-# camel/providers/smtp/camel-smtp-transport.c:356
-#: mail/mail-errors.xml.in.h:61
-#, fuzzy
+#. mail:ask-migrate-existing secondary
+#: mail/mail-errors.xml.h:212
 msgid ""
-"This server does not support this type of authentication and may not support "
-"authentication at all."
-msgstr "SMTP 伺服器 %s 不支援所要求的驗證類型 %s。"
-
-# composer/e-msg-composer.c:941
-#: mail/mail-errors.xml.in.h:62
-#, fuzzy
-msgid "This signature has been changed, but has not been saved."
-msgstr ""
-"這個簽名檔已變更但仍未儲存。\n"
+"A non-empty folder at \"{1}\" already exists.\n"
 "\n"
-"您是否要儲存變更？"
-
-# composer/e-msg-composer.c:877
-#: mail/mail-errors.xml.in.h:63
-#, fuzzy
-msgid ""
-"Unable to open the drafts folder for this account. Use the system drafts "
-"folder instead?"
-msgstr ""
-"無法開啟這個帳號的草稿資料夾。\n"
-"是否使用預設的草稿資料夾？"
-
-# mail/mail-config.glade.h:21
-#: mail/mail-errors.xml.in.h:64
-#, fuzzy
-msgid "Use _Default"
-msgstr "預設值"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: mail/mail-errors.xml.in.h:65
-#, fuzzy
-msgid "Use default drafts folder?"
-msgstr "開啟預設工作資料夾"
-
-# mail/mail-account-editor.c:105
-#: mail/mail-errors.xml.in.h:66
-msgid "You have not filled in all of the required information."
-msgstr "您沒有填入所有必須的資訊。"
-
-#: mail/mail-errors.xml.in.h:67
-msgid "You have unsent messages, do you wish to quit anyway?"
-msgstr "您有未寄出的郵件，您無論如何都要離開嗎？"
-
-#: mail/mail-errors.xml.in.h:68
-msgid "You may not create two accounts with the same name."
-msgstr "您不能用相同的名稱建立兩個帳號。"
-
-#: mail/mail-errors.xml.in.h:69
-msgid "Your login to your server \"{0}\" as \"{0}\" failed."
+"You can choose to ignore this folder, overwrite or append its contents, or "
+"quit.\n"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:70
-msgid "Your message message, with the subject \"{0}\" was not delivered."
+#: mail/mail-errors.xml.h:216
+msgid "Ignore"
 msgstr ""
 
-#: mail/mail-errors.xml.in.h:71
-msgid "_Discard changes"
-msgstr "放棄變更(_D)"
-
-# ui/evolution-mail.xml.h:25
-#: mail/mail-errors.xml.in.h:72
-#, fuzzy
-msgid "_Empty Trash"
-msgstr "清空垃圾桶(_T)"
-
-# ui/evolution-mail.xml.h:104
-#: mail/mail-errors.xml.in.h:73
+# mail/mail-callbacks.c:1140
+# mail/mail-display.c:92
+#: mail/mail-errors.xml.h:217 widgets/misc/e-system-errors.xml.h:7
 #, fuzzy
-msgid "_Expunge"
-msgstr "刪除(_E)"
+msgid "_Overwrite"
+msgstr "覆寫"
 
-# ui/evolution-message-composer.xml.h:26
-#: mail/mail-errors.xml.in.h:74
+# calendar/gui/e-day-view.c:3162
+# calendar/gui/e-week-view.c:3292
+# ui/evolution-calendar.xml.h:19
+# ui/evolution-message-composer.xml.h:11
+#: mail/mail-errors.xml.h:218
 #, fuzzy
-msgid "_Send"
-msgstr "傳送"
-
-#: mail/mail-errors.xml.in.h:75
-msgid "vFolders automatically updated."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:76
-msgid "{0}"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:77
-msgid "{0}."
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:78
-msgid "{1}"
-msgstr ""
-
-#: mail/mail-errors.xml.in.h:79
-msgid "{1}."
-msgstr ""
+msgid "_Append"
+msgstr "阿斯本"
 
 # mail/mail-ops.c:599
-#: mail/mail-folder-cache.c:786
+#: mail/mail-folder-cache.c:787
 #, c-format
 msgid "Pinging %s"
 msgstr "Pinging %s"
@@ -18240,22 +18913,22 @@ msgid "Working"
 msgstr "正在工作"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:88
+#: mail/mail-ops.c:99
 msgid "Filtering Folder"
 msgstr "過濾資料夾"
 
 # mail/mail-config.glade.h:58
-#: mail/mail-ops.c:249
+#: mail/mail-ops.c:260
 msgid "Fetching Mail"
 msgstr "接收郵件"
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:532
+#: mail/mail-ops.c:543
 #, fuzzy, c-format
 msgid "Failed to apply outgoing filters: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
-#: mail/mail-ops.c:557
+#: mail/mail-ops.c:568
 #, c-format
 msgid ""
 "Failed to append to %s: %s\n"
@@ -18263,126 +18936,126 @@ msgid ""
 msgstr ""
 
 # camel/camel-movemail.c:274
-#: mail/mail-ops.c:566
+#: mail/mail-ops.c:577
 #, fuzzy, c-format
 msgid "Failed to append to local `Sent' folder: %s"
 msgstr "儲存郵件至暫存檔案時失敗 %s：%s"
 
 # mail/mail-ops.c:718
-#: mail/mail-ops.c:662
+#: mail/mail-ops.c:673
 #, 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:693
+#: mail/mail-ops.c:704
 #, 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:697
+#: mail/mail-ops.c:708
 msgid "Complete."
 msgstr "完成。"
 
 # mail/mail-ops.c:825
-#: mail/mail-ops.c:794
+#: mail/mail-ops.c:805
 msgid "Saving message to folder"
 msgstr "儲存郵件到資料夾"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Moving messages to %s"
 msgstr "將郵件移到 %s"
 
 # mail/mail-ops.c:898
-#: mail/mail-ops.c:879
+#: mail/mail-ops.c:890
 #, c-format
 msgid "Copying messages to %s"
 msgstr "將郵件複製到 %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-ops.c:992
+#: mail/mail-ops.c:1003
 #, c-format
 msgid "Scanning folders in \"%s\""
 msgstr "掃描“%s”內的資料夾"
 
 # mail/mail-ops.c:1154
-#: mail/mail-ops.c:1105
+#: mail/mail-ops.c:1116
 msgid "Forwarded messages"
 msgstr "已轉寄的郵件"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1148
+#: mail/mail-ops.c:1159
 #, c-format
 msgid "Opening folder %s"
 msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1262
-#: mail/mail-ops.c:1220
+#: mail/mail-ops.c:1231
 #, c-format
 msgid "Opening store %s"
 msgstr "開啟貯藏 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1298
+#: mail/mail-ops.c:1309
 #, c-format
 msgid "Removing folder %s"
 msgstr "移除資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1392
+#: mail/mail-ops.c:1403
 #, c-format
 msgid "Storing folder '%s'"
 msgstr "貯藏資料夾“%s”"
 
-#: mail/mail-ops.c:1457
+#: mail/mail-ops.c:1468
 #, c-format
 msgid "Expunging and storing account '%s'"
 msgstr ""
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-ops.c:1458
+#: mail/mail-ops.c:1469
 #, fuzzy, c-format
 msgid "Storing account '%s'"
 msgstr "貯藏資料夾“%s”"
 
 # mail/mail-local.c:812
-#: mail/mail-ops.c:1513
+#: mail/mail-ops.c:1524
 msgid "Refreshing folder"
 msgstr "重新載入資料夾"
 
 # mail/mail-ops.c:1449
-#: mail/mail-ops.c:1549 mail/mail-ops.c:1600
+#: mail/mail-ops.c:1560 mail/mail-ops.c:1611
 msgid "Expunging folder"
 msgstr "刪除資料夾"
 
 # shell/e-shell-importer.c:371
-#: mail/mail-ops.c:1597
+#: mail/mail-ops.c:1608
 #, fuzzy, c-format
 msgid "Emptying trash in '%s'"
 msgstr "匯入 %s 為 %s"
 
 # mail/mail-config.glade.h:76
-#: mail/mail-ops.c:1598
+#: mail/mail-ops.c:1609
 msgid "Local Folders"
 msgstr "本機資料夾"
 
 # mail/mail-ops.c:1498
-#: mail/mail-ops.c:1681
+#: mail/mail-ops.c:1692
 #, c-format
 msgid "Retrieving message %s"
 msgstr "取回郵件 %s"
 
 # mail/mail-ops.c:1565
-#: mail/mail-ops.c:1753
+#: mail/mail-ops.c:1764
 #, fuzzy, c-format
 msgid "Retrieving %d message"
 msgid_plural "Retrieving %d messages"
@@ -18390,7 +19063,7 @@ msgstr[0] "取回 %d 封郵件"
 msgstr[1] "取回 %d 封郵件"
 
 # mail/mail-ops.c:1649
-#: mail/mail-ops.c:1839
+#: mail/mail-ops.c:1850
 #, fuzzy, c-format
 msgid "Saving %d message"
 msgid_plural "Saving %d messsages"
@@ -18398,7 +19071,7 @@ msgstr[0] "儲存 %d 封郵件"
 msgstr[1] "儲存 %d 封郵件"
 
 # mail/mail-ops.c:1728
-#: mail/mail-ops.c:1889
+#: mail/mail-ops.c:1900
 #, c-format
 msgid ""
 "Unable to create output file: %s\n"
@@ -18408,7 +19081,7 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1755
-#: mail/mail-ops.c:1917
+#: mail/mail-ops.c:1928
 #, c-format
 msgid ""
 "Error saving messages to: %s:\n"
@@ -18418,12 +19091,12 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1829
-#: mail/mail-ops.c:1988
+#: mail/mail-ops.c:1999
 msgid "Saving attachment"
 msgstr "儲存附件"
 
 # mail/mail-ops.c:1844
-#: mail/mail-ops.c:2005
+#: mail/mail-ops.c:2016
 #, c-format
 msgid ""
 "Cannot create output file: %s:\n"
@@ -18433,19 +19106,19 @@ msgstr ""
 " %s"
 
 # mail/mail-ops.c:1872
-#: mail/mail-ops.c:2035
+#: mail/mail-ops.c:2046
 #, c-format
 msgid "Could not write data: %s"
 msgstr "無法寫入資料：%s"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Disconnecting from %s"
 msgstr "中斷與 %s 的連線"
 
 # mail/mail-ops.c:1939
-#: mail/mail-ops.c:2183
+#: mail/mail-ops.c:2194
 #, c-format
 msgid "Reconnecting to %s"
 msgstr "重新連線到 %s"
@@ -18524,12 +19197,12 @@ msgid "Waiting..."
 msgstr "正在等待..."
 
 # mail/mail-session.c:161
-#: mail/mail-session.c:237
+#: mail/mail-session.c:238
 msgid "User canceled operation."
 msgstr "使用者取消動作。"
 
 # camel/camel-smime-context.c:194
-#: mail/mail-session.c:270
+#: mail/mail-session.c:271
 #, c-format
 msgid "Enter Password for %s"
 msgstr "請輸入 %s 所需的密碼"
@@ -18540,17 +19213,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:272
+#: mail/mail-session.c:273
 msgid "Enter Password"
 msgstr "輸入密碼"
 
 # addressbook/gui/component/addressbook-config.c:352
 # mail/mail-config.glade.h:60
-#: mail/mail-session.c:295
+#: mail/mail-session.c:296
 msgid "_Remember this password"
 msgstr "記住這個密碼(_R)"
 
-#: mail/mail-session.c:296
+#: mail/mail-session.c:297
 msgid "_Remember this password for the remainder of this session"
 msgstr "記住這個用於剩餘的工作階段的密碼(_R)"
 
@@ -18602,109 +19275,115 @@ msgstr "開啟資料夾 %s"
 
 # mail/mail-ops.c:1195
 # mail/mail-ops.c:1333
-#: mail/mail-vfolder.c:88
+#: mail/mail-vfolder.c:87
 #, c-format
 msgid "Setting up vfolder: %s"
 msgstr "設定虛擬資料夾： %s"
 
 # mail/mail-ops.c:992
-#: mail/mail-vfolder.c:207
-#, c-format
-msgid "Updating vfolders for uri: %s"
+#: mail/mail-vfolder.c:235
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s:%s'"
+msgstr "更新用於 URI： %s 的虛擬資料夾"
+
+# mail/mail-ops.c:992
+#: mail/mail-vfolder.c:242
+#, fuzzy, c-format
+msgid "Updating vFolders for '%s'"
 msgstr "更新用於 URI： %s 的虛擬資料夾"
 
 # camel/providers/imap/camel-imap-provider.c:48
 # shell/e-shell-view.c:552
-#: mail/mail-vfolder.c:922
+#: mail/mail-vfolder.c:959
 msgid "vFolders"
 msgstr "虛擬資料夾"
 
-#: mail/mail-vfolder.c:961
+#: mail/mail-vfolder.c:998
 msgid "Edit VFolder"
 msgstr "編輯虛擬資料夾"
 
 # mail/mail-vfolder.c:438
-#: mail/mail-vfolder.c:1045
+#: mail/mail-vfolder.c:1082
 msgid "New VFolder"
 msgstr "新增虛擬資料夾"
 
 # mail/message-list.c:677
-#: mail/message-list.c:911
+#: mail/message-list.c:946
 msgid "Unseen"
 msgstr "未閱讀"
 
 # mail/message-list.c:678
-#: mail/message-list.c:912
+#: mail/message-list.c:947
 msgid "Seen"
 msgstr "已閱讀"
 
 # mail/message-list.c:679
-#: mail/message-list.c:913
+#: mail/message-list.c:948
 msgid "Answered"
 msgstr "已回覆"
 
 # mail/message-list.c:680
-#: mail/message-list.c:914
+#: mail/message-list.c:949
 msgid "Multiple Unseen Messages"
 msgstr "多個未閱讀的郵件"
 
 # mail/message-list.c:681
-#: mail/message-list.c:915
+#: mail/message-list.c:950
 msgid "Multiple Messages"
 msgstr "多個郵件"
 
 # mail/message-list.c:685
-#: mail/message-list.c:919
+#: mail/message-list.c:954
 msgid "Lowest"
 msgstr "最低"
 
 # mail/message-list.c:686
-#: mail/message-list.c:920
+#: mail/message-list.c:955
 msgid "Lower"
 msgstr "低"
 
 # mail/message-list.c:690
-#: mail/message-list.c:924
+#: mail/message-list.c:959
 msgid "Higher"
 msgstr "高"
 
 # mail/message-list.c:691
-#: mail/message-list.c:925
+#: mail/message-list.c:960
 msgid "Highest"
 msgstr "最高"
 
 # mail/message-list.c:941
-#: mail/message-list.c:1244
+#: mail/message-list.c:1279
 msgid "?"
 msgstr "？"
 
 # mail/message-list.c:948
-#: mail/message-list.c:1251
+#: mail/message-list.c:1286
 msgid "Today %l:%M %p"
 msgstr "今天 %l:%M %p"
 
 # mail/message-list.c:957
-#: mail/message-list.c:1260
+#: mail/message-list.c:1295
 msgid "Yesterday %l:%M %p"
 msgstr "昨天 %l:%M %p"
 
 # mail/message-list.c:969
-#: mail/message-list.c:1272
+#: mail/message-list.c:1307
 msgid "%a %l:%M %p"
 msgstr "%a %l:%M %p"
 
 # mail/message-list.c:977
-#: mail/message-list.c:1280
+#: mail/message-list.c:1315
 msgid "%b %d %l:%M %p"
 msgstr "%b %d %l:%M %p"
 
 # mail/message-list.c:979
-#: mail/message-list.c:1282
+#: mail/message-list.c:1317
 msgid "%b %d %Y"
 msgstr "%b %d %Y"
 
 # mail/mail-local.c:905
-#: mail/message-list.c:3109
+#: mail/message-list.c:3300
 msgid "Generating message list"
 msgstr "產生郵件清單"
 
@@ -18746,53 +19425,53 @@ msgstr "大小"
 # importers/elm-importer.c:517
 # importers/netscape-importer.c:785
 # importers/pine-importer.c:651
-#: mail/message-tag-followup.c:62
+#: mail/message-tag-followup.c:73
 msgid "Call"
 msgstr "原始位置"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: 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 "跟隨"
 
 # widgets/meeting-time-sel/e-meeting-time-sel.c:395
-#: mail/message-tag-followup.c:65
+#: mail/message-tag-followup.c:76
 msgid "For Your Information"
 msgstr "給您的資訊"
 
 # mail/message-browser.c:194
 # ui/evolution-mail.xml.h:33
-#: mail/message-tag-followup.c:66 ui/evolution-mail-message.xml.h:42
+#: 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-browser.c:188
 # ui/evolution-mail.xml.h:70
-#: mail/message-tag-followup.c:69 ui/evolution-mail-message.xml.h:85
+#: mail/message-tag-followup.c:80 ui/evolution-mail-message.xml.h:85
 msgid "Reply"
 msgstr "回覆"
 
 # mail/message-browser.c:191
 # ui/evolution-mail.xml.h:71
-#: mail/message-tag-followup.c:70 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 "全部回覆"
 
 # calendar/gui/event-editor-dialog.glade.h:15
-#: mail/message-tag-followup.c:71
+#: mail/message-tag-followup.c:82
 msgid "Review"
 msgstr "檢閱"
 
-#: mail/message-tag-followup.c:283 mail/message-tags.glade.h:3
+#: mail/message-tag-followup.c:294 mail/message-tags.glade.h:3
 msgid "Flag to Follow Up"
 msgstr "要跟隨的標幟"
 
@@ -18849,155 +19528,67 @@ msgstr "訂閱(_S)"
 msgid "_Unsubscribe"
 msgstr "取消訂閱(_U)"
 
-# shell/GNOME_Evolution_Shell.oaf.in.h:1
-#: shell/GNOME_Evolution_Shell.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Shell"
-msgstr "Evolution shell。"
-
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#: shell/GNOME_Evolution_Test.server.in.in.h:1
-#, fuzzy
-msgid "Evolution Test"
-msgstr "Evolution"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#: shell/GNOME_Evolution_Test.server.in.in.h:2
-#, fuzzy
-msgid "Evolution Test component"
-msgstr "Evolution 測試元件。"
-
 # calendar/gui/e-calendar-table.c:375
 #: shell/apps_evolution_shell.schemas.in.in.h:1
 #, fuzzy
 msgid "480"
 msgstr "380"
 
-# shell/e-shortcuts-view.c:295
-#: shell/apps_evolution_shell.schemas.in.in.h:2
-#, fuzzy
-msgid "Default shortcut group"
-msgstr "更改這個功能群組的名稱"
-
 # ui/evolution.xml.h:32
-#: shell/apps_evolution_shell.schemas.in.in.h:3
+#: shell/apps_evolution_shell.schemas.in.in.h:2
 #, fuzzy
 msgid "Default width of the folder bar pane"
 msgstr "切換資料夾清單的顯示狀態"
 
-# shell/e-shortcuts-view.c:301
-#: shell/apps_evolution_shell.schemas.in.in.h:4
-#, fuzzy
-msgid "Default width of the shortcut bar pane"
-msgstr "隱藏功能列"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: shell/apps_evolution_shell.schemas.in.in.h:5
+#: shell/apps_evolution_shell.schemas.in.in.h:3
 #, fuzzy
 msgid "Default window height"
 msgstr "預設優先順序:"
 
 # calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#: shell/apps_evolution_shell.schemas.in.in.h:6
+#: shell/apps_evolution_shell.schemas.in.in.h:4
 #, fuzzy
 msgid "Default window width"
 msgstr "預設優先順序:"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:9
-#: shell/apps_evolution_shell.schemas.in.in.h:7
+#: shell/apps_evolution_shell.schemas.in.in.h:5
 #, fuzzy
 msgid "Evolution configuration version"
 msgstr "郵件組態界面"
 
-#: shell/apps_evolution_shell.schemas.in.in.h:8
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:9
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:10
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:11
+#: 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 ""
 
-#: shell/apps_evolution_shell.schemas.in.in.h:12
-msgid "Path to the default calendar folder"
-msgstr ""
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:13
-#, fuzzy
-msgid "Path to the default contacts folder"
-msgstr "開啟預設工作資料夾"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:14
-#, fuzzy
-msgid "Path to the default mail folder"
-msgstr "開啟預設工作資料夾"
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:15
-#, fuzzy
-msgid "Path to the default tasks folder"
-msgstr "開啟預設工作資料夾"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:16
-msgid "Physical URI to the default calendar folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:17
-msgid "Physical URI to the default contacts folder"
-msgstr ""
-
-#: shell/apps_evolution_shell.schemas.in.in.h:18
-msgid "Physical URI to the default mail folder"
-msgstr ""
-
-# mail/mail-ops.c:1195
-# mail/mail-ops.c:1333
-#: shell/apps_evolution_shell.schemas.in.in.h:19
-#, fuzzy
-msgid "Physical URI to the default tasks folder"
-msgstr "開啟預設工作資料夾"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:20
+#: shell/apps_evolution_shell.schemas.in.in.h:10
 msgid "Whether Evolution should start up in offline mode"
 msgstr ""
 
-# ui/evolution.xml.h:32
-#: shell/apps_evolution_shell.schemas.in.in.h:21
-#, fuzzy
-msgid "Whether to show the folder bar"
-msgstr "切換資料夾清單的顯示狀態"
-
-# ui/evolution.xml.h:33
-#: shell/apps_evolution_shell.schemas.in.in.h:22
-#, fuzzy
-msgid "Whether to show the shortcut bar"
-msgstr "切換資料功能列的顯示狀態"
-
-#: shell/apps_evolution_shell.schemas.in.in.h:23
+#: shell/apps_evolution_shell.schemas.in.in.h:11
 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:24
+#: shell/apps_evolution_shell.schemas.in.in.h:12
 #, fuzzy
 msgid "mail"
 msgstr "電子郵件"
@@ -19006,6 +19597,38 @@ msgstr "電子郵件"
 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
+#, 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
+#, 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
+msgid "Invalid arguments"
+msgstr "無效的參數"
+
+#: shell/e-shell.c:1103
+msgid "Cannot register on OAF"
+msgstr "不能於 OAF 註冊"
+
+#: shell/e-shell.c:1105
+msgid "Configuration Database not found"
+msgstr "找不到組態資料庫"
+
+# shell/e-storage.c:461
+#: shell/e-shell.c:1107
+msgid "Generic error"
+msgstr "一般錯誤"
+
 # shell/e-shell-folder-title-bar.c:459
 # shell/e-shell-folder-title-bar.c:460
 #: shell/e-shell-folder-title-bar.c:592 shell/e-shell-folder-title-bar.c:593
@@ -19175,14 +19798,14 @@ msgid "_Import"
 msgstr "匯入"
 
 # shell/e-shell-offline-handler.c:554
-#: shell/e-shell-offline-handler.c:595
+#: shell/e-shell-offline-handler.c:594
 msgid "Closing connections..."
 msgstr "關閉連線..."
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/e-shell-settings-dialog.c:323
+#: shell/e-shell-settings-dialog.c:326
 msgid "Evolution Settings"
 msgstr "Evolution 設定值"
 
@@ -19222,12 +19845,33 @@ msgstr "資料夾名稱不能包含換行字元。"
 msgid "'.' and '..' are reserved folder names."
 msgstr "“.”和“..”是資料夾保留名稱。"
 
-#: shell/e-shell-window-commands.c:63
+#: shell/e-shell-window.c:336
+#, fuzzy
+msgid "Evolution is currently online.  Click on this button to work offline."
+msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
+
+#: shell/e-shell-window.c:343
+#, fuzzy
+msgid "Evolution is in the process of going offline."
+msgstr "Ximian Evolution 現正離線中。"
+
+#: shell/e-shell-window.c:349
+#, 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
+#, fuzzy, c-format
+msgid "Switch to %s"
+msgstr "郵件送到 %s"
+
+#: shell/e-shell-window-commands.c:64
 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:71
+#: shell/e-shell-window-commands.c:72
 #, c-format
 msgid "Error executing %s."
 msgstr "執行 %s 發生錯誤。"
@@ -19245,7 +19889,8 @@ msgstr "無法執行 Bug buddy。"
 
 # ui/evolution.xml.h:1
 #: shell/e-shell-window-commands.c:171
-msgid "About Ximian Evolution"
+#, fuzzy
+msgid "About Evolution"
 msgstr "關於 Ximian Evolution"
 
 # shell/e-shell-view-menu.c:590
@@ -19254,7 +19899,7 @@ msgid "_Work Online"
 msgstr "線上工作(_W)"
 
 # ui/evolution.xml.h:66
-#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:36
+#: shell/e-shell-window-commands.c:395 ui/evolution.xml.h:37
 msgid "_Work Offline"
 msgstr "離線工作(_W)"
 
@@ -19263,47 +19908,6 @@ msgstr "離線工作(_W)"
 msgid "Work Offline"
 msgstr "離線工作"
 
-#: shell/e-shell-window.c:338
-msgid ""
-"Ximian Evolution is currently online.  Click on this button to work offline."
-msgstr "Ximian Evolution 目前為線上工作。按這裡改為離線工作。"
-
-#: shell/e-shell-window.c:345
-msgid "Ximian Evolution is in the process of going offline."
-msgstr "Ximian Evolution 現正離線中。"
-
-#: shell/e-shell-window.c:351
-msgid ""
-"Ximian Evolution is currently offline.  Click on this button to work online."
-msgstr "Ximian Evolution 目前是離線工作。按這裡改為線上工作。"
-
-#: shell/e-shell.c:536
-#, c-format
-msgid ""
-"Warning: Evolution could not upgrade all your data from version %d.%d.%d.\n"
-"The data hasn't been deleted, but it will not be seen by this version of "
-"Evolution.\n"
-msgstr ""
-
-# camel/providers/local/camel-maildir-folder.c:218
-# camel/providers/local/camel-mh-folder.c:203
-#: shell/e-shell.c:1081
-msgid "Invalid arguments"
-msgstr "無效的參數"
-
-#: shell/e-shell.c:1083
-msgid "Cannot register on OAF"
-msgstr "不能於 OAF 註冊"
-
-#: shell/e-shell.c:1085
-msgid "Configuration Database not found"
-msgstr "找不到組態資料庫"
-
-# shell/e-storage.c:461
-#: shell/e-shell.c:1087
-msgid "Generic error"
-msgstr "一般錯誤"
-
 # addressbook/contact-editor/e-contact-editor.c:1247
 #: shell/e-storage-set-view.etspec.h:1
 msgid "Checkbox"
@@ -19389,6 +19993,57 @@ msgstr "接通連線"
 msgid "Click OK to close these connections and go offline"
 msgstr "按“確定”關閉這些連線以離線"
 
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#: shell/glade/e-shell-config-default-folders.glade.h:1
+msgid "C_alendar:"
+msgstr "行事曆(_A):"
+
+# ui/evolution-addressbook.xml.h:17
+#: shell/glade/e-shell-config-default-folders.glade.h:2
+#, fuzzy
+msgid "_Contacts:"
+msgstr "連絡人: "
+
+# importers/elm-importer.c:517
+# importers/netscape-importer.c:785
+# importers/pine-importer.c:651
+#: shell/glade/e-shell-config-default-folders.glade.h:3
+msgid "_Mail:"
+msgstr "郵件(_M):"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#: shell/glade/e-shell-config-default-folders.glade.h:4
+msgid "_Tasks:"
+msgstr "工作(_T):"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:2
+#: shell/glade/e-shell-folder-creation-dialog.glade.h:3
+#, fuzzy
+msgid "Folder _type:"
+msgstr "資料夾類型:"
+
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:1
+msgid "Open Other User's Folder"
+msgstr "開啟其他使用者的資料夾"
+
+# mail/mail-config.glade.h:3
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:2
+msgid "_Account:"
+msgstr "帳號(_A):"
+
+# shell/glade/e-shell-folder-creation-dialog.glade.h:1
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:3
+msgid "_Folder Name:"
+msgstr "資料夾名稱(_F):"
+
+# mail/mail-config.glade.h:80
+#: shell/glade/e-shell-shared-folder-picker-dialog.glade.h:4
+msgid "_User:"
+msgstr "使用者(_U):"
+
 # shell/importer/import.glade.h:2
 #: shell/glade/evolution-startup-wizard.glade.h:2
 msgid "Evolution Setup Assistant"
@@ -19436,6 +20091,26 @@ msgstr ""
 "\n"
 "單擊“完成”按鈕以儲存您的設定。"
 
+# shell/GNOME_Evolution_Shell.oaf.in.h:1
+#: shell/GNOME_Evolution_Shell.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Shell"
+msgstr "Evolution shell。"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#: shell/GNOME_Evolution_Test.server.in.in.h:1
+#, fuzzy
+msgid "Evolution Test"
+msgstr "Evolution"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: shell/GNOME_Evolution_Test.server.in.in.h:2
+#, fuzzy
+msgid "Evolution Test component"
+msgstr "Evolution 測試元件。"
+
 # shell/importer/import.glade.h:1
 #: shell/importer/import.glade.h:1
 msgid "Click \"Import\" to begin importing the file into Evolution. "
@@ -19519,13 +20194,13 @@ msgid "Evolution can import data from the following files:"
 msgstr "Evolution 可以自下列檔案匯入資料："
 
 #. Preview/Alpha/Beta version warning message
-#: shell/main.c:230
+#: shell/main.c:231
 #, fuzzy, no-c-format
 msgid ""
 "Hi.  Thanks for taking the time to download this preview release\n"
-"of the Ximian Evolution groupware suite.\n"
+"of the Evolution groupware suite.\n"
 "\n"
-"This version of Ximian Evolution is not yet complete. It is getting close,\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"
@@ -19557,10 +20232,11 @@ msgstr ""
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:254
+#: shell/main.c:255
+#, fuzzy
 msgid ""
 "Thanks\n"
-"The Ximian Evolution Team\n"
+"The Evolution Team\n"
 msgstr ""
 "謝謝\n"
 "Ximian Evolution 團隊\n"
@@ -19568,56 +20244,44 @@ msgstr ""
 # importers/elm-importer.c:528
 # importers/netscape-importer.c:807
 # importers/pine-importer.c:668
-#: shell/main.c:261
+#: shell/main.c:262
 msgid "Don't tell me again"
 msgstr "不要再顯示這個訊息"
 
-# shell/main.c:138
-#: shell/main.c:391
-#, fuzzy
-msgid "Cannot register the Ximian Evolution shell."
-msgstr "不能存取 Ximian Evolution shell。"
-
-# shell/main.c:138
-#: shell/main.c:400
-#, c-format
-msgid "Cannot initialize the Ximian Evolution shell: %s"
-msgstr "不能初始化 Ximian Evolution shell： %s"
-
-#: shell/main.c:497
+#: shell/main.c:496
 msgid "Start Evolution activating the specified component"
 msgstr ""
 
-#: shell/main.c:499
+#: shell/main.c:498
 msgid "Start in offline mode"
 msgstr "以離線模式啟動"
 
-#: shell/main.c:501
+#: shell/main.c:500
 msgid "Start in online mode"
 msgstr "以線上模式啟動"
 
-#: shell/main.c:504
+#: shell/main.c:503
 msgid "Forcibly shut down all evolution components"
 msgstr ""
 
-#: shell/main.c:508
+#: shell/main.c:507
 #, fuzzy
 msgid "Forcibly re-migrate from Evolution 1.4"
 msgstr "強迫升級 Evolution 1.0.x 的組態檔案"
 
 # shell/main.c:185
-#: shell/main.c:511
+#: shell/main.c:510
 msgid "Send the debugging output of all components to a file."
 msgstr "將全部元件的除錯輸出資料傳送至一個檔案。"
 
 # composer/e-msg-composer.c:935
 # data/evolution.desktop.in.h:1
 # shell/e-shell-view-menu.c:228
-#: shell/main.c:535
+#: shell/main.c:534
 msgid "Evolution"
 msgstr "Evolution"
 
-#: shell/main.c:539
+#: shell/main.c:538
 #, c-format
 msgid ""
 "%s: --online and --offline cannot be used together.\n"
@@ -19626,15 +20290,83 @@ msgstr ""
 "%s： --online 和 --offline 不能一起使用。\n"
 "  使用 %s --help 取得進一步資訊。\n"
 
+#. shell:upgrade-nospace primary
+#: shell/shell-errors.xml.h:2
+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 "
+"you only have {1} available.\n"
+"\n"
+"You will need to make more space available in your home directory before you "
+"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"
+"\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
+#, fuzzy
+msgid "Continue"
+msgstr "君士坦丁"
+
+# shell/main.c:138
+#. shell:noshell title
+#: shell/shell-errors.xml.h:17 shell/shell-errors.xml.h:25
+#, fuzzy
+msgid "Cannot start Evolution"
+msgstr "不能存取 Ximian Evolution shell。"
+
+# mail/mail-config-druid.c:445
+#. shell:noshell primary
+#: shell/shell-errors.xml.h:19 shell/shell-errors.xml.h:27
+#, fuzzy
+msgid "Evolution can not start."
+msgstr "Evolution 帳號助理"
+
+#. 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 ""
+
+#. 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 ""
+
 # mail/mail-account-gui.c:682
 #: smime/gui/certificate-manager.c:128 smime/gui/certificate-manager.c:325
-#: smime/gui/certificate-manager.c:503
+#: smime/gui/certificate-manager.c:522
 #, 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:585
+#: smime/gui/certificate-manager.c:604
 #, fuzzy
 msgid "Certificate Name"
 msgstr "憑證 ID(_C):"
@@ -19913,12 +20645,6 @@ msgstr ""
 msgid "Your Certificates"
 msgstr "憑證 ID(_C):"
 
-#. XXX we shouldn't be popping up dialogs in this code.
-#: smime/lib/e-cert-db.c:605
-#, fuzzy
-msgid "Certificate already exists"
-msgstr "名片 ID 已經存在"
-
 # 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
@@ -20160,6 +20886,12 @@ msgstr "主旨是 %s"
 msgid "Certificate Signature Value"
 msgstr "憑證簽章失敗"
 
+#. XXX we shouldn't be popping up dialogs in this code.
+#: smime/lib/e-cert-db.c:605
+#, fuzzy
+msgid "Certificate already exists"
+msgstr "名片 ID 已經存在"
+
 #: smime/lib/e-pkcs12.c:266
 msgid "PKCS12 File Password"
 msgstr ""
@@ -20207,12 +20939,12 @@ msgstr ""
 #. This most likely means that KILL_PROCESS_CMD wasn't
 #. * found, so just bail completely.
 #.
-#: tools/killev.c:63
+#: tools/killev.c:61
 #, fuzzy, c-format
 msgid "Could not execute '%s': %s\n"
 msgstr "無法重新命名“%s”：%s "
 
-#: tools/killev.c:78
+#: tools/killev.c:76
 #, c-format
 msgid "Shutting down %s (%s)\n"
 msgstr ""
@@ -20296,7 +21028,8 @@ msgstr "選擇全部連絡人"
 
 # calendar/gui/e-calendar-table.c:714
 #: ui/evolution-addressbook.xml.h:23
-msgid "Send a mess to the selected contacts."
+#, fuzzy
+msgid "Send a message to the selected contacts."
 msgstr "傳送郵件給選定的連絡人。"
 
 # addressbook/gui/widgets/e-addressbook-reflow-adapter.c:232
@@ -20336,8 +21069,8 @@ msgstr "檢視目前的連絡人"
 #: 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-message.xml.h:107
-#: ui/evolution-mail-messagedisplay.xml.h:4 ui/evolution-task-editor.xml.h:9
+#: 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
 msgid "_Actions"
 msgstr "執行(_A)"
@@ -20363,7 +21096,8 @@ msgstr "預覽面板(_P)"
 # addressbook/gui/widgets/e-addressbook-view.c:551
 # addressbook/gui/widgets/e-addressbook-view.c:611
 #: ui/evolution-addressbook.xml.h:41
-msgid "_Save as VCard"
+#, fuzzy
+msgid "_Save as VCard..."
 msgstr "儲存成 VCard 檔案格式(_S)"
 
 # ui/evolution-event-editor.xml.h:72
@@ -20537,6 +21271,11 @@ msgstr "檢視目前的連絡人"
 msgid "Week"
 msgstr "週"
 
+# ui/evolution-calendar.xml.h:35
+#: ui/evolution-calendar.xml.h:37
+msgid "Work Week"
+msgstr "工作週"
+
 # calendar/gui/event-editor-dialog.glade.h:3
 #: ui/evolution-calendar.xml.h:42
 #, fuzzy
@@ -20550,6 +21289,19 @@ msgstr "約會(_A)"
 # ui/evolution-subscribe.xml.h:2
 # ui/evolution-task-editor-dialog.xml.h:11
 # ui/evolution.xml.h:5
+#: 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 "關閉(_L)"
+
+# calendar/gui/dialogs/alarm-notify.glade.h:1
+# ui/evolution-contact-editor.xml.h:1
+# ui/evolution-event-editor.xml.h:10
+# ui/evolution-message-composer.xml.h:3
+# ui/evolution-subscribe.xml.h:2
+# ui/evolution-task-editor-dialog.xml.h:11
+# ui/evolution.xml.h:5
 #: 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
@@ -20977,6 +21729,21 @@ msgstr "反向選擇(_I)"
 msgid "_Threaded Message List"
 msgstr "相關郵件清單(_T)"
 
+# ui/evolution.xml.h:6
+#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
+msgid "Close this window"
+msgstr "關閉這個視窗"
+
+# ui/evolution-event-editor.xml.h:53
+# ui/evolution-message-composer.xml.h:43
+# ui/evolution-task-editor-dialog.xml.h:65
+# 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
+msgid "_Close"
+msgstr "關閉(_C)"
+
 # addressbook/gui/component/addressbook-config.c:662
 #: ui/evolution-mail-message.xml.h:1
 #, fuzzy
@@ -21280,7 +22047,8 @@ msgstr "使用新視窗開啟選定的郵件"
 
 # ui/evolution-mail.xml.h:60
 #: ui/evolution-mail-message.xml.h:71
-msgid "Open the selected message in the composer to re-send it"
+#, fuzzy
+msgid "Open the selected message in the composer for editing"
 msgstr "開啟選定的郵件然後重傳"
 
 #: ui/evolution-mail-message.xml.h:72
@@ -21423,44 +22191,34 @@ msgstr "主旨虛擬資料夾(_S)..."
 msgid "_Attached"
 msgstr "附加(_A)"
 
-# ui/evolution-mail.xml.h:101
-#: ui/evolution-mail-message.xml.h:110
-msgid "_Copy to Folder"
-msgstr "複製至資料夾(_C)"
-
 # ui/evolution-mail.xml.h:102
 #: ui/evolution-mail-message.xml.h:111
 msgid "_Create Filter From Message"
 msgstr "建立郵件過濾器(_C)"
 
 # ui/evolution-calendar.xml.h:8
-#: ui/evolution-mail-message.xml.h:114
+#: ui/evolution-mail-message.xml.h:115
 msgid "_Go To"
 msgstr "移至(_G)"
 
 # mail/mail-config.glade.h:37
-#: ui/evolution-mail-message.xml.h:115
+#: ui/evolution-mail-message.xml.h:116
 msgid "_Inline"
 msgstr "行內(_I)"
 
 # addressbook/contact-editor/e-contact-editor.c:1256
 # addressbook/gui/widgets/e-addressbook-view.c:720
-#: ui/evolution-mail-message.xml.h:116
+#: ui/evolution-mail-message.xml.h:117
 msgid "_Larger"
 msgstr "較大(_L)"
 
 # views/mail/galview.xml.h:4
-#: ui/evolution-mail-message.xml.h:117
+#: ui/evolution-mail-message.xml.h:118
 msgid "_Message Display"
 msgstr "檢視郵件(_M)"
 
-# ui/evolution-mail.xml.h:112
-#: ui/evolution-mail-message.xml.h:118
-msgid "_Move to Folder"
-msgstr "移至資料夾(_M)"
-
 # widgets/misc/e-messagebox.c:180
-#: ui/evolution-mail-message.xml.h:119
+#: ui/evolution-mail-message.xml.h:120
 msgid "_Next Message"
 msgstr "下一封郵件(_N)"
 
@@ -21470,30 +22228,25 @@ msgstr "下一封郵件(_N)"
 # calendar/gui/dialogs/task-editor-dialog.glade.h:13
 # calendar/gui/e-calendar-table.c:346
 # mail/message-list.c:688
-#: ui/evolution-mail-message.xml.h:120
+#: ui/evolution-mail-message.xml.h:121
 msgid "_Normal Display"
 msgstr "標準顯示(_N)"
 
 # ui/evolution-mail.xml.h:114
-#: ui/evolution-mail-message.xml.h:121
+#: ui/evolution-mail-message.xml.h:122
 msgid "_Open Message"
 msgstr "開啟郵件(_O)"
 
 # mail/mail-callbacks.c:1407
-#: ui/evolution-mail-message.xml.h:123
+#: ui/evolution-mail-message.xml.h:124
 msgid "_Previous Message"
 msgstr "上一封郵件(_P)"
 
 # mail/mail-config.glade.h:56
-#: ui/evolution-mail-message.xml.h:125
+#: ui/evolution-mail-message.xml.h:126
 msgid "_Quoted"
 msgstr "引用(_Q)"
 
-# ui/evolution.xml.h:61
-#: ui/evolution-mail-message.xml.h:127
-msgid "_Resend..."
-msgstr "重新傳送(_R)..."
-
 # ui/evolution-addressbook.xml.h:20
 # ui/evolution-calendar.xml.h:44
 # ui/evolution-event-editor.xml.h:74
@@ -21509,21 +22262,6 @@ msgstr "工具(_T)"
 msgid "_Undelete"
 msgstr "復原(_U)"
 
-# ui/evolution.xml.h:6
-#: ui/evolution-mail-messagedisplay.xml.h:2 ui/evolution.xml.h:4
-msgid "Close this window"
-msgstr "關閉這個視窗"
-
-# ui/evolution-event-editor.xml.h:53
-# ui/evolution-message-composer.xml.h:43
-# ui/evolution-task-editor-dialog.xml.h:65
-# 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
-msgid "_Close"
-msgstr "關閉(_C)"
-
 # ui/evolution-message-composer.xml.h:1
 #: ui/evolution-message-composer.xml.h:1
 msgid "Attach"
@@ -22036,6 +22774,12 @@ msgstr "郵件偏好設定"
 msgid "_Send / Receive"
 msgstr "傳送/接收 (_S)"
 
+# addressbook/gui/component/addressbook-config.c:349
+#: ui/evolution.xml.h:36
+#, fuzzy
+msgid "_Window"
+msgstr "立即搜尋(_F)"
+
 # views/addressbook/galview.xml.h:2
 #: views/addressbook/galview.xml.h:1
 msgid "By _Company"
@@ -22123,11 +22867,6 @@ msgstr "到期日(_D):"
 msgid "With _Status"
 msgstr "設定狀態"
 
-# ui/evolution-tasks.xml.h:9
-#: views/tasks/galview.xml.h:3
-msgid "_Tasks"
-msgstr "工作(_T)"
-
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:197
 #: widgets/e-timezone-dialog/e-timezone-dialog.c:626
 msgid "UTC"
@@ -22314,6 +23053,43 @@ msgstr "其它..."
 msgid "..."
 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
+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
+#, fuzzy
+msgid "Evolution Warning"
+msgstr "Evolution"
+
+# data/evolution.keys.in.h:2
+#: widgets/misc/e-error.c:118
+#, fuzzy
+msgid "Evolution Information"
+msgstr "會議資訊"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:2
+#: widgets/misc/e-error.c:120
+#, fuzzy
+msgid "Evolution Query"
+msgstr "Evolution 摘要元件。"
+
+# mail/mail-config.glade.h:69
+#. setup a dummy error
+#: widgets/misc/e-error.c:410
+#, fuzzy, c-format
+msgid ""
+"<span weight=\"bold\">Internal error, unknown error '%s' requested</span>"
+msgstr "傳送與草稿郵件"
+
 # ui/evolution-mail.xml.h:104
 #: widgets/misc/e-expander.c:181
 #, fuzzy
@@ -22451,6 +23227,49 @@ msgstr "文字"
 msgid "Find _Now"
 msgstr "立即搜尋"
 
+#. system:ask-save-file-exists-overwrite primary
+#: widgets/misc/e-system-errors.xml.h:4
+msgid "File exists \"{0}\"."
+msgstr ""
+
+#. 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"
+"您是否要複寫它？"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. system:no-save-file primary
+#: widgets/misc/e-system-errors.xml.h:9
+#, fuzzy
+msgid "Cannot save file \"{0}\"."
+msgstr ""
+"無法儲存到“%s”\n"
+" %s"
+
+# camel/providers/local/camel-maildir-folder.c:197
+# camel/providers/local/camel-maildir-folder.c:209
+# camel/providers/local/camel-maildir-folder.c:217
+# camel/providers/local/camel-mbox-folder.c:319
+# camel/providers/local/camel-mh-folder.c:185
+# camel/providers/local/camel-mh-folder.c:194
+# camel/providers/local/camel-mh-folder.c:202
+#. system:no-load-file primary
+#: widgets/misc/e-system-errors.xml.h:13
+#, fuzzy
+msgid "Cannot open file \"{0}\"."
+msgstr ""
+"無法儲存到“%s”\n"
+" %s"
+
 #: widgets/misc/e-task-widget.c:211
 #, c-format
 msgid "%s (...)"
@@ -22465,10 +23284,190 @@ msgstr "%s (...)"
 msgid "%s (%d%% complete)"
 msgstr "%s (%d%% 完成)"
 
-# importers/pine-importer.c:661
+# addressbook/gui/component/GNOME_Evolution_Addressbook.oaf.in.h:5
 #, fuzzy
-#~ msgid "New Address Book"
-#~ msgstr "目錄服務"
+#~ msgid "Evolution Addressbook folder viewer"
+#~ msgstr "Evolution 目錄服務迷你名片檢視"
+
+# addressbook/contact-editor/fulladdr.glade.h:1
+#, fuzzy
+#~ msgid "Address 2:"
+#~ msgstr "地址 _2:"
+
+#, fuzzy
+#~ msgid "Blog:"
+#~ msgstr "波隆納"
+
+# calendar/gui/GNOME_Evolution_Calendar.oaf.in.h:3
+#, fuzzy
+#~ msgid "Evolution Calendar viewer"
+#~ msgstr "Evolution 行事曆 iTip/iMip 檢視器"
+
+# composer/e-msg-composer.c:935
+# data/evolution.desktop.in.h:1
+# shell/e-shell-view-menu.c:228
+#, fuzzy
+#~ msgid "Evolution Tasks viewer"
+#~ msgstr "Evolution 提醒"
+
+# addressbook/backend/ebook/load-gnomecard-addressbook.c:21
+# addressbook/backend/ebook/load-pine-addressbook.c:22
+# addressbook/backend/ebook/test-client-list.c:23
+# addressbook/backend/ebook/test-client.c:33
+# addressbook/conduit/address-conduit.c:1092
+# addressbook/gui/component/addressbook-factory.c:42
+# calendar/conduits/calendar/calendar-conduit.c:1151
+# calendar/conduits/todo/todo-conduit.c:965
+# calendar/gui/alarm-notify/notify-main.c:98
+# calendar/gui/main.c:57
+#~ msgid "Could not initialize gnome-vfs"
+#~ msgstr "無法始初化 gnome-vfs"
+
+# calendar/gui/gnome-cal.c:840
+#~ msgid "Could not open the folder in '%s'"
+#~ msgstr "無法開啟“%s”內的資料夾"
+
+# calendar/gui/control-factory.c:126
+#~ msgid "The URI that the calendar will display"
+#~ msgstr "行事曆將顯示的 URI "
+
+#~ msgid "The type of view to show"
+#~ msgstr "要顯示的檢視類型"
+
+# ui/evolution-mail.xml.h:23
+#~ msgid "Display a message"
+#~ msgstr "顯示郵件"
+
+#~ msgid "Alerts"
+#~ msgstr "警報"
+
+# addressbook/gui/widgets/e-addressbook-view.c:730
+#~ msgid "Time"
+#~ msgstr "時間"
+
+# addressbook/contact-editor/contact-editor.glade.h:10
+# executive-summary/component/executive-summary-config.glade.h:3
+#~ msgid "_General"
+#~ msgstr "一般(_G)"
+
+# mail/mail-account-gui.c:682
+#, fuzzy
+#~ msgid "Select source"
+#~ msgstr "選擇匯入服務"
+
+# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
+# ui/evolution-calendar.xml.h:3
+#, fuzzy
+#~ msgid "calendar"
+#~ msgstr "行事曆"
+
+# calendar/gui/calendar-summary.c:275
+# calendar/gui/print.c:948
+# views/tasks/galview.xml.h:1
+#, fuzzy
+#~ msgid "task list"
+#~ msgstr "工作清單"
+
+#~ msgid "Calendar file could not be updated!\n"
+#~ msgstr "無法更新行事曆檔案！\n"
+
+# calendar/gui/tasks-control.c:108
+#~ msgid "The URI of the tasks folder to display"
+#~ msgstr "工作資料夾顯示的 URI"
+
+# calendar/gui/e-tasks.c:298
+#~ msgid "Could not load the tasks in `%s'"
+#~ msgstr "無法載入“%s”裡的工作"
+
+# mail/GNOME_Evolution_Mail.oaf.in.h:4
+#, fuzzy
+#~ msgid "Evolution Mail folder viewer"
+#~ msgstr "Evolution 郵件資料夾顯示元件。"
+
+# mail/folder-browser.c:656
+#, fuzzy
+#~ msgid "VFolder on Thread"
+#~ msgstr "從寄件者建立虛擬資料夾(_N)"
+
+# mail/folder-browser.c:671
+#, fuzzy
+#~ msgid "Filter on Thread"
+#~ msgstr "從寄件者建立過濾器(_D)"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid "Failed to migrate pop3 uid caches: %s"
+#~ msgstr "快取 %s 失敗： %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid "Failed to migrate folder expand state: %s"
+#~ msgstr "快取 %s 失敗： %s"
+
+# camel/camel-filter-driver.c:670
+# camel/camel-filter-driver.c:679
+#, fuzzy
+#~ msgid "Failed to open store for `%s': %s"
+#~ msgstr "建立到“%s”的導管失敗： %s"
+
+# calendar/gui/control-factory.c:126
+#, fuzzy
+#~ msgid "URI of the mail source that the view will display"
+#~ msgstr "行事曆將顯示的 URI "
+
+# shell/e-shortcuts-view.c:295
+#, fuzzy
+#~ msgid "Default shortcut group"
+#~ msgstr "更改這個功能群組的名稱"
+
+# shell/e-shortcuts-view.c:301
+#, fuzzy
+#~ msgid "Default width of the shortcut bar pane"
+#~ msgstr "隱藏功能列"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Path to the default contacts folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Path to the default mail folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Path to the default tasks folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# mail/mail-ops.c:1195
+# mail/mail-ops.c:1333
+#, fuzzy
+#~ msgid "Physical URI to the default tasks folder"
+#~ msgstr "開啟預設工作資料夾"
+
+# ui/evolution.xml.h:32
+#, fuzzy
+#~ msgid "Whether to show the folder bar"
+#~ msgstr "切換資料夾清單的顯示狀態"
+
+# ui/evolution.xml.h:33
+#, fuzzy
+#~ msgid "Whether to show the shortcut bar"
+#~ msgstr "切換資料功能列的顯示狀態"
+
+# shell/main.c:138
+#~ msgid "Cannot initialize the Ximian Evolution shell: %s"
+#~ msgstr "不能初始化 Ximian Evolution shell： %s"
+
+# ui/evolution.xml.h:61
+#~ msgid "_Resend..."
+#~ msgstr "重新傳送(_R)..."
 
 # calendar/gui/control-factory.c:126
 #, fuzzy
@@ -22662,11 +23661,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "S_pouse:"
 #~ msgstr "配偶(_S):"
 
-# addressbook/contact-editor/contact-editor.glade.h:17
-# mail/mail-config.glade.h:84
-#~ msgid "_Add"
-#~ msgstr "新增(_A)"
-
 # addressbook/contact-editor/e-contact-editor.c:1243
 # addressbook/contact-editor/e-contact-editor.c:1310
 #, fuzzy
@@ -22805,21 +23799,6 @@ msgstr "%s (%d%% 完成)"
 #~ "的特殊資訊。如果您需要找尋這個資訊，請連絡\n"
 #~ "您的系統管理者。"
 
-# calendar/gui/dialogs/task-editor-dialog.glade.h:18
-#, fuzzy
-#~ msgid "Start Date:"
-#~ msgstr "開始日期(_R):"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:25
-#, fuzzy
-#~ msgid "Due Date:"
-#~ msgstr "到期日(_D):"
-
-# calendar/gui/dialogs/task-editor-dialog.glade.h:26
-#, fuzzy
-#~ msgid "Priority:"
-#~ msgstr "優先順序(_P):"
-
 # composer/e-msg-composer.c:805
 #~ msgid ""
 #~ "Error while reading file %s:\n"
@@ -22856,14 +23835,6 @@ msgstr "%s (%d%% 完成)"
 #~ "無法截短檔案： %s\n"
 #~ "%s"
 
-# mail/mail-ops.c:1728
-#~ msgid ""
-#~ "Unable to copy file descriptor: %s\n"
-#~ "%s"
-#~ msgstr ""
-#~ "無法複製檔案描述項： %s\n"
-#~ "%s"
-
 # mail/mail-ops.c:1755
 #~ msgid ""
 #~ "Error autosaving message: %s\n"
@@ -23024,11 +23995,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "The view showing when the calendar starts"
 #~ msgstr "預覽將要列印的行事曆內容"
 
-# camel/camel-smime-context.c:194
-#, fuzzy
-#~ msgid "Enter the password for %s"
-#~ msgstr "請輸入 %s 所需的密碼"
-
 # calendar/gui/calendar-summary.c:275
 # calendar/gui/print.c:948
 # views/tasks/galview.xml.h:1
@@ -23112,43 +24078,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Cannot find the specified shared folder."
 #~ msgstr "找不到指定的共用資料夾。"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:11
-# ui/evolution-calendar.xml.h:3
-#~ msgid "C_alendar:"
-#~ msgstr "行事曆(_A):"
-
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#~ msgid "_Mail:"
-#~ msgstr "郵件(_M):"
-
-# calendar/gui/calendar-summary.c:275
-# calendar/gui/print.c:948
-# views/tasks/galview.xml.h:1
-#~ msgid "_Tasks:"
-#~ msgstr "工作(_T):"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:2
-#, fuzzy
-#~ msgid "Folder _type:"
-#~ msgstr "資料夾類型:"
-
-#~ msgid "Open Other User's Folder"
-#~ msgstr "開啟其他使用者的資料夾"
-
-# mail/mail-config.glade.h:3
-#~ msgid "_Account:"
-#~ msgstr "帳號(_A):"
-
-# shell/glade/e-shell-folder-creation-dialog.glade.h:1
-#~ msgid "_Folder Name:"
-#~ msgstr "資料夾名稱(_F):"
-
-# mail/mail-config.glade.h:80
-#~ msgid "_User:"
-#~ msgstr "使用者(_U):"
-
 # ui/evolution-tasks.xml.h:2
 #, fuzzy
 #~ msgid "Create a new window"
@@ -23561,9 +24490,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Quit Assistant"
 #~ msgstr "助理"
 
-#~ msgid "The following connections are currently active:"
-#~ msgstr "以下是目前接通的連線："
-
 # ui/evolution-addressbook.xml.h:19
 #~ msgid "_Search for Contacts"
 #~ msgstr "尋找連絡人(_S)"
@@ -23881,12 +24807,6 @@ msgstr "%s (%d%% 完成)"
 #~ "This message is digitally signed but can not be proven to be authentic."
 #~ msgstr "這封是加入了數位簽名的郵件，但不能証實無訛"
 
-# composer/e-msg-composer.c:935
-# data/evolution.desktop.in.h:1
-# shell/e-shell-view-menu.c:228
-#~ msgid "Evolution Error"
-#~ msgstr "Evolution 錯誤"
-
 # shell/e-shell-importer.c:353
 #~ msgid ""
 #~ "There is no importer that is able to handle\n"
@@ -24041,21 +24961,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "<b>Alarm Sound</b>"
 #~ msgstr "行事曆資訊"
 
-# calendar/gui/dialogs/cal-prefs-dialog.glade.h:36
-# calendar/gui/event-editor-dialog.glade.h:21
-#, fuzzy
-#~ msgid "<b>Reminders</b>"
-#~ msgstr "提醒"
-
-#, fuzzy
-#~ msgid "<b>Alerts</b>"
-#~ msgstr "<b>開始:</b>"
-
-# data/evolution.keys.in.h:2
-#, fuzzy
-#~ msgid "<b>Task List</b>"
-#~ msgstr "行事曆資訊"
-
 # calendar/gui/dialogs/task-editor-dialog.glade.h:5
 # calendar/gui/e-calendar-table.c:151
 # calendar/gui/event-editor-dialog.glade.h:6
@@ -25383,11 +26288,6 @@ msgstr "%s (%d%% 完成)"
 
 # mail/GNOME_Evolution_Mail.oaf.in.h:2
 #, fuzzy
-#~ msgid "Evolution Summary"
-#~ msgstr "Evolution 摘要元件。"
-
-# mail/GNOME_Evolution_Mail.oaf.in.h:2
-#, fuzzy
 #~ msgid "Evolution Summary component"
 #~ msgstr "Evolution 摘要元件。"
 
@@ -25830,13 +26730,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Asia"
 #~ msgstr "亞洲"
 
-# calendar/gui/e-day-view.c:3162
-# calendar/gui/e-week-view.c:3292
-# ui/evolution-calendar.xml.h:19
-# ui/evolution-message-composer.xml.h:11
-#~ msgid "Aspen"
-#~ msgstr "阿斯本"
-
 #~ msgid "Asswan"
 #~ msgstr "Asswan"
 
@@ -27003,9 +27896,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Conroe"
 #~ msgstr "康羅"
 
-#~ msgid "Constantine"
-#~ msgstr "君士坦丁"
-
 #~ msgid "Copper Harbor"
 #~ msgstr "銅港"
 
@@ -27077,10 +27967,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Creston"
 #~ msgstr "克里斯頓"
 
-# calendar/gui/event-editor-dialog.glade.h:15
-#~ msgid "Crestview"
-#~ msgstr "克里斯由"
-
 #~ msgid "Cross City"
 #~ msgstr "十字城"
 
@@ -30479,10 +31365,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Nogales"
 #~ msgstr "諾加里"
 
-# addressbook/gui/component/addressbook-config.glade.h:5
-#~ msgid "Nome"
-#~ msgstr "諾姆"
-
 #~ msgid "Norfolk"
 #~ msgstr "諾福克"
 
@@ -33713,10 +34595,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Shown"
 #~ msgstr "顯示"
 
-# ui/evolution-tasks.xml.h:3
-#~ msgid "No tasks"
-#~ msgstr "無工作"
-
 # addressbook/gui/component/addressbook-config.c:689
 # calendar/gui/e-itip-control.glade.h:6
 # composer/e-msg-composer-attachment.glade.h:3
@@ -34926,12 +35804,6 @@ msgstr "%s (%d%% 完成)"
 #~ msgid "Delete news feed"
 #~ msgstr "刪除新聞發送伺服器"
 
-# importers/elm-importer.c:517
-# importers/netscape-importer.c:785
-# importers/pine-importer.c:651
-#~ msgid "_Mail"
-#~ msgstr "郵件(_M)"
-
 # calendar/gui/event-editor-dialog.glade.h:33
 #~ msgid "_Weather"
 #~ msgstr "天氣(_W)"